On Mon, Apr 29, 2013 at 02:32:05PM +0100, Adam Spiers wrote:
> I've just written another quick wrapper around 'git notes' which makes
> it less painless to share notes to and from remote repositories:
>
> https://github.com/aspiers/git-config/blob/master/bin/git-rnotes
>
> This makes sharing of notes as easy as:
>
> git rnotes $remote push
> git rnotes $remote fetch
> git rnotes $remote merge
> git rnotes $remote pull
>
> and was born from this discussion:
>
>
> http://stackoverflow.com/questions/12055303/merging-git-notes-when-there-are-merge-conflicts-in-them/
>
> Once the Great Refs Namespace Debate is resolved[0], would this kind
> of UI would be a candidate for pushing into git-notes itself?
I just had a discussion on #git IRC with Thomas about how the above
wrapper uses refs/notes/$remote/commits or similar to simulate a
remote tracking branch for notes, and we agreed that it's not ideal
due to potential collisions if --ref=$remote or refs/notes/* are ever
used. As has probably been discussed already in the Great Debate,
something like refs/remote-notes/ might be a better namespace; however
the current implementation of git notes prevents this:
static struct notes_tree *init_notes_check(const char *subcommand)
{
struct notes_tree *t;
init_notes(NULL, NULL, NULL, 0);
t = &default_notes_tree;
if (prefixcmp(t->ref, "refs/notes/"))
die("Refusing to %s notes in %s (outside of refs/notes/)",
subcommand, t->ref);
return t;
}
Can we relax this to "refs/", to allow better isolation of namespaces
for remote notes? Also, the check is applied for GIT_NOTES_REF and
core.notesRef, but not for values passed via --ref. Therefore I would
propose that init_notes_check() is not only relaxed but also moved
from builtin/notes.c to notes.c, so that it can be consumed by
default_notes_ref(). Thoughts?
Also, are there any plans in the future for making "git notes merge"
provide an index, so that a proper 3-way merge with ancestor can be
done using git mergetool?
Cheers,
Adam
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
