diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-02 15:38:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-02 15:38:55 -0700 |
| commit | e7bdd1b90bb37139b37683aa306a9e161cb9e6ce (patch) | |
| tree | 7de9fb5a55c5840989d1209b6362404849ef79cb /t | |
| parent | 9f9aa761305e909aca9a46ccb33a5872b36bcb8e (diff) | |
| parent | 181264ad590ffef9d956fdd023369869c2d0a55f (diff) | |
| download | git-e7bdd1b90bb37139b37683aa306a9e161cb9e6ce.tar.gz | |
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn:
git svn: fix dcommit to work with touched files
git svn: add an option to recode pathnames
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9100-git-svn-basic.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh index 13766ab160..d5adae640b 100755 --- a/t/t9100-git-svn-basic.sh +++ b/t/t9100-git-svn-basic.sh @@ -271,6 +271,17 @@ test_expect_success 'able to dcommit to a subdirectory' " test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" " +test_expect_success 'dcommit should not fail with a touched file' ' + test_commit "commit-new-file-foo2" foo2 && + test-chmtime =-60 foo && + git svn dcommit +' + +test_expect_success 'rebase should not fail with a touched file' ' + test-chmtime =-60 foo && + git svn rebase +' + test_expect_success 'able to set-tree to a subdirectory' " echo cba > d && git update-index d && |