diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2012-11-15 11:45:00 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-16 11:24:11 -0800 |
| commit | c190ced600223f0774f6ba33f608b1e1347e623e (patch) | |
| tree | 024bc8fb007c2fa0a20fc0277a85cd163230c6de | |
| parent | 8c7a786b6c8eae8eac91083cdc9a6e337bc133b0 (diff) | |
| download | git-c190ced600223f0774f6ba33f608b1e1347e623e.tar.gz git-c190ced600223f0774f6ba33f608b1e1347e623e.tar.xz | |
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>
| -rw-r--r-- | remote.c | 13 | ||||
| -rwxr-xr-x | t/t2020-checkout-detach.sh | 1 |
2 files changed, 11 insertions, 3 deletions
@@ -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); - 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); - 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", @@ -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); - 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, " @@ -1651,6 +1655,9 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb) "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; } diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh index 81005373d..5d68729d7 100755 --- 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. + (use "git pull" to update your local branch) EOF test_expect_success 'tracking count is accurate after orphan check' ' reset && |