diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-24 17:08:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-24 21:26:42 (GMT) |
| commit | f807b3dcab9cafd76936d24936b8353f99b2ae6d (patch) | |
| tree | 56b891ece6ef23b8586187327cdbf40dc94ccd00 | |
| parent | 8e2dc6ac06ae90a00965e5c00aa4918dfd447639 (diff) | |
| download | git-f807b3dcab9cafd76936d24936b8353f99b2ae6d.zip git-f807b3dcab9cafd76936d24936b8353f99b2ae6d.tar.gz git-f807b3dcab9cafd76936d24936b8353f99b2ae6d.tar.bz2 | |
checkout: make advice when reattaching the HEAD less loud
When switching away from a detached HEAD with "git checkout", we give a
listing of the commits about to be lost, and then tell how to resurrect
them since 8e2dc6a (commit: give final warning when reattaching HEAD to
leave commits behind, 2011-02-18).
This is a good safety measure for people who are not comfortable with the
detached HEAD state, but the advice on how to keep the state you just left
was given even to those who set advice.detachedHead to false.
Keep the warning and informational commit listing, but honor the setting
of advice.detachedHead to squelch the advice.
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/checkout.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index e44364c..90870d9 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -634,14 +634,17 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs) "Warning: you are leaving %d commit%s behind, " "not connected to\n" "any of your branches:\n\n" - "%s\n" - "If you want to keep them by creating a new branch, " - "this may be a good time\nto do so with:\n\n" - " git branch new_branch_name %s\n\n", + "%s\n", lost, ((1 < lost) ? "s" : ""), - sb.buf, - sha1_to_hex(commit->object.sha1)); + sb.buf); strbuf_release(&sb); + + if (advice_detached_head) + fprintf(stderr, + "If you want to keep them by creating a new branch, " + "this may be a good time\nto do so with:\n\n" + " git branch new_branch_name %s\n\n", + sha1_to_hex(commit->object.sha1)); } /* |