Merge branch 'kb/co-orphan-suggestion-short-sha1'

gitster · gitster · commit bd1184c6deda · 2013-04-18T11:46:33.000-07:00
Update the informational message when "git checkout" leaves the
detached head state.

* kb/co-orphan-suggestion-short-sha1:
  checkout: abbreviate hash in suggest_reattach
diff --git 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));
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -729,7 +729,7 @@ static void suggest_reattach(struct commit commit, struct rev_info revs)`
`729`	`729`	`"If you want to keep them by creating a new branch, "`
`730`	`730`	`"this may be a good time\nto do so with:\n\n"`
`731`	`731`	`" git branch new_branch_name %s\n\n"),`
`732`		`- sha1_to_hex(commit->object.sha1));`
	`732`	`+ find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));`
`733`	`733`	`}`
`734`	`734`
`735`	`735`	`/*`