summaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorDavid D. Kilzer <ddkilzer@kilzer.net>2010-08-02 19:58:19 (GMT)
committerEric Wong <normalperson@yhbt.net>2010-08-02 21:21:56 (GMT)
commit181264ad590ffef9d956fdd023369869c2d0a55f (patch)
tree8f6d3898daaf9f5db56a454ec2357497e073ec99 /git-svn.perl
parent3713e2226bcda64513efd537f370ce4d7f767a1e (diff)
downloadgit-181264ad590ffef9d956fdd023369869c2d0a55f.zip
git-181264ad590ffef9d956fdd023369869c2d0a55f.tar.gz
git-181264ad590ffef9d956fdd023369869c2d0a55f.tar.bz2
git svn: fix dcommit to work with touched files
The dcommit command fails if an otherwise unmodified file has been touched in the working directory: Cannot dcommit with a dirty index. Commit your changes first, or stash them with `git stash'. This happens because "git diff-index" reports a difference between the index and the filesystem: :100644 100644 d00491...... 000000...... M file The fix is to run "git update-index --refresh" before "git diff-index" as is done in git-rebase and git-rebase--interactive before "git diff-files". This changes dcommit to display a list of modified files before exiting. Also add a similar test case for "git svn rebase". [ew: rearranged commit message subject] Signed-off-by: David D. Kilzer <ddkilzer@kilzer.net> Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl
index c92238e..8d2ef3d 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -494,6 +494,7 @@ sub cmd_set_tree {
sub cmd_dcommit {
my $head = shift;
+ command_noisy(qw/update-index --refresh/);
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";