[PATCH 03/18] rebase -i: Inline expression
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Jan 14, 2010, 05:54 UTC
- Message-ID
- <487578e19c491360d2a957603db778faa4e3188d.1263447037.git.mhagger@alum.mit.edu>
- In-Reply-To
- <cover.1263447037.git.mhagger@alum.mit.edu>
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> --- git-rebase--interactive.sh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index c6174bb..3b65cdf 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -169,8 +169,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
-- 1.6.6