X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=git-svn.perl;h=ff1ce3d351c8e4e175321d45b7284070f9ce691a;hb=3daafe9403c65b39f133f3aa4a6dbbcd372e9db1;hp=d070de012c3a04ca621782f047425318ff246ca6;hpb=7f05e4a6173e65220c11ed2ff42fa3d64ccd98a4;p=git-core%2Fgit.git diff --git a/git-svn.perl b/git-svn.perl index d070de012..ff1ce3d35 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -831,7 +831,7 @@ sub dcommit_rebase { sub cmd_dcommit { my $head = shift; command_noisy(qw/update-index --refresh/); - git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) } + git_cmd_try { command_oneline(qw/diff-index --quiet HEAD --/) } 'Cannot dcommit with a dirty index. Commit your changes first, ' . "or stash them with `git stash'.\n"; $head ||= 'HEAD'; @@ -1246,7 +1246,7 @@ sub cmd_rebase { return; } if (command(qw/diff-index HEAD --/)) { - print STDERR "Cannot rebase with uncommited changes:\n"; + print STDERR "Cannot rebase with uncommitted changes:\n"; command_noisy('status'); exit 1; } @@ -1932,7 +1932,7 @@ sub cmt_sha2rev_batch { sub working_head_info { my ($head, $refs) = @_; my @args = qw/rev-list --first-parent --pretty=medium/; - my ($fh, $ctx) = command_output_pipe(@args, $head); + my ($fh, $ctx) = command_output_pipe(@args, $head, "--"); my $hash; my %max; while (<$fh>) {