@matheusbsbs / matheus-bagliano / commits / 0be240cc65
Fork 0

checkout: tweak detached-orphan warning format

When orphaning a commit on a detached HEAD, the warning currently looks like: Warning: you are leaving 3 commits behind, not connected to any of your branches: - commit subject 1 - commit subject 2 - commit subject 3 If you want to keep them by creating a new branch, this may be a good time to do so with: git branch new_branch_name 933a615ab0bc566dcfd8c01ec8af159f770d3fe5 Instead of using the "-" list, let's provide a more traditional oneline format, with the abbreviated sha1 before each subject. Users are accustomed to seeing commits in this format, and having the sha1 of each commit can be useful if you want to cherry-pick instead of creating a new branch. The new format looks like: Warning: you are leaving 3 commits behind, not connected to any of your branches: 933a615 commit subject 1 824fcde commit subject 2 fa49b1a commit subject 3 Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Mar 20, 2011 at 05:19 UTC 0be240cc65c2230d0c9732dbe0e2490a9331ea32
1 file changed +4 -1
builtin/checkout.c
+4 -1
@@ -619,7 +619,10 @@ static void describe_one_orphan(struct strbuf *sb, struct commit *commit)
619 struct pretty_print_context ctx = { 0 };
620
621 parse_commit(commit);
622 - strbuf_addstr(sb, " - ");
622 + strbuf_addstr(sb, " ");
623 + strbuf_addstr(sb,
624 + find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
625 + strbuf_addch(sb, ' ');
626 pretty_print_commit(CMIT_FMT_ONELINE, commit, sb, &ctx);
627 strbuf_addch(sb, '\n');
628 }