git-write-error with cherry-pick -n usages

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <git@...>
Date: Friday, January 11, 2008 - 1:48 am

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
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
git-write-error with cherry-pick -n usages, Björn, (Fri Jan 11, 1:48 am)
Re: git-write-error with cherry-pick -n usages, Junio C Hamano, (Fri Jan 11, 2:49 am)