summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-30 00:03:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-30 00:03:10 (GMT)
commit0faf247485c2dc92fd8b492a5c4b49237e0338ee (patch)
tree11dd5084b96ee09a38257693a6a29cbb6b3ab081 /builtin
parentdbae1a13363c45d3f77061f61ca73a0c3ed045cf (diff)
parentf807b3dcab9cafd76936d24936b8353f99b2ae6d (diff)
downloadgit-0faf247485c2dc92fd8b492a5c4b49237e0338ee.zip
git-0faf247485c2dc92fd8b492a5c4b49237e0338ee.tar.gz
git-0faf247485c2dc92fd8b492a5c4b49237e0338ee.tar.bz2
Merge branch 'jc/advice-about-to-lose-commit'
* jc/advice-about-to-lose-commit: checkout: make advice when reattaching the HEAD less loud Conflicts: builtin/checkout.c
Diffstat (limited to 'builtin')
-rw-r--r--builtin/checkout.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 28cdc51..015730f 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -657,24 +657,25 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs)
"Warning: you are leaving %d commit behind, "
"not connected to\n"
"any of your branches:\n\n"
- "%s\n"
- "If you want to keep it 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",
/* The plural version */
"Warning: you are leaving %d commits 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",
/* Give ngettext() the count */
lost),
lost,
- 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));
}
/*