diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-25 13:37:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-25 13:37:20 -0700 |
| commit | 6c99f18660f62f90b83f0592c81ab6a4092d6d13 (patch) | |
| tree | 24cd8428bdf1bfcd89ee61a66acd8bc91b8b03c4 /t | |
| parent | 7e83003029ed488253f6173b047a9c77933c8561 (diff) | |
| parent | d775734c40afed216160437c59a45c93bdf28689 (diff) | |
| download | git-6c99f18660f62f90b83f0592c81ab6a4092d6d13.tar.gz git-6c99f18660f62f90b83f0592c81ab6a4092d6d13.tar.xz | |
Merge branch 'js/cvsexportcommit'
* js/cvsexportcommit:
cvsexportcommit: introduce -W for shared working trees (between Git and CVS)
cvsexportcommit: chomp only removes trailing whitespace
Conflicts:
git-cvsexportcommit.perl
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9200-git-cvsexportcommit.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh index 42b144b1b..b1dc32d05 100755 --- a/t/t9200-git-cvsexportcommit.sh +++ b/t/t9200-git-cvsexportcommit.sh @@ -297,4 +297,21 @@ test_expect_success 'commit a file with leading spaces in the name' ' ' +test_expect_success 'use the same checkout for Git and CVS' ' + + (mkdir shared && + cd shared && + unset GIT_DIR && + cvs co . && + git init && + git add " space" && + git commit -m "fake initial commit" && + echo Hello >> " space" && + git commit -m "Another change" " space" && + git cvsexportcommit -W -p -u -c HEAD && + grep Hello " space" && + git diff-files) + +' + test_done |