author | Junio C Hamano <gitster@pobox.com> | |
Thu, 30 Jun 2011 00:03:10 +0000 (17:03 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 30 Jun 2011 00:03:10 +0000 (17:03 -0700) |
* jc/advice-about-to-lose-commit:
checkout: make advice when reattaching the HEAD less loud
Conflicts:
builtin/checkout.c
checkout: make advice when reattaching the HEAD less loud
Conflicts:
builtin/checkout.c
builtin/checkout.c | patch | blob | history |
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 28cdc51b85e7d433dca085c0080f964d19a391b4..015730fbd5c66eb60c3999ffbfaf33f07b841315 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
"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));
}
/*