On 03/11/2012 06:17 PM, David Bremner wrote:
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.