From: Jacob Keller <jacob.keller@xxxxxxxxx>
The primary purpose of this series is to allow fetching remote notes
into a namespace such as "refs/remote-notes/<remote>/foo". Currently,
git-notes refuses to operate on refs outside of refs/notes/* including
merging from them, listing or showing them. This makes it difficult to
share notes from a remote repository.
Fix expand_notes_ref to not always prepend refs/notes to fully qualified
refs. Allow git-notes actions which do not specify NOTES_INIT_WRITABLE
to be performed on refs outside of refs/notes/*
Future work will include more coupling of "refs/remote-notes/<remote>"
into git-notes so that you can specify refs as "<remote>/foo" similar to
how remotes work for branches.
In addition, long term goal is to make it default to fetch notes into
refs/remote-notes/<remote>/*, and possibly to add some status for
tracking similar to how tracking branches work.
The one downside currently is that a test case for prevention of merge
from "refs/heads/master" had to be removed as "git notes merge
refs/heads/master" now works. I am not sure how this could be fixed.. I
did not find any way to tell if a treeish actually was a notes tree or
not...
This topic depends on mh/notes-allow-reading-treeish and actually
expands what this topic allowed before. Previously, treeishes such as
notes@{1} were made allowable, but the ref still had to be found under
refs/notes.
No documentation changes were made as from the looks of it,
documentation for --ref and core.notesRef is already correct despite the
previous behavior of expand_notes_ref. In that sense, documentation was
wrong before.
Jacob Keller (2):
notes: don't expand qualified refs in expand_notes_ref
notes: allow non-writable actions on refs outside of refs/notes
builtin/notes.c | 11 ++++++-----
notes.c | 4 ++--
t/t3308-notes-merge.sh | 1 -
3 files changed, 8 insertions(+), 8 deletions(-)
--
2.6.0.rc2.248.g5b5be23
--
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