From: Jeff King <peff@peff.net>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, Jens Lehmann <Jens.Lehmann@web.de>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 2/3] do not write null sha1s to on-disk index
Date: Sat, 29 Dec 2012 05:42:47 -0500 [thread overview]
Message-ID: <20121229104247.GA30283@sigill.intra.peff.net> (raw)
In-Reply-To: <20121229103430.GG18903@elie.Belkin>
On Sat, Dec 29, 2012 at 02:34:30AM -0800, Jonathan Nieder wrote:
> 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:
> $ 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
next prev parent reply other threads:[~2012-12-29 10:43 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-28 15:01 [PATCH 0/3] null sha1 in trees Jeff King
2012-07-28 15:03 ` [PATCH 1/3] diff: do not use null sha1 as a sentinel value Jeff King
2012-07-28 15:05 ` [PATCH 2/3] do not write null sha1s to on-disk index Jeff King
2012-12-29 10:03 ` Jonathan Nieder
2012-12-29 10:27 ` Jeff King
2012-12-29 10:34 ` Jonathan Nieder
2012-12-29 10:42 ` Jeff King [this message]
2012-12-29 10:51 ` Jonathan Nieder
2012-12-29 11:05 ` Jeff King
2012-12-29 20:51 ` [BUG] two-way read-tree can write null sha1s into index Jeff King
2013-01-01 22:24 ` Junio C Hamano
2013-01-03 8:37 ` Jeff King
2013-01-03 15:34 ` Junio C Hamano
2013-01-03 20:23 ` Jeff King
2013-01-03 20:34 ` Junio C Hamano
2013-01-03 20:36 ` Jeff King
2013-01-03 22:33 ` Junio C Hamano
2013-01-07 13:46 ` Jeff King
2012-12-29 10:40 ` [PATCH 2/3] do not write null sha1s to on-disk index Jonathan Nieder
2012-07-28 15:06 ` [PATCH 3/3] fsck: detect null sha1 in tree entries Jeff King
2012-07-29 22:15 ` [PATCH 0/3] null sha1 in trees Junio C Hamano
2012-07-30 15:42 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121229104247.GA30283@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).