git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: problem with merging notes.

From
MSMichael Schubert <mschub@elegosoft.com>
Date
Mar 11, 2012, 18:37 UTC
Message-ID
<4F5CF0D8.8080904@elegosoft.com>
In-Reply-To
<87boo3m50x.fsf@zancas.localnet>
On 03/11/2012 06:17 PM, David Bremner wrote:
Show 10 quoted lines
> tmpdir=$(mktemp -d)
> cd $tmpdir
> git init
> git commit --allow-empty -m'empty commit'
> git notes add -m 'foo' HEAD
> git notes --ref=other add -m 'bar' HEAD 
> git notes merge refs/notes/other
> cd .git/NOTES_MERGE_WORKTREE
> echo "foo\nbar\n"> $(git rev-parse HEAD)
> git notes merge --commit

cd back to your worktree *before* you call "git notes merge --commit" and it will work as expected.

Apparently, there's some path issue and git notes just continues doing half of its job. I'll check later.

> cd ../..
> git notes list | wc -l
Thanks.
Previous: David BremnerNext: Johan Herland
Message 2 of 6 in “problem with merging notes.”
  1. David BremnerMar 11, 2012
  2. Michael SchubertMar 11, 2012
  3. 1/2 t3310: Add testcase demonstrating failure to --commit from within another dirJohan Herland, Mar 12, 2012
  4. 2/2 notes-merge: use opendir/readdir instead of using read_directory()Johan Herland, Mar 12, 2012
  5. Junio C HamanoMar 12, 2012
  6. Johan HerlandMar 12, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.