diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-12 08:14:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-12 08:14:15 (GMT) |
| commit | 35865ca24500a0d46a012f7a55f39bf36389f7ba (patch) | |
| tree | 9ffdddf391bc8de021d60c7c9b631c1882b1bf2c /t | |
| parent | 40e2524da9f9fb2806a66a694b9aee722ea3ef0a (diff) | |
| parent | 9b2a1821245c0e638f7b5e9da81118743fcc0120 (diff) | |
| download | git-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 't')
| -rwxr-xr-x | t/t9106-git-svn-dcommit-clobber-series.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t9106-git-svn-dcommit-clobber-series.sh b/t/t9106-git-svn-dcommit-clobber-series.sh index 7eff4cd..d59acc8 100755 --- a/t/t9106-git-svn-dcommit-clobber-series.sh +++ b/t/t9106-git-svn-dcommit-clobber-series.sh @@ -53,4 +53,10 @@ test_expect_success 'change file but in unrelated area' " test x\"\`sed -n -e 61p < file\`\" = x6611 " +test_expect_failure 'attempt to dcommit with a dirty index' ' + echo foo >>file && + git add file && + git svn dcommit +' + test_done |