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>
Michael Haggerty committed
Jan 14, 2010 at 06:54 UTC
aa7eaff8b1514ef1241c2f5867670b495b33c455
1 file changed
+1
-2
git-rebase--interactive.sh
+1
-2
@@ -167,8 +167,7 @@ pick_one () {
167
if test -z "$no_ff" -a "$current_sha1" = "$parent_sha1"
168
then
169
output git reset --hard $sha1
170
- sha1=$(git rev-parse --short $sha1)
171
- output warn Fast-forward to $sha1
170
+ output warn Fast-forward to $(git rev-parse --short $sha1)
171
else
172
output git cherry-pick "$@"
173
fi