diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-12-26 16:27:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-26 16:45:22 -0800 |
| commit | c3a41037ed5fa113c8eb0f67a1cc17654f7ce5b1 (patch) | |
| tree | 5d82d65eb6ede1d7d5dfba12fd5979f279fe43b3 /git-svn.perl | |
| parent | 39ed7c181b7a8f5e28cffcaca9369e6ebc74a055 (diff) | |
| download | git-c3a41037ed5fa113c8eb0f67a1cc17654f7ce5b1.tar.gz git-c3a41037ed5fa113c8eb0f67a1cc17654f7ce5b1.tar.xz | |
git-svn: dcommit should diff against the current HEAD after committing
This is a followup to dd31da2fdc199132c9fd42023aea5b33672d73cc.
Regardless of whether we commit an alternate head, we always
diff-tree based on the current HEAD, and rebase against our
remote reference as necessary.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-svn.perl b/git-svn.perl index 4288a05c1..c2cdceb1d 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -512,15 +512,15 @@ sub dcommit { } return if $_dry_run; fetch(); - my @diff = command('diff-tree', $head, $gs, '--'); + my @diff = command('diff-tree', 'HEAD', $gs, '--'); my @finish; if (@diff) { @finish = qw/rebase/; push @finish, qw/--merge/ if $_merge; push @finish, "--strategy=$_strategy" if $_strategy; - print STDERR "W: $head and $gs differ, using @finish:\n", @diff; + print STDERR "W: HEAD and $gs differ, using @finish:\n", @diff; } else { - print "No changes between current $head and $gs\n", + print "No changes between current HEAD and $gs\n", "Resetting to the latest $gs\n"; @finish = qw/reset --mixed/; } |