From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Feb 2016 22:15:59 +0000 (-0800)
Subject: Merge branch 'jk/notes-merge-from-anywhere'
X-Git-Tag: v2.8.0-rc0~84
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1cb3ed308dcfaa6084b8aed075c772aeb9e57243

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
---

1cb3ed308dcfaa6084b8aed075c772aeb9e57243
diff --cc builtin/notes.c
index 9d54934d6c,b16b8b56a0..ed6f2222f4
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@@ -809,10 -806,10 +809,10 @@@ static int merge(int argc, const char *
  
  	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");
 +	t = init_notes_check("merge", NOTES_INIT_WRITABLE);
  
  	if (strategy) {
  		if (parse_notes_merge_strategy(strategy, &o.strategy)) {