From: Andrew Wong <andrew.kw.w@gmail.com>
To: Max Horn <max@quendi.de>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: rebase: strange failures to apply patc 3-way
Date: Sat, 09 Mar 2013 13:50:16 -0500 [thread overview]
Message-ID: <513B8468.7070006@gmail.com> (raw)
In-Reply-To: <513B8037.7060107@gmail.com>
On 03/09/13 13:32, Andrew Wong wrote:
> Yea, that's really suspicious. This could mean there's an issue with
> when git is checking the index. Try running these a couple times in a
> clean work tree:
> $ git update-index --refresh
> $ git diff-files
>
> In a clean work tree, these commands should print nothing. But in your
> case, these might print random files that git thinks have been modified...
Before you run those commands each time, you probably have to "touch"
couple files to trigger the issue:
$ touch file1 file2
Maybe use touch on the files that git rebase has been reporting error?
next prev parent reply other threads:[~2013-03-09 18:55 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-07 10:16 rebase: strange failures to apply patc 3-way Max Horn
2013-03-08 11:34 ` Max Horn
2013-03-08 15:32 ` Andrew Wong
2013-03-08 17:35 ` Max Horn
2013-03-08 18:02 ` Andrew Wong
2013-03-08 18:47 ` Max Horn
2013-03-08 19:20 ` Andrew Wong
2013-03-09 11:26 ` Max Horn
2013-03-09 18:32 ` Andrew Wong
2013-03-09 18:50 ` Andrew Wong [this message]
2013-03-10 13:22 ` Max Horn
2013-03-11 19:15 ` Andrew Wong
2013-03-11 21:10 ` Max Horn
2013-03-11 21:34 ` Andrew Wong
2013-03-11 22:20 ` Max Horn
2013-03-11 21:20 ` Max Horn
2013-03-11 22:10 ` Andrew Wong
2013-03-11 22:36 ` Max Horn
2013-03-11 22:54 ` Andrew Wong
2013-03-12 0:15 ` Max Horn
2013-03-12 0:29 ` Max Horn
2013-03-12 0:41 ` John Szakmeister
2013-03-12 0:58 ` Andrew Wong
2013-03-12 1:01 ` Jeff King
2013-03-12 1:03 ` Andrew Wong
2013-03-12 1:10 ` Jeff King
2013-03-12 8:26 ` Heiko Voigt
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=513B8468.7070006@gmail.com \
--to=andrew.kw.w@gmail.com \
--cc=git@vger.kernel.org \
--cc=max@quendi.de \
/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).