From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>
Subject: [PATCH 0/4]
Date: Fri, 7 Dec 2018 15:54:21 -0800 [thread overview]
Message-ID: <20181207235425.128568-1-sbeller@google.com> (raw)
A couple days before the 2.19 release we had a bug report about
broken submodules[1] and reverted[2] the commits leading up to them.
The behavior of said bug fixed itself by taking a different approach[3],
specifically by a weaker enforcement of having `core.worktree` set in a
submodule [4].
The revert [2] was overly broad as we neared the release, such that we wanted
to rather keep the known buggy behavior of always having `core.worktree` set,
rather than figuring out how to fix the new bug of having 'git submodule update'
not working in old style repository setups.
This series re-introduces those reverted patches, with no changes in code,
but with drastically changed commit messages, as those focus on why it is safe
to re-introduce them instead of explaining the desire for the change.
[1] https://public-inbox.org/git/2659750.rG6xLiZASK@twilight
[2] f178c13fda (Revert "Merge branch 'sb/submodule-core-worktree'", 2018-09-07)
[3] 4d6d6ef1fc (Merge branch 'sb/submodule-update-in-c', 2018-09-17)
[4] 74d4731da1 (submodule--helper: replace connect-gitdir-workingtree by ensure-core-worktree, 2018-08-13)
Stefan Beller (4):
submodule update: add regression test with old style setups
submodule: unset core.worktree if no working tree is present
submodule--helper: fix BUG message in ensure_core_worktree
submodule deinit: unset core.worktree
builtin/submodule--helper.c | 4 +++-
submodule.c | 14 ++++++++++++++
submodule.h | 2 ++
t/lib-submodule-update.sh | 5 +++--
t/t7400-submodule-basic.sh | 5 +++++
t/t7412-submodule-absorbgitdirs.sh | 7 ++++++-
6 files changed, 33 insertions(+), 4 deletions(-)
--
2.20.0.rc2.403.gdbc3b29805-goog
next reply other threads:[~2018-12-07 23:54 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-07 23:54 Stefan Beller [this message]
2018-12-07 23:54 ` [PATCH 1/4] submodule update: add regression test with old style setups Stefan Beller
2018-12-09 0:11 ` Junio C Hamano
2018-12-07 23:54 ` [PATCH 2/4] submodule: unset core.worktree if no working tree is present Stefan Beller
2018-12-08 6:44 ` Junio C Hamano
2018-12-07 23:54 ` [PATCH 3/4] submodule--helper: fix BUG message in ensure_core_worktree Stefan Beller
2018-12-08 6:55 ` Junio C Hamano
2018-12-12 22:46 ` Stefan Beller
2018-12-13 3:14 ` Junio C Hamano
2018-12-07 23:54 ` [PATCH 4/4] submodule deinit: unset core.worktree Stefan Beller
2018-12-08 7:03 ` Junio C Hamano
2018-12-08 5:57 ` [PATCH 0/4] Junio C Hamano
2018-12-12 22:35 ` Stefan Beller
2018-12-13 3:15 ` Junio C Hamano
2018-12-14 23:59 ` [PATCH 0/4] submodules: unset core.worktree when no working tree present Stefan Beller
2018-12-14 23:59 ` [PATCH 1/4] submodule update: add regression test with old style setups Stefan Beller
2018-12-26 18:21 ` Junio C Hamano
2018-12-14 23:59 ` [PATCH 2/4] submodule: unset core.worktree if no working tree is present Stefan Beller
2018-12-26 18:27 ` Junio C Hamano
2018-12-14 23:59 ` [PATCH 3/4] submodule--helper: fix BUG message in ensure_core_worktree Stefan Beller
2018-12-14 23:59 ` [PATCH 4/4] submodule deinit: unset core.worktree Stefan Beller
-- strict thread matches above, loose matches on Subject: below --
2005-05-27 0:41 Broken directory pathname pruning Linus Torvalds
2005-05-27 6:41 ` [PATCH] Diff updates, fixing pathspec and rename/copy interaction Junio C Hamano
2005-05-27 15:56 ` Linus Torvalds
2005-05-27 22:43 ` [PATCH 00/12] Diff updates Junio C Hamano
2005-05-27 23:03 ` Junio C Hamano
2005-05-28 10:11 ` [PATCH] Do not show empty diff in diff-cache uncached Junio C Hamano
2005-05-29 18:53 ` Linus Torvalds
2005-05-29 20:09 ` Junio C Hamano
2005-05-29 21:52 ` Junio C Hamano
2005-05-29 23:41 ` [PATCH 0/3] Leftover bits after 12-series Junio C Hamano
2005-05-30 6:58 ` [PATCH 0/4] 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=20181207235425.128568-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
/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).