remote set-head: better output for --auto

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. As edge cases, if HEAD is changed from
a previous symbolic reference that was not a remote branch, explicitly
call attention to this fact, and also notify the user if the previous
reference was not a symbolic reference.

Signed-off-by: Bence Ferdinandy <bence@ferdinandy.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/remote.c b/builtin/remote.c
index bcc3ee91ef17406a56d5fd34cc0bf60d3a7073d9..6d659d63ca889b1a6fd62e6acbf196149851b014 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1399,10 +1399,38 @@ static int show(int argc, const char **argv, const char *prefix)
        return result;
 }
 
+static void report_set_head_auto(const char *remote, const char *head_name,
+                       struct strbuf *b_local_head, int was_detached) {
+       struct strbuf buf_prefix = STRBUF_INIT;
+       const char *prev_head = NULL;
+
+       strbuf_addf(&buf_prefix, "refs/remotes/%s/", remote);
+       skip_prefix(b_local_head->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 if (!b_local_head->len)
+               printf(_("'%s/HEAD' is now created and points to '%s'\n"),
+                       remote, head_name);
+       else if (was_detached && b_local_head->len)
+               printf(_("'%s/HEAD' was detached at '%s' and now points to '%s'\n"),
+                       remote, b_local_head->buf, head_name);
+       else
+               printf(_("'%s/HEAD' used to point to '%s' "
+                       "(which is not a remote branch), but now points to '%s'\n"),
+                       remote, b_local_head->buf, head_name);
+       strbuf_release(&buf_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 b_head = STRBUF_INIT, b_remote_head = STRBUF_INIT;
+       int i, opt_a = 0, opt_d = 0, result = 0, was_detached;
+       struct strbuf b_head = STRBUF_INIT, b_remote_head = STRBUF_INIT,
+               b_local_head = STRBUF_INIT;
        char *head_name = NULL;
        struct ref_store *refs = get_main_ref_store(the_repository);
 
@@ -1440,20 +1468,27 @@ static int set_head(int argc, const char **argv, const char *prefix)
        } else
                usage_with_options(builtin_remote_sethead_usage, options);
 
-       if (head_name) {
-               strbuf_addf(&b_remote_head, "refs/remotes/%s/%s", argv[0], head_name);
-               /* make sure it's valid */
-               if (!refs_ref_exists(refs, b_remote_head.buf))
-                       result |= error(_("Not a valid ref: %s"), b_remote_head.buf);
-               else if (refs_update_symref(refs, b_head.buf, b_remote_head.buf, "remote set-head"))
-                       result |= error(_("Could not set up %s"), b_head.buf);
-               else if (opt_a)
-                       printf("%s/HEAD set to %s\n", argv[0], head_name);
-               free(head_name);
+       if (!head_name)
+               goto cleanup;
+       strbuf_addf(&b_remote_head, "refs/remotes/%s/%s", argv[0], head_name);
+       if (!refs_ref_exists(refs, b_remote_head.buf)) {
+               result |= error(_("Not a valid ref: %s"), b_remote_head.buf);
+               goto cleanup;
+       }
+       was_detached = refs_update_symref_extended(refs, b_head.buf, b_remote_head.buf,
+                       "remote set-head", &b_local_head);
+       if (was_detached == -1) {
+               result |= error(_("Could not set up %s"), b_head.buf);
+               goto cleanup;
        }
+       if (opt_a)
+               report_set_head_auto(argv[0], head_name, &b_local_head, was_detached);
 
+cleanup:
+       free(head_name);
        strbuf_release(&b_head);
        strbuf_release(&b_remote_head);
+       strbuf_release(&b_local_head);
        return result;
 }
 

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 61e3ecc1af3136a818553e6e8f844b322187bbf5..d15b579c9553fb48a99d743417d2523737a2b51f 100755 (executable)
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -444,12 +444,63 @@ test_expect_success REFFILES 'set-head --auto failure' '
        )
 '
 
+test_expect_success 'set-head --auto detects creation' '
+       (
+               cd test &&
+               git update-ref --no-deref -d refs/remotes/origin/HEAD &&
+               git remote set-head --auto origin >output &&
+               echo "${SQ}origin/HEAD${SQ} is now created and points to ${SQ}main${SQ}" >expect &&
+               test_cmp expect output
+       )
+'
+
+test_expect_success 'set-head --auto to update a non symbolic ref' '
+       (
+               cd test &&
+               git update-ref --no-deref -d refs/remotes/origin/HEAD &&
+               git update-ref refs/remotes/origin/HEAD HEAD &&
+               HEAD=$(git log --pretty="%H") &&
+               git remote set-head --auto origin >output &&
+               echo "${SQ}origin/HEAD${SQ} was detached at ${SQ}${HEAD}${SQ} and now points to ${SQ}main${SQ}" >expect &&
+               test_cmp expect output
+       )
+'
+
+test_expect_success 'set-head --auto detects no change' '
+       (
+               cd test &&
+               git remote set-head --auto origin >output &&
+               echo "${SQ}origin/HEAD${SQ} is unchanged and points to ${SQ}main${SQ}" >expect &&
+               test_cmp expect output
+       )
+'
+
+test_expect_success 'set-head --auto detects change' '
+       (
+               cd test &&
+               git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/ahead &&
+               git remote set-head --auto origin >output &&
+               echo "${SQ}origin/HEAD${SQ} has changed from ${SQ}ahead${SQ} and now points to ${SQ}main${SQ}" >expect &&
+               test_cmp expect output
+       )
+'
+
+test_expect_success 'set-head --auto detects strange ref' '
+       (
+               cd test &&
+               git symbolic-ref refs/remotes/origin/HEAD refs/heads/main &&
+               git remote set-head --auto origin >output &&
+               echo "${SQ}origin/HEAD${SQ} used to point to ${SQ}refs/heads/main${SQ} (which is not a remote branch), but now points to ${SQ}main${SQ}" >expect &&
+               test_cmp expect output
+       )
+'
+
 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 "${SQ}two/HEAD${SQ} is now created and points to ${SQ}main${SQ}" >expect &&
                test_cmp expect output
        )
 '
@@ -468,6 +519,16 @@ 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 "${SQ}origin/HEAD${SQ} has changed from ${SQ}side2${SQ} and now points to ${SQ}main${SQ}" >expect &&
+               test_cmp expect output
+       )
+'
+
 cat >test/expect <<EOF
 Pruning origin
 URL: $(pwd)/one