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

problem with merging notes.

From
DBDavid Bremner <david@tethera.net>
Date
Mar 11, 2012, 17:17 UTC
Message-ID
<87boo3m50x.fsf@zancas.localnet>
Hi;

It seems to me there is a bug (or at least some missing documentation) for git notes merge --commit. If the working directory is .git/NOTES_MERGE_WORKTREE, then all notes for the conflicting commit are silently dropped.

A test script follows. Have I missed something?  
David
P.S. Please CC me, I'm not subscribed.

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 ../.. git notes list | wc -l

Next: Michael Schubert
Message 1 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.