diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-07-16 03:33:44 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-15 18:49:28 -0700 |
| commit | 28ed6e7b321bee3dd7e4aa9c0ff7da64844136f6 (patch) | |
| tree | 91186bcc0c0bd1961455d883596f2343e86bd57f /t/t3401-rebase-partial.sh | |
| parent | 6c11a5fd465eb64301093de8826c38018b474bde (diff) | |
| download | git-28ed6e7b321bee3dd7e4aa9c0ff7da64844136f6.tar.gz git-28ed6e7b321bee3dd7e4aa9c0ff7da64844136f6.tar.xz | |
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/t3401-rebase-partial.sh')
| -rwxr-xr-x | t/t3401-rebase-partial.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh index 4934a4e01..36d9a2ae3 100755 --- a/t/t3401-rebase-partial.sh +++ b/t/t3401-rebase-partial.sh @@ -50,12 +50,12 @@ test_debug \ test_expect_success \ 'rebase topic branch against new master and check git-am did not get halted' \ - 'git-rebase master && test ! -d .dotest' + 'git-rebase master && test ! -d .git/rebase' test_expect_success \ 'rebase --merge topic branch that was partially merged upstream' \ 'git-checkout -f my-topic-branch-merge && git-rebase --merge master-merge && - test ! -d .git/.dotest-merge' + test ! -d .git/rebase-merge' test_done |