From: Chris Shoemaker <c.shoemaker@cox.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: gitster@pobox.com, git@vger.kernel.org
Subject: Re: [PATCH] apply --index-info: fall back to current index for mode changes
Date: Sun, 16 Sep 2007 20:46:23 -0400 [thread overview]
Message-ID: <20070917004623.GA3826@pe.Belkin> (raw)
In-Reply-To: <Pine.LNX.4.64.0709170119270.28586@racer.site>
On Mon, Sep 17, 2007 at 01:24:57AM +0100, Johannes Schindelin wrote:
>
> "git diff" does not record index lines for pure mode changes (i.e. no
> lines changed). Therefore, apply --index-info would call out a bogus
> error.
>
> Instead, fall back to reading the info from the current index.
>
> Incidentally, this fixes an error where git-rebase would not rebase a
> commit including a pure mode change, and changes requiring a threeway
> merge.
>
> Noticed by Chris Shoemaker.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Works for me. Thanks.
Acked-by: Chris Shoemaker <chris.shoemaker@cox.net>
prev parent reply other threads:[~2007-09-17 0:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-17 0:24 [PATCH] apply --index-info: fall back to current index for mode changes Johannes Schindelin
2007-09-17 0:46 ` Chris Shoemaker [this message]
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=20070917004623.GA3826@pe.Belkin \
--to=c.shoemaker@cox.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).