diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-24 16:26:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-24 16:26:43 -0700 |
| commit | a86ed83cce0fc0b9a9fe4e17ac1bf4f719028d20 (patch) | |
| tree | b601185c28e5ea4f4a624debe01427465147650c /t/test-lib.sh | |
| parent | b6a7a06aa6f083f21b0fca2558c737324eda1602 (diff) | |
| parent | 66d681998411e8e5034080d5267a5e0f6cdc0c17 (diff) | |
| download | git-a86ed83cce0fc0b9a9fe4e17ac1bf4f719028d20.tar.gz | |
Merge branch 'tr/notes-display'
* tr/notes-display:
git-notes(1): add a section about the meaning of history
notes: track whether notes_trees were changed at all
notes: add shorthand --ref to override GIT_NOTES_REF
commit --amend: copy notes to the new commit
rebase: support automatic notes copying
notes: implement helpers needed for note copying during rewrite
notes: implement 'git notes copy --stdin'
rebase -i: invoke post-rewrite hook
rebase: invoke post-rewrite hook
commit --amend: invoke post-rewrite hook
Documentation: document post-rewrite hook
Support showing notes from more than one notes tree
test-lib: unset GIT_NOTES_REF to stop it from influencing tests
Conflicts:
git-am.sh
refs.c
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index a0e396a952..c582964b0d 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -54,6 +54,10 @@ unset GIT_OBJECT_DIRECTORY unset GIT_CEILING_DIRECTORIES unset SHA1_FILE_DIRECTORIES unset SHA1_FILE_DIRECTORY +unset GIT_NOTES_REF +unset GIT_NOTES_DISPLAY_REF +unset GIT_NOTES_REWRITE_REF +unset GIT_NOTES_REWRITE_MODE GIT_MERGE_VERBOSITY=5 export GIT_MERGE_VERBOSITY export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME |