| commit | 01bfec8e52dcfa2da47b54b3c89c3181ae09b9a9 | |
| author | Johan Herland <johan@herland.net> | |
| Mon, 12 Mar 2012 14:57:12 +0000 (12 15:57 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 15 Mar 2012 18:13:23 +0000 (15 11:13 -0700) | ||
| tree | edfc56d3fc5edf56aeb7e1d0deedc17508fbf1f7 | treesnapshot (tar.gz zip) |
| parent | c844a8035617a602015d74ce329ee88f9b003bf9 | commitdiff |
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 <david@tethera.net>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <david@tethera.net>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3310-notes-merge-manual-resolve.sh | diffblobblamehistory |