From: Johan Herland Date: Mon, 12 Mar 2012 14:57:12 +0000 (+0100) Subject: t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/ X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=01bfec8e52dcfa2da47b54b3c89c3181ae09b9a9;p=git.git t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/ The 'git notes merge' command expected to be run from the working tree of the project being annotated, and did not anticipate getting run inside $GIT_DIR/. However, because we use $GIT_DIR/NOTES_MERGE_WORKTREE as a temporary working space for the user to work on resolving conflicts, it is not unreasonable for a user to run "git notes merge --commit" there. But the command fails to do so. Found-by: David Bremner Signed-off-by: Johan Herland Signed-off-by: Junio C Hamano --- diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh index 436719795..0c531c379 100755 --- a/t/t3310-notes-merge-manual-resolve.sh +++ b/t/t3310-notes-merge-manual-resolve.sh @@ -553,4 +553,23 @@ test_expect_success 'resolve situation by aborting the notes merge' ' verify_notes z ' +cat >expect_notes < $(git rev-parse HEAD) && + echo "bar" >> $(git rev-parse HEAD) && + git notes merge --commit + ) && + git notes show HEAD > actual_notes && + test_cmp expect_notes actual_notes +' + test_done