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

rebase -i: Make the condition for an "if" more transparent

Browse Source 
Test $no_ff separately rather than testing it indirectly by gluing it
onto a comparison of two SHA1s.

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-14 06:54:40 +01:00 committed by Junio C Hamano
parent 234b3dae2f
commit 1d621fea18
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-rebase--interactive.sh
View File

@ -164,7 +164,8 @@ 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 "$no_ff$current_sha1" = "$parent_sha1"; then if test -z "$no_ff" -a "$current_sha1" = "$parent_sha1"
then
output git reset --hard $sha1 output git reset --hard $sha1
test "a$1" = a-n && output git reset --soft $current_sha1 test "a$1" = a-n && output git reset --soft $current_sha1
sha1=$(git rev-parse --short $sha1) sha1=$(git rev-parse --short $sha1)