Re: [PATCH 4/6] Allow "git notes merge" to use refs/remote-notes/ as a source.
From: Johan Herland <hidden>
Date: 2016-06-15 22:51:29
On Saturday 18 June 2011, Yann Dirson wrote:
quoted hunk ↗ jump to hunk
Signed-off-by: Yann Dirson <redacted> --- Documentation/git-notes.txt | 5 +++++ builtin/notes.c | 4 ++-- notes.c | 5 +++-- notes.h | 2 +- revision.c | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-)diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt index 6a187f2..7ce8a24 100644 --- a/Documentation/git-notes.txt +++ b/Documentation/git-notes.txt@@ -104,6 +104,11 @@ and instructs the user to manually resolve theconflicts there. When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'. ++ +In addition to `refs/notes/`, the remote notes ref is accepted +from the `refs/remote-notes/` namespace. This is intended to +provide notes with support for a workflow similar to the one used +for heads references.
I would rephrase this as: In addition to `refs/notes/*`, the remote notes ref can also be from within `refs/remote-notes/*`. This allows the user to set up fetch refspecs that transfers notes refs from a remote repo into `refs/remote-notes/*`, and then merge those remote notes refs into the corresponding local notes refs. Also, AFAICS you're adding the possibility to read notes from refs/remote- notes/*, but not WRITE to those notes using "git notes" (obviously, "git fetch" and other tools can be used to manipulate them). Please add some selftests verifying that "git notes" is still unable to manipulate notes in refs/remote-notes/*. Otherwise the patch looks good to me. ...Johan -- Johan Herland, [off-list ref] www.herland.net