undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase -i: Avoid non-portable "test X -a Y"

Browse Source 
Reported by: Eric Blake <ebb9@byu.net>

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2010-01-22 10:22:29 +01:00 committed by Junio C Hamano
parent 3bb7256281
commit 8cddaeec0d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase--interactive.sh
View File

@ -235,7 +235,7 @@ pick_one () {
parent_sha1=$(git rev-parse --verify $sha1^) || parent_sha1=$(git rev-parse --verify $sha1^) ||
die "Could not get the parent of $sha1" die "Could not get the parent of $sha1"
current_sha1=$(git rev-parse --verify HEAD) current_sha1=$(git rev-parse --verify HEAD)
if test -z "$no_ff" -a "$current_sha1" = "$parent_sha1" if test -z "$no_ff" && test "$current_sha1" = "$parent_sha1"
then then
output git reset --hard $sha1 output git reset --hard $sha1
output warn Fast-forward to $(git rev-parse --short $sha1) output warn Fast-forward to $(git rev-parse --short $sha1)