From: Michael Schubert <mschub@elegosoft.com>
To: David Bremner <david@tethera.net>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: problem with merging notes.
Date: Sun, 11 Mar 2012 19:37:12 +0100 [thread overview]
Message-ID: <4F5CF0D8.8080904@elegosoft.com> (raw)
In-Reply-To: <87boo3m50x.fsf@zancas.localnet>
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.
next prev parent reply other threads:[~2012-03-11 18:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-11 17:17 problem with merging notes David Bremner
2012-03-11 18:37 ` Michael Schubert [this message]
2012-03-12 14:57 ` [PATCH 1/2] t3310: Add testcase demonstrating failure to --commit from within another dir Johan Herland
2012-03-12 14:57 ` [PATCH 2/2] notes-merge: use opendir/readdir instead of using read_directory() Johan Herland
2012-03-12 18:21 ` [PATCH 1/2] t3310: Add testcase demonstrating failure to --commit from within another dir Junio C Hamano
2012-03-12 18:54 ` Johan Herland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F5CF0D8.8080904@elegosoft.com \
--to=mschub@elegosoft.com \
--cc=david@tethera.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.