diff options
| author |  Johan Herland <johan@herland.net> | 2012-03-12 15:57:12 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-03-15 11:13:23 -0700 |
| commit | 01bfec8e52dcfa2da47b54b3c89c3181ae09b9a9 (patch) | |
| tree | edfc56d3fc5edf56aeb7e1d0deedc17508fbf1f7 /t/t1021-rerere-in-workdir.sh | |
| parent | remove_dir_recursively(): Add flag for skipping removal of toplevel dir (diff) | |
| download | tgif-01bfec8e52dcfa2da47b54b3c89c3181ae09b9a9.tar.xz | |
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>
Diffstat (limited to 't/t1021-rerere-in-workdir.sh')
0 files changed, 0 insertions, 0 deletions