development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
git/builtin
History
Elijah Newren 6723899932 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 d1cbe1e6d8 ("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>
2023-06-21 13:39:54 -07:00
..
add.c diff.h: remove unnecessary include of oidset.h 2023-06-21 13:39:53 -07:00
am.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
annotate.c
apply.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
archive.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
bisect.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
blame.c pager.h: move declarations for pager.c functions from cache.h 2023-04-11 08:52:10 -07:00
branch.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
bugreport.c editor: move editor-related functions and declarations into common file 2023-04-11 08:52:10 -07:00
bundle.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
cat-file.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
check-attr.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
check-ignore.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
check-mailmap.c builtin.h: remove unneccessary includes 2023-06-21 13:39:54 -07:00
check-ref-format.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
checkout--worker.c read-cache*.h: move declarations for read-cache.c functions from cache.h 2023-06-21 13:39:53 -07:00
checkout-index.c read-cache*.h: move declarations for read-cache.c functions from cache.h 2023-06-21 13:39:53 -07:00
checkout.c merge-ll: rename from ll-merge 2023-06-21 13:39:54 -07:00
clean.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
clone.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
column.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
commit-graph.c builtin.h: remove unneccessary includes 2023-06-21 13:39:54 -07:00
commit-tree.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
commit.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
config.c builtin.h: remove unneccessary includes 2023-06-21 13:39:54 -07:00
count-objects.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
credential-cache--daemon.c Merge branch 'mh/credential-oauth-refresh-token' 2023-05-10 10:23:29 -07:00
credential-cache.c builtin.h: remove unneccessary includes 2023-06-21 13:39:54 -07:00
credential-store.c hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
credential.c builtins: mark unused prefix parameters 2023-03-28 14:11:24 -07:00
describe.c git-compat-util.h: remove unneccessary include of wildmatch.h 2023-06-21 13:39:54 -07:00
diagnose.c object-file.h: move declarations for object-file.c functions from cache.h 2023-04-11 08:52:10 -07:00
diff-files.c diff.h: remove unnecessary include of oidset.h 2023-06-21 13:39:53 -07:00
diff-index.c diff.h: remove unnecessary include of oidset.h 2023-06-21 13:39:53 -07:00
diff-tree.c log-tree: replace include of revision.h with simple forward declaration 2023-06-21 13:39:53 -07:00
diff.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
difftool.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
fast-export.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
fast-import.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
fetch-pack.c Merge branch 'en/header-split-cache-h' 2023-04-25 13:56:20 -07:00
fetch.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
fmt-merge-msg.c wrapper.h: move declarations for wrapper.c functions from cache.h 2023-03-21 10:56:53 -07:00
for-each-ref.c builtin.h: remove unneccessary includes 2023-06-21 13:39:54 -07:00
for-each-repo.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
fsck.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
fsmonitor--daemon.c Merge branch 'en/header-split-cache-h' 2023-04-25 13:56:20 -07:00
gc.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
get-tar-commit-id.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
grep.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
hash-object.c object-file.h: move declarations for object-file.c functions from cache.h 2023-04-11 08:52:10 -07:00
help.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
hook.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
index-pack.c Merge branch 'tb/pack-revindex-on-disk' 2023-04-27 16:00:59 -07:00
init-db.c builtin.h: remove unneccessary includes 2023-06-21 13:39:54 -07:00
interpret-trailers.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
log.c Merge branch 'jk/log-follow-with-non-literal-pathspec' 2023-06-20 15:53:13 -07:00
ls-files.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
ls-remote.c git-compat-util.h: remove unneccessary include of wildmatch.h 2023-06-21 13:39:54 -07:00
ls-tree.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
mailinfo.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
mailsplit.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
merge-base.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
merge-file.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
merge-index.c read-cache*.h: move declarations for read-cache.c functions from cache.h 2023-06-21 13:39:53 -07:00
merge-ours.c diff.h: remove unnecessary include of oidset.h 2023-06-21 13:39:53 -07:00
merge-recursive.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
merge-tree.c surround %s with quotes when failed to lookup commit 2023-06-03 09:01:10 +09:00
merge.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
mktag.c Merge branch 'en/header-split-cache-h' 2023-04-25 13:56:20 -07:00
mktree.c treewide: be explicit about dependence on gettext.h 2023-03-21 10:56:51 -07:00
multi-pack-index.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
mv.c read-cache*.h: move declarations for read-cache.c functions from cache.h 2023-06-21 13:39:53 -07:00
name-rev.c git-compat-util.h: remove unneccessary include of wildmatch.h 2023-06-21 13:39:54 -07:00
notes.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
pack-objects.c attr: teach "--attr-source=<tree>" global option to "git" 2023-05-06 14:34:09 -07:00
pack-redundant.c Merge branch 'en/header-split-cleanup' 2023-04-06 13:38:31 -07:00
pack-refs.c pack-refs: teach pack-refs --include option 2023-05-12 14:54:14 -07:00
patch-id.c diff.h: remove unnecessary include of oidset.h 2023-06-21 13:39:53 -07:00
prune-packed.c treewide: be explicit about dependence on gettext.h 2023-03-21 10:56:51 -07:00
prune.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
pull.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
push.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
range-diff.c diff.h: remove unnecessary include of oidset.h 2023-06-21 13:39:53 -07:00
read-tree.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
rebase.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
receive-pack.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
reflog.c git-compat-util.h: remove unneccessary include of wildmatch.h 2023-06-21 13:39:54 -07:00
remote-ext.c builtins: annotate always-empty prefix parameters 2023-03-28 14:11:24 -07:00
remote-fd.c builtins: annotate always-empty prefix parameters 2023-03-28 14:11:24 -07:00
remote.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
repack.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
replace.c git-compat-util.h: remove unneccessary include of wildmatch.h 2023-06-21 13:39:54 -07:00
rerere.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
reset.c diff.h: remove unnecessary include of oidset.h 2023-06-21 13:39:53 -07:00
rev-list.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
rev-parse.c diff.h: remove unnecessary include of oidset.h 2023-06-21 13:39:53 -07:00
revert.c diff.h: remove unnecessary include of oidset.h 2023-06-21 13:39:53 -07:00
rm.c read-cache*.h: move declarations for read-cache.c functions from cache.h 2023-06-21 13:39:53 -07:00
send-pack.c Merge branch 'en/header-split-cleanup' 2023-04-06 13:38:31 -07:00
shortlog.c diff.h: remove unnecessary include of oidset.h 2023-06-21 13:39:53 -07:00
show-branch.c git-compat-util.h: remove unneccessary include of wildmatch.h 2023-06-21 13:39:54 -07:00
show-index.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
show-ref.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
sparse-checkout.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
stash.c diff.h: remove unnecessary include of oidset.h 2023-06-21 13:39:53 -07:00
stripspace.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
submodule--helper.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
symbolic-ref.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
tag.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
unpack-file.c Merge branch 'en/header-split-cache-h' 2023-04-25 13:56:20 -07:00
unpack-objects.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
update-index.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
update-ref.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
update-server-info.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
upload-archive.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
upload-pack.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
var.c Merge branch 'en/header-split-cache-h' 2023-04-25 13:56:20 -07:00
verify-commit.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
verify-pack.c builtin.h: remove unneccessary includes 2023-06-21 13:39:54 -07:00
verify-tag.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
worktree.c repository: remove unnecessary include of path.h 2023-06-21 13:39:53 -07:00
write-tree.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00