diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-03 22:15:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-03 22:15:59 (GMT) |
| commit | 1cb3ed308dcfaa6084b8aed075c772aeb9e57243 (patch) | |
| tree | 75a9536e7071b4785887ef6c251be09df45d46d9 /builtin/notes.c | |
| parent | 017565525f969c26c43443d998a1283cac843d10 (diff) | |
| parent | b3715b75226668e26f1f2abe7e2f93cdbbf6e2f5 (diff) | |
| download | git-1cb3ed308dcfaa6084b8aed075c772aeb9e57243.zip git-1cb3ed308dcfaa6084b8aed075c772aeb9e57243.tar.gz git-1cb3ed308dcfaa6084b8aed075c772aeb9e57243.tar.bz2 | |
Merge branch 'jk/notes-merge-from-anywhere'
"git notes merge" used to limit the source of the merged notes tree
to somewhere under refs/notes/ hierarchy, which was too limiting
when inventing a workflow to exchange notes with remote
repositories using remote-tracking notes trees (located in e.g.
refs/remote-notes/ or somesuch).
* jk/notes-merge-from-anywhere:
notes: allow merging from arbitrary references
Diffstat (limited to 'builtin/notes.c')
| -rw-r--r-- | builtin/notes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index 9d54934..ed6f222 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -809,7 +809,7 @@ static int merge(int argc, const char **argv, const char *prefix) o.local_ref = default_notes_ref(); strbuf_addstr(&remote_ref, argv[0]); - expand_notes_ref(&remote_ref); + expand_loose_notes_ref(&remote_ref); o.remote_ref = remote_ref.buf; t = init_notes_check("merge", NOTES_INIT_WRITABLE); |