summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>2013-09-28 18:53:05 +0300
committerJonathan Nieder <jrnieder@gmail.com>2013-09-30 14:34:50 -0700
commit568950388be2e47af8bcb0b4a5f02017570b2f33 (patch)
tree6e14b2b8cec72d22d6897a1de4163f2dcd5ae319
parent9cd755b2fca823eb1b688bd498b0bee007289e6c (diff)
downloadgit-568950388be2e47af8bcb0b4a5f02017570b2f33.tar.gz
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>
-rw-r--r--git-rebase--interactive.sh2
1 files changed, 1 insertions, 1 deletions
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