path: root/git-svn.perl
diff options
authorBenoit Sigoure <>2007-11-11 18:41:41 (GMT)
committerJunio C Hamano <>2007-11-12 07:40:32 (GMT)
commitc8cfa3e4a5b1d1d4c870c82d2dbf162f570f0561 (patch)
tree0239d707b3f72e3eacfffadf91e5df289d47aa03 /git-svn.perl
parenta91ef6e75b897a255cc17b70014a39e68dd54c7a (diff)
git-svn: prevent dcommitting if the index is dirty.
dcommit uses rebase to sync the history with what has just been pushed to SVN. Trying to dcommit with a dirty index is troublesome for rebase, so now the user will get an error message if he attempts to dcommit with a dirty index. Signed-off-by: Benoit Sigoure <> Acked-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'git-svn.perl')
1 files changed, 3 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl
index ec25ea4..4c779b6 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -374,6 +374,9 @@ sub cmd_set_tree {
sub cmd_dcommit {
my $head = shift;
+ 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';
my @refs;
my ($url, $rev, $uuid, $gs) = working_head_info($head, \@refs);