From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [PATCH v4 0/2] t3433: new rebase testcase documenting a stat-dirty-like failure
Date: Wed, 19 Feb 2020 17:04:05 +0000 [thread overview]
Message-ID: <pull.712.v4.git.git.1582131847.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.712.v3.git.git.1582064105813.gitgitgadget@gmail.com>
Changes since v3:
* add another patch which fixes the bug. Thanks to Phillip for doing some
digging to find the bug wasn't in rebase but in git_merge_trees().
Elijah Newren (2):
t3433: new rebase testcase documenting a stat-dirty-like failure
merge-recursive: fix the refresh logic in update_file_flags
merge-recursive.c | 7 ++--
t/t3433-rebase-across-mode-change.sh | 48 ++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 2 deletions(-)
create mode 100755 t/t3433-rebase-across-mode-change.sh
base-commit: e68e29171cc2d6968902e0654b5687fbe1ccb903
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-712%2Fnewren%2Fdocument-rebase-failure-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-712/newren/document-rebase-failure-v4
Pull-Request: https://github.com/git/git/pull/712
Range-diff vs v3:
1: 270591cd3be = 1: 270591cd3be t3433: new rebase testcase documenting a stat-dirty-like failure
-: ----------- > 2: ba297fd67bb merge-recursive: fix the refresh logic in update_file_flags
--
gitgitgadget
next prev parent reply other threads:[~2020-02-19 17:04 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
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 ` Elijah Newren via GitGitGadget [this message]
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=pull.712.v4.git.git.1582131847.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@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).