status: add advice on how to push/pull to tracking branch

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/remote.c b/remote.c
index 04fd9ea4bd2f99003c9c5abb7bbbad7dafca3937..9c196892b9d70b8c9b901dadaf9a787786806e54 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1627,13 +1627,15 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
 
        base = branch->merge[0]->dst;
        base = shorten_unambiguous_ref(base, 0);
 
        base = branch->merge[0]->dst;
        base = shorten_unambiguous_ref(base, 0);

-       if (!num_theirs)
+       if (!num_theirs) {

                strbuf_addf(sb,
                        Q_("Your branch is ahead of '%s' by %d commit.\n",
                           "Your branch is ahead of '%s' by %d commits.\n",
                           num_ours),
                        base, num_ours);
                strbuf_addf(sb,
                        Q_("Your branch is ahead of '%s' by %d commit.\n",
                           "Your branch is ahead of '%s' by %d commits.\n",
                           num_ours),
                        base, num_ours);

-       else if (!num_ours)
+               strbuf_addf(sb,
+                       _("  (use \"git push\" to publish your local commits)\n"));
+       } else if (!num_ours) {

                strbuf_addf(sb,
                        Q_("Your branch is behind '%s' by %d commit, "
                               "and can be fast-forwarded.\n",
                strbuf_addf(sb,
                        Q_("Your branch is behind '%s' by %d commit, "
                               "and can be fast-forwarded.\n",


@@ -1641,7 +1643,9 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
                               "and can be fast-forwarded.\n",
                           num_theirs),
                        base, num_theirs);
                               "and can be fast-forwarded.\n",
                           num_theirs),
                        base, num_theirs);

-       else
+               strbuf_addf(sb,
+                       _("  (use \"git pull\" to update your local branch)\n"));
+       } else {

                strbuf_addf(sb,
                        Q_("Your branch and '%s' have diverged,\n"
                               "and have %d and %d different commit each, "
                strbuf_addf(sb,
                        Q_("Your branch and '%s' have diverged,\n"
                               "and have %d and %d different commit each, "


@@ -1651,6 +1655,9 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
                               "respectively.\n",
                           num_theirs),
                        base, num_ours, num_theirs);
                               "respectively.\n",
                           num_theirs),
                        base, num_ours, num_theirs);

+               strbuf_addf(sb,
+                       _("  (use \"git pull\" to merge the remote branch into yours)\n"));
+       }

        return 1;
 }
 
        return 1;
 }
 

diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index 81005373d728f09e1a9289048cc721a0300f1cf9..5d68729d7a65abde09d1293e8569b730d2ba9a40 100755 (executable)
--- a/t/t2020-checkout-detach.sh
+++ b/t/t2020-checkout-detach.sh
@@ -151,6 +151,7 @@ test_expect_success 'checkout does not warn leaving reachable commit' '
 
 cat >expect <<'EOF'
 Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
 
 cat >expect <<'EOF'
 Your branch is behind 'master' by 1 commit, and can be fast-forwarded.

+  (use "git pull" to update your local branch)

 EOF
 test_expect_success 'tracking count is accurate after orphan check' '
        reset &&
 EOF
 test_expect_success 'tracking count is accurate after orphan check' '
        reset &&