diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-07-16 05:33:44 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-16 05:49:28 +0400 |
| commit | 28ed6e7b321bee3dd7e4aa9c0ff7da64844136f6 (patch) | |
| tree | 91186bcc0c0bd1961455d883596f2343e86bd57f /t/t9106-git-svn-commit-diff-clobber.sh | |
| parent | 6c11a5fd465eb64301093de8826c38018b474bde (diff) | |
Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"
Since the files generated and used during a rebase are never to be
tracked, they should live in $GIT_DIR. While at it, avoid the rather
meaningless term "dotest" to "rebase", and unhide ".dotest-merge".
This was wished for on the mailing list, but so far unimplemented.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9106-git-svn-commit-diff-clobber.sh')
| -rwxr-xr-x | t/t9106-git-svn-commit-diff-clobber.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh index 58a3a7b1c3..27a65e05df 100755 --- a/t/t9106-git-svn-commit-diff-clobber.sh +++ b/t/t9106-git-svn-commit-diff-clobber.sh @@ -87,7 +87,7 @@ test_expect_success 'multiple dcommit from git-svn will not clobber svn' " " -test_expect_success 'check that rebase really failed' 'test -d .dotest' +test_expect_success 'check that rebase really failed' 'test -d .git/rebase' test_expect_success 'resolve, continue the rebase and dcommit' " echo clobber and I really mean it > file && |