From: "Björn Steinbrink" <B.Steinbrink@gmx.de>
To: git@vger.kernel.org
Subject: git-write-error with cherry-pick -n usages
Date: Fri, 11 Jan 2008 06:48:11 +0100 [thread overview]
Message-ID: <20080111054811.GA7476@atjola.homenet> (raw)
[-- Attachment #1: Type: text/plain, Size: 506 bytes --]
Hi,
when you cherry-pick -n a commit that has changes to a file missing in
the current tree, that file will be added as "Unmerged". A subsequent
cherry-pick that tries to pick a commit that has changes to that file
will then fail with:
fatal: git-write-tree: error building trees
I've attached a small shell script to easily reproduce that.
git version 1.5.4.rc2.84.gf85fd
That specific use of cherry-pick might be an user error, but, if
possible, git should give a less cryptic error message.
Björn
[-- Attachment #2: test.sh --]
[-- Type: application/x-sh, Size: 317 bytes --]
next reply other threads:[~2008-01-11 5:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-11 5:48 Björn Steinbrink [this message]
2008-01-11 6:49 ` git-write-error with cherry-pick -n usages Junio C Hamano
2008-02-03 9:11 ` Björn Steinbrink
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=20080111054811.GA7476@atjola.homenet \
--to=b.steinbrink@gmx.de \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).