summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-13 14:12:30 -0700
committerJunio C Hamano <gitster@pobox.com>2016-04-13 14:12:30 -0700
commit5c788e7746a2b60e13a0e9235bb68a19a35c12ee (patch)
tree7a8981fb43cc931809540a43ff85ef683971aec4 /git-rebase--interactive.sh
parent8b7475aefc0a88da65c6d495fc518b2b8a72ff47 (diff)
parent14c793e8f409216b868223236fc54e5e5f86aa3a (diff)
downloadgit-5c788e7746a2b60e13a0e9235bb68a19a35c12ee.tar.gz
Merge branch 'rt/rebase-i-shorten-stop-report'
The commit object name reported when "rebase -i" stops has been shortened. * rt/rebase-i-shorten-stop-report: rebase-i: print an abbreviated hash when stop for editing
Diffstat (limited to 'git-rebase--interactive.sh')
-rw-r--r--git-rebase--interactive.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 4cde685b43..9ea30756f1 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -548,7 +548,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)