summaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-12 08:14:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-12 08:14:15 (GMT)
commit35865ca24500a0d46a012f7a55f39bf36389f7ba (patch)
tree9ffdddf391bc8de021d60c7c9b631c1882b1bf2c /git-svn.perl
parent40e2524da9f9fb2806a66a694b9aee722ea3ef0a (diff)
parent9b2a1821245c0e638f7b5e9da81118743fcc0120 (diff)
downloadgit-35865ca24500a0d46a012f7a55f39bf36389f7ba.zip
git-35865ca24500a0d46a012f7a55f39bf36389f7ba.tar.gz
git-35865ca24500a0d46a012f7a55f39bf36389f7ba.tar.bz2
Merge branch 'maint'
* maint: for-each-ref: fix off by one read. git-branch: remove mention of non-existent '-b' option git-svn: prevent dcommitting if the index is dirty. Fix memory leak in traverse_commit_list
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl
index dd93e32..1e24497 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -390,6 +390,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);