summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2010-01-14 05:54:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-14 08:27:56 (GMT)
commitaa7eaff8b1514ef1241c2f5867670b495b33c455 (patch)
tree06a33573391a167978ed3bea2de827cf4eefe76a /git-rebase--interactive.sh
parent50438340bcadd790956b5081b8a16cba28156e22 (diff)
downloadgit-aa7eaff8b1514ef1241c2f5867670b495b33c455.zip
git-aa7eaff8b1514ef1241c2f5867670b495b33c455.tar.gz
git-aa7eaff8b1514ef1241c2f5867670b495b33c455.tar.bz2
rebase -i: Inline expression
Inline expression when generating output rather than overwriting the "sha1" local variable with a short SHA1. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index aae94d2..6fd3105 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -167,8 +167,7 @@ pick_one () {
if test -z "$no_ff" -a "$current_sha1" = "$parent_sha1"
then
output git reset --hard $sha1
- sha1=$(git rev-parse --short $sha1)
- output warn Fast-forward to $sha1
+ output warn Fast-forward to $(git rev-parse --short $sha1)
else
output git cherry-pick "$@"
fi