From: Phillip Wood <phillip.wood123@gmail.com>
To: Elijah Newren <newren@gmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH] t3424: new rebase testcase documenting a stat-dirty-like failure
Date: Wed, 19 Feb 2020 19:33:15 +0000 [thread overview]
Message-ID: <73f32ad3-204e-09a8-d424-5a3534358676@gmail.com> (raw)
In-Reply-To: <CABPp-BFij++-6P2ht1EacGXaX4vA_CuBQEfz6M9w9CadXHC8Jw@mail.gmail.com>
Hi Elijah
On 19/02/2020 16:00, Elijah Newren wrote:
> Hi Phillip,
>
>>
>> HEAD is now at abd8fe3 side1
>> Rebasing (1/2) # picking commit1
>> DS mtime, mode before merge 1582109854, 120000
>> DS mtime, mode after merge 0, 120000
>> Rebasing (2/2) # picking commit2
>> DS mtime, mode before merge 0, 120000
>> error: Your local changes to the following files would be overwritten by
>> merge:
>> DS
>>
>> So it looks like the problem is that when we pick commit1 we don't
>> update the index entry for DS properly in merge_trees()
>>
>> Best Wishes
>>
>> Phillip
>
> Oh, indeed, so this was my bug. Thanks for jumping in and
> investigating; I probably should have found that lead but I just
> didn't. Anyway, with your extra information I dug around for a bit
> and I think I found the fix. I'll post it soon.
I'm glad that was helpful, thanks for fixing the bug
Phillip
next prev parent reply other threads:[~2020-02-19 19:33 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 17:15 [PATCH] t3424: new rebase testcase documenting a stat-dirty-like failure Elijah Newren via GitGitGadget
2020-02-17 19:12 ` Elijah Newren
2020-02-18 15:05 ` Phillip Wood
2020-02-18 15:59 ` Elijah Newren
2020-02-19 11:01 ` Phillip Wood
2020-02-19 16:00 ` Elijah Newren
2020-02-19 16:38 ` Junio C Hamano
2020-02-19 19:33 ` Phillip Wood [this message]
2020-02-18 14:03 ` Johannes Schindelin
2020-02-18 15:55 ` Elijah Newren
2020-02-18 20:55 ` [PATCH v2] " Elijah Newren via GitGitGadget
2020-02-18 21:33 ` Junio C Hamano
2020-02-18 22:01 ` Elijah Newren
2020-02-18 22:15 ` [PATCH v3] t3433: " Elijah Newren via GitGitGadget
2020-02-19 17:04 ` [PATCH v4 0/2] " Elijah Newren via GitGitGadget
2020-02-19 17:04 ` [PATCH v4 1/2] " Elijah Newren via GitGitGadget
2020-02-19 17:04 ` [PATCH v4 2/2] merge-recursive: fix the refresh logic in update_file_flags Elijah Newren via GitGitGadget
2020-02-19 18:40 ` Junio C Hamano
2020-02-19 19:32 ` Elijah Newren
2020-02-19 21:39 ` Junio C Hamano
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=73f32ad3-204e-09a8-d424-5a3534358676@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).