From: Stephen Boyd <sboyd@codeaurora.org>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>
Subject: [BUG?] am --abort on null cache entries fails
Date: Fri, 01 Mar 2013 16:52:16 -0800 [thread overview]
Message-ID: <51314D40.9030209@codeaurora.org> (raw)
Hi,
I was trying git am -3 with a patch that touched files that didn't exist
in the branch I was on. Obviously it failed badly, so I wanted to abort
out of the git am state with git am --abort. Unfortunately, it seems
that git am --abort in this scenario fails with this error:
error: cache entry has null sha1: <non-existant-file>
and then leaves the file in my working tree untracked. This didn't used
to happen, so I bisected it down to this commit
commit 4337b5856f88f18da47c176e3cbc95a35627044c
Author: Jeff King <peff@peff.net>
Date: Sat Jul 28 11:05:24 2012 -0400
do not write null sha1s to on-disk index
Which definitely introduced that error message. How do we fix this?
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
next reply other threads:[~2013-03-02 0:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-02 0:52 Stephen Boyd [this message]
2013-03-02 0:57 ` [BUG?] am --abort on null cache entries fails 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51314D40.9030209@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).