Re: [PATCH v3 1/3] diff-merges: improve --diff-merges documentation
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 7, 2023, 01:50 UTC
- Message-ID
- <xmqqjzrz5hgn.fsf@gitster.g>
- In-Reply-To
- <CABPp-BGxVnhnmoajWyqY_gMvQ42W5S6VX5EOXq3PW=GLVQwe0g@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
Show 7 quoted lines
> In my opinion, --remerge-diff does this better; wouldn't we want a > rationale where these particular modes shine? Is that a non-empty > set? (It may well be, but to me, --cc was never worse than -c while > often being better, and likewise, --remerge-diff is never worse than > --cc while often being better, at least on anything I had thought to > use any of these for. Maybe there are other usecases for -c and --cc > I'm just not thinking of?)
Between -c and --cc, I do not think there is anything that makes us favor -c over --cc. While the algorithm to decide which hunks out of -c's output to omit was being polished, comparison with -c served a good way to give baseline, but once --cc has become solid, I do not think I've used -c myself.
I personally find that a very trivial merge resolution is far easier to read with --cc than --remerge-diff, the latter being way too verbose.
Also, --cc and -c should work inside a read-only repository where you only have read access to. If remerge needs to write some objects to the repository, then you'd need some hack to give a writable object store overlay via the alternate odb mechanism, or something, right?
$ git show --oneline --cc -U1 9fde277c338 9fde277c33 Merge branch 'cc/git-replay' into seen
diff --cc Makefile index cf60c16deb,05a504dc28..c581c1ddba
--- a/Makefile +++ b/Makefile @@@ -803,4 -801,2 +803,3 @@@ TEST_BUILTINS_OBJS += test-env-helper. TEST_BUILTINS_OBJS += test-example-decorate.o - TEST_BUILTINS_OBJS += test-fast-rebase.o +TEST_BUILTINS_OBJS += test-find-pack.o TEST_BUILTINS_OBJS += test-fsmonitor-client.o diff --cc t/helper/test-tool.c index 9010ac6de7,9ca1586de7..77b1d7c15d --- a/t/helper/test-tool.c +++ b/t/helper/test-tool.c @@@ -32,4 -32,2 +32,3 @@@ static struct test_cmd cmds[] = { "example-decorate", cmd__example_decorate }, - { "fast-rebase", cmd__fast_rebase }, + { "find-pack", cmd__find_pack }, { "fsmonitor-client", cmd__fsmonitor_client }, diff --cc t/helper/test-tool.h index f134f96b97,a03bbfc6b2..5deeca66fe --- a/t/helper/test-tool.h +++ b/t/helper/test-tool.h @@@ -26,4 -26,2 +26,3 @@@ int cmd__env_helper(int argc, const cha int cmd__example_decorate(int argc, const char **argv); - int cmd__fast_rebase(int argc, const char **argv); +int cmd__find_pack(int argc, const char **argv); int cmd__fsmonitor_client(int argc, const char **argv); $ git show --oneline --remerge-diff -U1 9fde277c338 9fde277c33 Merge branch 'cc/git-replay' into seen diff --git a/Makefile b/Makefile remerge CONFLICT (content): Merge conflict in Makefile index 987c8e3569..c581c1ddba 100644 --- a/Makefile +++ b/Makefile @@ -803,9 +803,3 @@ TEST_BUILTINS_OBJS += test-env-helper.o TEST_BUILTINS_OBJS += test-example-decorate.o -<<<<<<< 0fd7a144c5 (Merge branch 'js/doc-unit-tests-with-cmake' into seen) -TEST_BUILTINS_OBJS += test-fast-rebase.o TEST_BUILTINS_OBJS += test-find-pack.o -||||||| 1fc548b2d6 -TEST_BUILTINS_OBJS += test-fast-rebase.o -======= ->>>>>>> 0b853ad4db (replay: stop assuming replayed branches do not diverge) TEST_BUILTINS_OBJS += test-fsmonitor-client.o diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c remerge CONFLICT (content): Merge conflict in t/helper/test-tool.c index 87a9794564..77b1d7c15d 100644 --- a/t/helper/test-tool.c +++ b/t/helper/test-tool.c @@ -32,9 +32,3 @@ static struct test_cmd cmds[] = { { "example-decorate", cmd__example_decorate }, -<<<<<<< 0fd7a144c5 (Merge branch 'js/doc-unit-tests-with-cmake' into seen) - { "fast-rebase", cmd__fast_rebase }, { "find-pack", cmd__find_pack }, -||||||| 1fc548b2d6 - { "fast-rebase", cmd__fast_rebase }, -======= ->>>>>>> 0b853ad4db (replay: stop assuming replayed branches do not diverge) { "fsmonitor-client", cmd__fsmonitor_client }, diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h remerge CONFLICT (content): Merge conflict in t/helper/test-tool.h index e8abf4c42f..5deeca66fe 100644 --- a/t/helper/test-tool.h +++ b/t/helper/test-tool.h @@ -26,9 +26,3 @@ int cmd__env_helper(int argc, const char **argv); int cmd__example_decorate(int argc, const char **argv); -<<<<<<< 0fd7a144c5 (Merge branch 'js/doc-unit-tests-with-cmake' into seen) -int cmd__fast_rebase(int argc, const char **argv); int cmd__find_pack(int argc, const char **argv); -||||||| 1fc548b2d6 -int cmd__fast_rebase(int argc, const char **argv); -======= ->>>>>>> 0b853ad4db (replay: stop assuming replayed branches do not diverge) int cmd__fsmonitor_client(int argc, const char **argv);