merge-ll: rename from ll-merge

A long term (but rather minor) pet-peeve of mine was the name ll-merge.[ch]. I thought it made it harder to realize what stuff was related to merging when I was working on the merge machinery and trying to improve it. Further, back in d1cbe1e6d8a ("hash-ll.h: split out of hash.h to remove dependency on repository.h", 2023-04-22), we have split the portions of hash.h that do not depend upon repository.h into a "hash-ll.h" (due to the recommendation to use "ll" for "low-level" in its name[1], but which I used as a suffix precisely because of my distaste for "ll-merge"). When we discussed adding additional "*-ll.h" files, a request was made that we use "ll" consistently as either a prefix or a suffix. Since it is already in use as both a prefix and a suffix, the only way to do so is to rename some files. Besides my distaste for the ll-merge.[ch] name, let me also note that the files ll-fsmonitor.h, ll-hash.h, ll-merge.h, ll-object-store.h, ll-read-cache.h would have essentially nothing to do with each other and make no sense to group. But giving them the common "ll-" prefix would group them. Using "-ll" as a suffix thus seems just much more logical to me. Rename ll-merge.[ch] to merge-ll.[ch] to achieve this consistency, and to ensure we get a more logical grouping of files. [1] https://lore.kernel.org/git/kl6lsfcu1g8w.fsf@chooglen-macbookpro.roam.corp.google.com/ Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed May 16, 2023 at 06:34 UTC 6723899932eb5b6436e9bac65ffc9b6e644c7fee
13 files changed +13 -13
Documentation/technical/api-merge.txt
+2 -2
@@ -28,9 +28,9 @@ and `diff.c` for examples.
28
29 * `struct ll_merge_options`
30
31 -Check ll-merge.h for details.
31 +Check merge-ll.h for details.
32
33 Low-level (single file) merge
34 -----------------------------
35
36 -Check ll-merge.h for details.
36 +Check merge-ll.h for details.
Makefile
+1 -1
@@ -1051,7 +1051,6 @@ LIB_OBJS += linear-assignment.o
1051 LIB_OBJS += list-objects-filter-options.o
1052 LIB_OBJS += list-objects-filter.o
1053 LIB_OBJS += list-objects.o
1054 -LIB_OBJS += ll-merge.o
1054 LIB_OBJS += lockfile.o
1055 LIB_OBJS += log-tree.o
1056 LIB_OBJS += ls-refs.o
@@ -1060,6 +1059,7 @@ LIB_OBJS += mailmap.o
1059 LIB_OBJS += match-trees.o
1060 LIB_OBJS += mem-pool.o
1061 LIB_OBJS += merge-blobs.o
1062 +LIB_OBJS += merge-ll.o
1063 LIB_OBJS += merge-ort.o
1064 LIB_OBJS += merge-ort-wrappers.o
1065 LIB_OBJS += merge-recursive.o
apply.c
+1 -1
@@ -21,7 +21,7 @@
21 #include "gettext.h"
22 #include "hex.h"
23 #include "xdiff-interface.h"
24 -#include "ll-merge.h"
24 +#include "merge-ll.h"
25 #include "lockfile.h"
26 #include "name-hash.h"
27 #include "object-name.h"
builtin/checkout.c
+1 -1
@@ -13,7 +13,7 @@
13 #include "gettext.h"
14 #include "hex.h"
15 #include "hook.h"
16 -#include "ll-merge.h"
16 +#include "merge-ll.h"
17 #include "lockfile.h"
18 #include "mem-pool.h"
19 #include "merge-recursive.h"
convert.c
+1 -1
@@ -15,7 +15,7 @@
15 #include "sub-process.h"
16 #include "trace.h"
17 #include "utf8.h"
18 -#include "ll-merge.h"
18 +#include "merge-ll.h"
19 #include "wrapper.h"
20
21 /*
diff.c
+1 -1
@@ -26,7 +26,7 @@
26 #include "submodule.h"
27 #include "hashmap.h"
28 #include "mem-pool.h"
29 -#include "ll-merge.h"
29 +#include "merge-ll.h"
30 #include "string-list.h"
31 #include "strvec.h"
32 #include "graph.h"
merge-blobs.c
+1 -1
@@ -1,7 +1,7 @@
1 #include "git-compat-util.h"
2 #include "run-command.h"
3 #include "xdiff-interface.h"
4 -#include "ll-merge.h"
4 +#include "merge-ll.h"
5 #include "blob.h"
6 #include "merge-blobs.h"
7 #include "object-store.h"
merge-ll.c renamed
+1 -1
@@ -10,7 +10,7 @@
10 #include "attr.h"
11 #include "xdiff-interface.h"
12 #include "run-command.h"
13 -#include "ll-merge.h"
13 +#include "merge-ll.h"
14 #include "quote.h"
15 #include "strbuf.h"
16 #include "wrapper.h"
merge-ll.h renamed
merge-ort.c
+1 -1
@@ -30,7 +30,7 @@
30 #include "gettext.h"
31 #include "hex.h"
32 #include "entry.h"
33 -#include "ll-merge.h"
33 +#include "merge-ll.h"
34 #include "match-trees.h"
35 #include "mem-pool.h"
36 #include "object-name.h"
merge-recursive.c
+1 -1
@@ -20,7 +20,7 @@
20 #include "environment.h"
21 #include "gettext.h"
22 #include "hex.h"
23 -#include "ll-merge.h"
23 +#include "merge-ll.h"
24 #include "lockfile.h"
25 #include "match-trees.h"
26 #include "name-hash.h"
notes-merge.c
+1 -1
@@ -12,7 +12,7 @@
12 #include "diffcore.h"
13 #include "hex.h"
14 #include "xdiff-interface.h"
15 -#include "ll-merge.h"
15 +#include "merge-ll.h"
16 #include "dir.h"
17 #include "notes.h"
18 #include "notes-merge.h"
rerere.c
+1 -1
@@ -12,7 +12,7 @@
12 #include "xdiff-interface.h"
13 #include "dir.h"
14 #include "resolve-undo.h"
15 -#include "ll-merge.h"
15 +#include "merge-ll.h"
16 #include "attr.h"
17 #include "path.h"
18 #include "pathspec.h"