Thanks Junio for your big batch of feedback. Yet another round... Since this topic already has three different goals, I decided to try and get it in at least 'pu' shapes to have an agreed-upon basis for what's next. To that end, I ejected the filter-branch commits for now, and hopefully addressed all comments on the existing patches. I still need to make up my mind (and would still appreciate input) on the filter-branch part, but if I'm not mistaken the rest of the series has been on Junio's wishlist. I also already have a patch to make format-patch fill the comment region from a notes ref that has textual dependencies on this, which IIRC has also been mentioned as a wishlist item once or twice. I used the entire series plus the format-patch feature mentioned above fairly heavily during its own development, which unearthed a few more bugs. If there is a comment after the --- line in every patch, it worked ;-) On Sunday 21 February 2010 04:06:52 Junio C Hamano wrote: > If I wrote > > [notes] > displayRef = refs/notes/commit > displayRef = refs/notes/amlog > > I would expect that the normal notes come first and then notes from the > amlog tree, not in the alphabetical "amlog happens to sort before commit" > order. [v3 always sorted the displayRef entries for display] I considered this a feature, but changed it anyway since I don't care much. My original rationale was: core.notesRef should be in that list implicitly, and I think the natural position if it is unsorted would be: first. However, that means that changing core.notesRef or GIT_NOTES_REF can shuffle around your notes, which I thought would be confusing. Thomas Rast (11): test-lib: unset GIT_NOTES_REF to stop it from influencing tests Support showing notes from more than one notes tree Documentation: document post-rewrite hook commit --amend: invoke post-rewrite hook rebase: invoke post-rewrite hook rebase -i: invoke post-rewrite hook notes: implement 'git notes copy --stdin' notes: implement helpers needed for note copying during rewrite rebase: support automatic notes copying commit --amend: copy notes to the new commit notes: add shorthand --ref to override GIT_NOTES_REF Documentation/config.txt | 49 ++++++- Documentation/git-notes.txt | 20 +++- Documentation/githooks.txt | 40 +++++ builtin-commit.c | 45 ++++++ builtin-notes.c | 195 +++++++++++++++++++++++- builtin.h | 18 ++ cache.h | 3 + git-am.sh | 13 ++ git-rebase--interactive.sh | 52 ++++++- git-rebase.sh | 6 + notes.c | 173 ++++++++++++++++++++- notes.h | 17 ++ pretty.c | 6 +- refs.c | 4 +- refs.h | 5 + t/t3301-notes.sh | 344 ++++++++++++++++++++++++++++++++++++++++- t/t3400-rebase.sh | 17 ++ t/t3404-rebase-interactive.sh | 24 +++ t/t5407-post-rewrite-hook.sh | 172 ++++++++++++++++++++ t/t7501-commit.sh | 12 ++ t/test-lib.sh | 4 + 21 files changed, 1194 insertions(+), 25 deletions(-) create mode 100755 t/t5407-post-rewrite-hook.sh -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html