[PATCH v3] set-head: no update without change and better output for --auto
- From
Bence Ferdinandy <bence@ferdinandy.com>
- Date
- Sep 15, 2024, 22:09 UTC
- Message-ID
- <20240915221055.904107-1-bence@ferdinandy.com>
Currently, even if there is no actual change to remote/HEAD calling remote set-head will overwrite the appropriate file and if set to --auto will also print a message saying "remote/HEAD set to branch", which implies something was changed.
Change the behaviour of remote set-head so that the reference is only updated if it actually needs to change.
Change the output of --auto, so the output actually reflects what was done: a) set a previously unset HEAD, b) change HEAD because remote changed or c) no updates. Make the output easily parsable, by using a slightly clunky wording that allows all three outputs to have the same structure and number of words.
Signed-off-by: Bence Ferdinandy <bence@ferdinandy.com> ---
Notes:
v1-v2:
was RFC in https://lore.kernel.org/git/20240910203835.2288291-1-bence@ferdinandy.com/
v3:
This patch was originally sent along when I thought set-head was
going to be invoked by fetch, but the discussion on the RFC
concluded that it should be not. This opened the possibility to make
it more explicit.
Note: although I feel both things the patch does are really just
cosmetic, an argument could be made for breaking it into two, one
for the no-op part and one for the --auto print update.builtin/remote.c | 14 ++++++++++---- t/t5505-remote.sh | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/builtin/remote.c b/builtin/remote.c index 0acc547d69..4b116dfc19 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -1400,8 +1400,8 @@ static int show(int argc, const char **argv, const char *prefix) static int set_head(int argc, const char **argv, const char *prefix) { - int i, opt_a = 0, opt_d = 0, result = 0; - struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT; + int i, opt_a = 0, opt_d = 0, is_ref_changed = 0, result = 0; + struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT, buf3 = STRBUF_INIT; char *head_name = NULL; struct option options[] = { @@ -1440,13 +1440,19 @@ static int set_head(int argc, const char **argv, const char *prefix) if (head_name) { strbuf_addf(&buf2, "refs/remotes/%s/%s", argv[0], head_name); + refs_read_symbolic_ref(get_main_ref_store(the_repository),buf.buf,&buf3); + is_ref_changed = strcmp(buf2.buf,buf3.buf); /* make sure it's valid */ if (!refs_ref_exists(get_main_ref_store(the_repository), buf2.buf)) result |= error(_("Not a valid ref: %s"), buf2.buf); - else if (refs_update_symref(get_main_ref_store(the_repository), buf.buf, buf2.buf, "remote set-head")) + else if (is_ref_changed && refs_update_symref(get_main_ref_store(the_repository), buf.buf, buf2.buf, "remote set-head")) result |= error(_("Could not setup %s"), buf.buf); + else if (opt_a && !strcmp(buf3.buf,"")) + printf("%s/HEAD was unset: set to %s\n", argv[0], head_name); + else if (opt_a && is_ref_changed) + printf("%s/HEAD was changed: set to %s\n", argv[0], head_name); else if (opt_a) - printf("%s/HEAD set to %s\n", argv[0], head_name); + printf("%s/HEAD was unchanged: set to %s\n", argv[0], head_name); free(head_name); } diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 532035933f..6b61f043d3 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -434,7 +434,7 @@ test_expect_success 'set-head --auto has no problem w/multiple HEADs' ' cd test && git fetch two "refs/heads/*:refs/remotes/two/*" && git remote set-head --auto two >output 2>&1 && - echo "two/HEAD set to main" >expect && + echo "two/HEAD was unset: set to main" >expect && test_cmp expect output ) '
-- 2.46.1.507.g531a0ea24e.dirty