summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-18 11:46:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-18 11:46:33 -0700
commitbd1184c6dedacb5f76513c299ae07019d6bed963 (patch)
tree3867cf260e72bd8cb09fc34ade29d0fef828a767
parentMerge branch 'jc/detached-head-doc' (diff)
parentcheckout: abbreviate hash in suggest_reattach (diff)
downloadtgif-bd1184c6dedacb5f76513c299ae07019d6bed963.tar.xz
Merge branch 'kb/co-orphan-suggestion-short-sha1'
Update the informational message when "git checkout" leaves the detached head state. * kb/co-orphan-suggestion-short-sha1: checkout: abbreviate hash in suggest_reattach
-rw-r--r--builtin/checkout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index f8033f446e..eb51872347 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -729,7 +729,7 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs)
"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));
+ find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
}
/*