Re: [PATCH 2/3] do not write null sha1s to on-disk index
- From
Jeff King <peff@peff.net>
- Date
- Dec 29, 2012, 10:42 UTC
- Message-ID
- <20121229104247.GA30283@sigill.intra.peff.net>
- In-Reply-To
- <20121229103430.GG18903@elie.Belkin>
On Sat, Dec 29, 2012 at 02:34:30AM -0800, Jonathan Nieder wrote:
Show 15 quoted lines
> Jeff King wrote: > > > I can't reproduce here. I can checkout v3.2.35, and I guess that the > > patch you are applying comes from f5f1654, but I don't know your > > local modification to sound/usb/midi.c. > > No local modification. The unstaged change after "git am --abort" to > recover from a conflicted git am is a longstanding bug (at least a > couple of years old). > > The patch creating conflicts is > > queue-3.2/alsa-usb-audio-fix-missing-autopm-for-midi-input.patch > > from git://git.kernel.org/pub/scm/linux/kernel/git/bwh/linux-3.2.y-queue.git
Hrm. But your output does not say there is a conflict. It says you have a local modification and it does not try the merge:
Show 8 quoted lines
> $ git am -3sc /tmp/alsa-usb-audio-fix-missing-autopm-for-midi-input.patch > Applying: ALSA: usb-audio: Fix missing autopm for MIDI input > Using index info to reconstruct a base tree... > Falling back to patching base and 3-way merge... > error: Your local changes to the following files would be overwritten by merge: > sound/usb/midi.c > Please, commit your changes or stash them before you can merge. > Aborting
If I try to apply it, I get a real conflict:
$ git checkout v3.2.35 $ git am -3sc linux-3.2.y-queue/queue-3.2/alsa-usb-audio-fix-missing-autopm-for-midi-input.patch Applying: ALSA: usb-audio: Fix missing autopm for MIDI input Using index info to reconstruct a base tree... M sound/usb/midi.c Falling back to patching base and 3-way merge... Auto-merging sound/usb/midi.c CONFLICT (content): Merge conflict in sound/usb/midi.c
Although running "git am --abort" after that does seem to produce the "cache entry has null sha1" error. So I can start investigating from there.
-Peff