Re: [BUG] "git commit" after "cherry-pick -n" conflict clobbers .git/COMMIT_EDITMSG

2012-10-11 Thread dirson
> > ~/softs/linux$ echo foo > .git/COMMIT_EDITMSG > > Why are you mucking with such an internal implementation detail in > the first place? I only tried to make it terse for the bugreport, I hit this while I was resolving conflicts during a merge. I aknowledge that using "cherry-pick -n" to bring

Re: [BUG] "git commit" after "cherry-pick -n" conflict clobbers .git/COMMIT_EDITMSG

2012-10-11 Thread Junio C Hamano
Yann Dirson writes: > (only tested with 1.7.10.x for now) > > ~/softs/linux$ echo foo > .git/COMMIT_EDITMSG Why are you mucking with such an internal implementation detail in the first place? > ~/softs/linux$ git cherry-pick -n b55f3d92cd > error: could not apply b55f3d9... Linux 2.6.32.26 > hi