Re: [PATCH v5 0/8] Fix merge restore state

[PATCH 0/2] Fix merge restore state · Elijah Newren via GitGitGadget <hidden> · 2022-05-19
[PATCH 1/2] merge: remove unused variable · Elijah Newren via GitGitGadget <hidden> · 2022-05-19
[PATCH 2/2] merge: make restore_state() do as its name says · Elijah Newren via GitGitGadget <hidden> · 2022-05-19
Re: [PATCH 0/2] Fix merge restore state · Elijah Newren <hidden> · 2022-06-12
Re: [PATCH 0/2] Fix merge restore state · ZheNing Hu <hidden> · 2022-06-12
[PATCH v2 0/6] Fix merge restore state · Elijah Newren via GitGitGadget <hidden> · 2022-06-19
[PATCH v2 1/6] t6424: make sure a failed merge preserves local changes · Junio C Hamano via GitGitGadget <hidden> · 2022-06-19
[PATCH v2 2/6] merge: remove unused variable · Elijah Newren via GitGitGadget <hidden> · 2022-06-19
Re: [PATCH v2 2/6] merge: remove unused variable · Junio C Hamano <hidden> · 2022-07-19
[PATCH v2 4/6] merge: make restore_state() restore staged state too · Elijah Newren via GitGitGadget <hidden> · 2022-06-19
Re: [PATCH v2 4/6] merge: make restore_state() restore staged state too · ZheNing Hu <hidden> · 2022-07-17
Re: [PATCH v2 4/6] merge: make restore_state() restore staged state too · Junio C Hamano <hidden> · 2022-07-19
[PATCH v2 3/6] merge: fix save_state() to work when there are racy-dirty files · Elijah Newren via GitGitGadget <hidden> · 2022-06-19
Re: [PATCH v2 3/6] merge: fix save_state() to work when there are racy-dirty files · ZheNing Hu <hidden> · 2022-07-17
[PATCH v2 6/6] merge: do not exit restore_state() prematurely · Elijah Newren via GitGitGadget <hidden> · 2022-06-19
Re: [PATCH v2 6/6] merge: do not exit restore_state() prematurely · ZheNing Hu <hidden> · 2022-07-17
[PATCH v2 5/6] merge: ensure we can actually restore pre-merge state · Elijah Newren via GitGitGadget <hidden> · 2022-06-19
Re: [PATCH v2 5/6] merge: ensure we can actually restore pre-merge state · ZheNing Hu <hidden> · 2022-07-17
[PATCH v3 0/7] Fix merge restore state · Elijah Newren via GitGitGadget <hidden> · 2022-07-21
[PATCH v3 1/7] merge-ort-wrappers: make printed message match the one from recursive · Elijah Newren via GitGitGadget <hidden> · 2022-07-21
[PATCH v3 2/7] merge-resolve: abort if index does not match HEAD · Elijah Newren via GitGitGadget <hidden> · 2022-07-21
[PATCH v3 3/7] merge: do not abort early if one strategy fails to handle the merge · Elijah Newren via GitGitGadget <hidden> · 2022-07-21
Re: [PATCH v3 3/7] merge: do not abort early if one strategy fails to handle the merge · Ævar Arnfjörð Bjarmason <hidden> · 2022-07-25
Re: [PATCH v3 3/7] merge: do not abort early if one strategy fails to handle the merge · Elijah Newren <hidden> · 2022-07-26
Re: [PATCH v3 3/7] merge: do not abort early if one strategy fails to handle the merge · Ævar Arnfjörð Bjarmason <hidden> · 2022-07-26
[PATCH v3 4/7] merge: fix save_state() to work when there are stat-dirty files · Elijah Newren via GitGitGadget <hidden> · 2022-07-21
[PATCH v3 6/7] merge: ensure we can actually restore pre-merge state · Elijah Newren via GitGitGadget <hidden> · 2022-07-21
[PATCH v3 5/7] merge: make restore_state() restore staged state too · Elijah Newren via GitGitGadget <hidden> · 2022-07-21
[PATCH v3 7/7] merge: do not exit restore_state() prematurely · Elijah Newren via GitGitGadget <hidden> · 2022-07-21
[PATCH v4 0/7] Fix merge restore state · Elijah Newren via GitGitGadget <hidden> · 2022-07-22
[PATCH v4 1/7] merge-ort-wrappers: make printed message match the one from recursive · Elijah Newren via GitGitGadget <hidden> · 2022-07-22
[PATCH v4 2/7] merge-resolve: abort if index does not match HEAD · Elijah Newren via GitGitGadget <hidden> · 2022-07-22
Re: [PATCH v4 2/7] merge-resolve: abort if index does not match HEAD · Ævar Arnfjörð Bjarmason <hidden> · 2022-07-22
Re: [PATCH v4 2/7] merge-resolve: abort if index does not match HEAD · Elijah Newren <hidden> · 2022-07-23
Re: [PATCH v4 2/7] merge-resolve: abort if index does not match HEAD · Ævar Arnfjörð Bjarmason <hidden> · 2022-07-23
Re: [PATCH v4 2/7] merge-resolve: abort if index does not match HEAD · Elijah Newren <hidden> · 2022-07-26
Re: [PATCH v4 2/7] merge-resolve: abort if index does not match HEAD · Ævar Arnfjörð Bjarmason <hidden> · 2022-07-26
[PATCH v4 3/7] merge: do not abort early if one strategy fails to handle the merge · Elijah Newren via GitGitGadget <hidden> · 2022-07-22
Re: [PATCH v4 3/7] merge: do not abort early if one strategy fails to handle the merge · Ævar Arnfjörð Bjarmason <hidden> · 2022-07-22
Re: [PATCH v4 3/7] merge: do not abort early if one strategy fails to handle the merge · Elijah Newren <hidden> · 2022-07-23
[PATCH v4 4/7] merge: fix save_state() to work when there are stat-dirty files · Elijah Newren via GitGitGadget <hidden> · 2022-07-22
[PATCH v4 5/7] merge: make restore_state() restore staged state too · Elijah Newren via GitGitGadget <hidden> · 2022-07-22
Re: [PATCH v4 5/7] merge: make restore_state() restore staged state too · Ævar Arnfjörð Bjarmason <hidden> · 2022-07-22
Re: [PATCH v4 5/7] merge: make restore_state() restore staged state too · Elijah Newren <hidden> · 2022-07-23
[PATCH v4 6/7] merge: ensure we can actually restore pre-merge state · Elijah Newren via GitGitGadget <hidden> · 2022-07-22
[PATCH v4 7/7] merge: do not exit restore_state() prematurely · Elijah Newren via GitGitGadget <hidden> · 2022-07-22
[PATCH v5 0/8] Fix merge restore state · Elijah Newren via GitGitGadget <hidden> · 2022-07-23
[PATCH v5 2/8] merge-resolve: abort if index does not match HEAD · Elijah Newren via GitGitGadget <hidden> · 2022-07-23
[PATCH v5 1/8] merge-ort-wrappers: make printed message match the one from recursive · Elijah Newren via GitGitGadget <hidden> · 2022-07-23
[PATCH v5 4/8] merge: do not abort early if one strategy fails to handle the merge · Elijah Newren via GitGitGadget <hidden> · 2022-07-23
[PATCH v5 3/8] merge: abort if index does not match HEAD for trivial merges · Elijah Newren via GitGitGadget <hidden> · 2022-07-23
[PATCH v5 5/8] merge: fix save_state() to work when there are stat-dirty files · Elijah Newren via GitGitGadget <hidden> · 2022-07-23
[PATCH v5 6/8] merge: make restore_state() restore staged state too · Elijah Newren via GitGitGadget <hidden> · 2022-07-23
[PATCH v5 7/8] merge: ensure we can actually restore pre-merge state · Elijah Newren via GitGitGadget <hidden> · 2022-07-23
[PATCH v5 8/8] merge: do not exit restore_state() prematurely · Elijah Newren via GitGitGadget <hidden> · 2022-07-23
Re: [PATCH v5 0/8] Fix merge restore state · ZheNing Hu <hidden> · 2022-07-26

From: ZheNing Hu <hidden>
Date: 2022-07-26 04:04:09

Elijah Newren via GitGitGadget [off-list ref] 于2022年7月23日周六 09:53写道：

This started as a simple series to fix restore_state() in builtin/merge.c,
fixing an issue reported by ZheNing Hu[3]. It now fixes several bugs and has
grown so much it's hard to call it simple. Anyway...

Thanks. This patch is good enough for me :)

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help