[PATCH jh/notes-merge-in-git-dir-worktree] fixup! t3310 on Windows
- From
Johannes Sixt <j.sixt@viscovery.net>
- Date
- Mar 14, 2012, 08:39 UTC
- Message-ID
- <4F60593A.5070106@viscovery.net>
- In-Reply-To
- <1331563647-1909-2-git-send-email-johan@herland.net>
From: Johannes Sixt <j6t@kdbg.org>
On Windows, a directory cannot be removed while it is the working directory of a process. "git notes merge --commit" attempts to remove .git/NOTES_MERGE_WORKTREE, but during the test the directory was still "occupied" by the shell. Move the command out of the subshell to release the directory.
Signed-off-by: Johannes Sixt <j6t@kdbg.org> --- Feel free to squash this into 1/2.
t/t3310-notes-merge-manual-resolve.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh index d6d6ac6..6351877 100755 --- a/t/t3310-notes-merge-manual-resolve.sh +++ b/t/t3310-notes-merge-manual-resolve.sh @@ -565,9 +565,9 @@ test_expect_success 'switch cwd before committing notes merge' ' ( cd .git/NOTES_MERGE_WORKTREE && echo "foo" > $(git rev-parse HEAD) && - echo "bar" >> $(git rev-parse HEAD) && - git notes merge --commit + echo "bar" >> $(git rev-parse HEAD) ) && + git notes merge --commit && git notes show HEAD > actual_notes && test_cmp expect_notes actual_notes '
-- 1.7.10.rc0.1198.g85187