Re: [PATCH] Revert "Merge branch 'sb/submodule-core-worktree'" (was Re: Old submodules broken in 2.19rc1 and 2.19rc2)
- Date: Sat, 8 Sep 2018 20:39:43 +0200
- From: Johannes Sixt <j6t@xxxxxxxx>
- Subject: Re: [PATCH] Revert "Merge branch 'sb/submodule-core-worktree'" (was Re: Old submodules broken in 2.19rc1 and 2.19rc2)
Am 08.09.2018 um 04:04 schrieb Junio C Hamano:
> Jonathan Nieder <jrnieder@xxxxxxxxx> writes:
>> It is late in the release cycle, so revert the whole 3-patch series.
>> We can try again later for 2.20.
>> Reported-by: Allan Sandfeld Jensen <allan.jensen@xxxxx>
>> Helped-by: Stefan Beller <sbeller@xxxxxxxxxx>
>> Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
>> Stefan Beller wrote:
>>> Jonathan Nieder wrote:
>>>> I think we
>>>> should revert e98317508c0 in "master" (for 2.19) and keep making use
>>>> of that 'second try' in "next" (for 2.20).
>>> Actually I'd rather revert the whole topic leading up to
>>> 7e25437d35a (Merge branch 'sb/submodule-core-worktree', 2018-07-18)
>>> as the last patch in there doesn't work well without e98317508c0 IIRC.
>>> And having only the first patch would bring an inconsistent state as
>>> then different commands behave differently w.r.t. setting core.worktree.
>> Like this (generated using "git revert -m1)?
> OK. Thanks for taking care of it.
Please don't forget to remove the corresponding release notes entry.
diff --git a/Documentation/RelNotes/2.19.0.txt b/Documentation/RelNotes/2.19.0.txt
index bcbfbc2041..834454ffb9 100644
@@ -296,12 +296,6 @@ Fixes since v2.18
to the submodule was changed in the range of commits in the
superproject, sometimes showing "(null)". This has been corrected.
- * "git submodule" did not correctly adjust core.worktree setting that
- indicates whether/where a submodule repository has its associated
- working tree across various state transitions, which has been
- (merge 984cd77ddb sb/submodule-core-worktree later to maint).
* Bugfix for "rebase -i" corner case regression.
(merge a9279c6785 pw/rebase-i-keep-reword-after-conflict later to maint).