From: Ralf Thielow <ralf.thielow@gmail.com>
Date: Mon, 28 Mar 2016 16:00:00 +0000 (+0200)
Subject: rebase-i: print an abbreviated hash when stop for editing
X-Git-Tag: v2.9.0-rc0~134^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14c793e8f409216b868223236fc54e5e5f86aa3a;p=thirdparty%2Fgit.git

rebase-i: print an abbreviated hash when stop for editing

The message that is shown when rebase-i stops for editing prints
the full hash of the commit where it stopped which makes the message
overflow to the next line on smaller terminal windows.  Print an
abbreviated hash instead.

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index b938a6d4aa..e98866e2a8 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -552,7 +552,8 @@ do_next () {
 
 		mark_action_done
 		do_pick $sha1 "$rest"
-		warn "Stopped at $sha1... $rest"
+		sha1_abbrev=$(git rev-parse --short $sha1)
+		warn "Stopped at $sha1_abbrev... $rest"
 		exit_with_patch $sha1 0
 		;;
 	squash|s|fixup|f)