From: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Date: Sat, 28 Sep 2013 15:53:05 +0000 (+0300)
Subject: rebase -i: respect core.abbrev
X-Git-Tag: v1.8.5-rc0~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=568950388be2e47af8bcb0b4a5f02017570b2f33;p=thirdparty%2Fgit.git

rebase -i: respect core.abbrev

collapse_todo_ids() uses `git rev-parse --short=7' to abbreviate
commit ids before showing them to the user in a text editor.  Let's
drop argument from --short to the configured value instead (still
defaulting to 7).

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 10bf318d0d..3c6bed9a28 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -713,7 +713,7 @@ expand_todo_ids() {
 }
 
 collapse_todo_ids() {
-	transform_todo_ids --short=7
+	transform_todo_ids --short
 }
 
 # Rearrange the todo list that has both "pick sha1 msg" and