[PATCH v5 3/6] set-head: better output for --auto
From: Bence Ferdinandy <hidden>
Date: 2024-10-09 14:05:56
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2024-10-10 · Re: [PATCH v5 3/6] set-head: better output for --auto · Bence Ferdinandy <hidden>
- 2024-10-10 · Re: [PATCH v5 3/6] set-head: better output for --auto · Ramsay Jones <hidden>
- 2024-10-10 · Re: [PATCH v5 3/6] set-head: better output for --auto · Junio C Hamano <hidden>
- 2024-10-09 · Re: [PATCH v5 3/6] set-head: better output for --auto · Junio C Hamano <hidden>
Currently, set-head --auto will print a message saying "remote/HEAD set
to branch", which implies something was changed.
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.
Signed-off-by: Bence Ferdinandy <redacted>
---
Notes:
v1-v2:
was RFC in https://lore.kernel.org/git/20240910203835.2288291-1-bence@ferdinandy.com/ (local)
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.
Was sent in:
https://lore.kernel.org/git/20240915221055.904107-1-bence@ferdinandy.com/ (local)
v4:
- changes are now handled atomically via the ref update transaction
- outputs have changed along the lines of Junio's suggestion
- minor refactor to set_head for improved legibility
v5: - the minor refactor has been split out into its own patch
builtin/remote.c | 30 ++++++++++++++++++++++++++----
t/t5505-remote.sh | 13 ++++++++++++-
2 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/builtin/remote.c b/builtin/remote.c
index 353ffd2c43..2480128b88 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c@@ -1399,10 +1399,30 @@ static int show(int argc, const char **argv, const char *prefix) return result; } +static void report_auto(const char *remote, const char *head_name, + struct strbuf *buf_prev) { + struct strbuf buf_prefix = STRBUF_INIT; + const char *prev_head; + + strbuf_addf(&buf_prefix, "refs/remotes/%s/", remote); + skip_prefix(buf_prev->buf, buf_prefix.buf, &prev_head); + + if (prev_head && !strcmp(prev_head, head_name)) + printf("'%s/HEAD' is unchanged and points to '%s'\n", + remote, head_name); + else if (prev_head) + printf("'%s/HEAD' has changed from '%s' and now points to '%s'\n", + remote, prev_head, head_name); + else + printf("'%s/HEAD' is now created and points to '%s'\n", + remote, head_name); +} + 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; + struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT, + buf_prev = STRBUF_INIT; char *head_name = NULL; struct ref_store *refs = get_main_ref_store(the_repository);
@@ -1445,15 +1465,17 @@ static int set_head(int argc, const char **argv, const char *prefix) /* make sure it's valid */ if (!refs_ref_exists(refs, buf2.buf)) result |= error(_("Not a valid ref: %s"), buf2.buf); - else if (refs_update_symref(refs, buf.buf, buf2.buf, "remote set-head", NULL)) + else if (refs_update_symref(refs, buf.buf, buf2.buf, "remote set-head", &buf_prev)) result |= error(_("Could not setup %s"), buf.buf); - else if (opt_a) - printf("%s/HEAD set to %s\n", argv[0], head_name); + else if (opt_a) { + report_auto(argv[0], head_name, &buf_prev); + } free(head_name); } strbuf_release(&buf); strbuf_release(&buf2); + strbuf_release(&buf_prev); return result; }
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 532035933f..262a4de0aa 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'\'' is unchanged and points to '\''main'\''" >expect && test_cmp expect output ) '
@@ -453,6 +453,17 @@ test_expect_success 'set-head explicit' ' ) ' + +test_expect_success 'set-head --auto reports change' ' + ( + cd test && + git remote set-head origin side2 && + git remote set-head --auto origin >output 2>&1 && + echo "'\''origin/HEAD'\'' has changed from '\''side2'\'' and now points to '\''main'\''" >expect && + test_cmp expect output + ) +' + cat >test/expect <<EOF Pruning origin URL: $(pwd)/one
--
2.47.0.6.g9542df9767