Make local branches behave like remote branches when --tracked

This makes sure that local branches, when followed using --track, behave
the same as remote ones (e.g. differences being reported by git status
and git checkout). This fixes 1 known failure.

The fix is done within branch_get(): The first natural candidate,
namely remote_find_tracking(), does not have all the necessary info
because in general there is no remote struct for '.', and we don't want
one because it would show up in other places as well.

branch_get(), on the other hand, has access to merge_names[] (in
addition to merge[]) and therefore can set up the followed branch
easily.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/remote.c b/remote.c
index e5d6b100d738c388bff91bff68b14f69dea87166..30d7fdec834cc0dcc35d335754add91f96b51ab3 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1170,8 +1170,9 @@ struct branch *branch_get(const char *name)
                        for (i = 0; i < ret->merge_nr; i++) {
                                ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
                                ret->merge[i]->src = xstrdup(ret->merge_name[i]);
                        for (i = 0; i < ret->merge_nr; i++) {
                                ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
                                ret->merge[i]->src = xstrdup(ret->merge_name[i]);

-                               remote_find_tracking(ret->remote,
-                                                    ret->merge[i]);
+                               if (remote_find_tracking(ret->remote, ret->merge[i])
+                                   && !strcmp(ret->remote_name, "."))
+                                       ret->merge[i]->dst = xstrdup(ret->merge_name[i]);

                        }
                }
        }
                        }
                }
        }


@@ -1450,6 +1451,8 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
        base = branch->merge[0]->dst;
        if (!prefixcmp(base, "refs/remotes/")) {
                base += strlen("refs/remotes/");
        base = branch->merge[0]->dst;
        if (!prefixcmp(base, "refs/remotes/")) {
                base += strlen("refs/remotes/");

+       } else if (!prefixcmp(base, "refs/heads/")) {
+               base += strlen("refs/heads/");

        }
        if (!num_theirs)
                strbuf_addf(sb, "Your branch is ahead of '%s' "
        }
        if (!num_theirs)
                strbuf_addf(sb, "Your branch is ahead of '%s' "

diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index 2a2b6b63d50313775226d6fe55bca846a067a263..3d6db4d386a0a009892fac490818294664d188fa 100755 (executable)
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -58,7 +58,7 @@ test_expect_success 'checkout' '
        grep "have 1 and 1 different" actual
 '
 
        grep "have 1 and 1 different" actual
 '
 

-test_expect_failure 'checkout with local tracked branch' '
+test_expect_success 'checkout with local tracked branch' '

        git checkout master &&
        git checkout follower >actual
        grep "is ahead of" actual
        git checkout master &&
        git checkout follower >actual
        grep "is ahead of" actual