From: Shourya Shukla <periperidip@gmail.com>
To: periperidip@gmail.com
Cc: christian.couder@gmail.com, git@vger.kernel.org,
gitster@pobox.com, levraiphilippeblain@gmail.com
Subject: [PATCH v2 0/1] rm: stage submodule removal from '.gitmodules'
Date: Mon, 22 Feb 2021 22:56:22 +0530 [thread overview]
Message-ID: <20210222172623.69313-1-periperidip@gmail.com> (raw)
In-Reply-To: <20210218184931.83613-1-periperidip@gmail.com>
Hello all,
This is the v2 of the patch with the same title. After suggestions from
Phillipe and Junio, I have improved the commit messages, squashed the
two commits and did the following:
1. Change the definition and declaration of
'remove_path_from_gitmodules()' to account in for the
'index_only' variable denoting the presence of '--cached'
option in the 'git rm' command. In case of the variable being
1, remove the submodule entry from the index copy of the
'.gitmodules' else do the same for the working tree copy.
2. Remove the 'gitmodules_modified' variable and instead call
'stage_updated_gitmodules()' just after the
'remove_path_from_gitmodules()' call.
3. Account for the above changes in 't3600' and make changes in
the same.
I am facing some problem with point (2) in the sense that what Junio
suggested in his mail:
https://lore.kernel.org/git/xmqqblchdoej.fsf@gitster.g/
-----8<-----
- Since the previous point will maintain the correct contents in
the index in all cases, get rid of gitmodules_modified and calls
to stage_updated_gitmodules(). The call to write_locked_index()
at the end will take care of the actual writing out of the index.
----->8-----
I am not able to get rid of the 'stage_updated_gitmodules()' call
without failing tests in t3600 (t3600.4 is the first one to fail). What
am I doing wrong here?
Comments and reviews are appreciated. Thank you Phillipe and Junio for
the constructive feedback on the v1!
Regards,
Shourya Shukla
Shourya Shukla (1):
rm: stage submodule removal from '.gitmodules' when using '--cached'
builtin/rm.c | 42 +++++++++++++++++++++---------------------
submodule.c | 5 +++--
submodule.h | 2 +-
t/t3600-rm.sh | 6 ++----
4 files changed, 27 insertions(+), 28 deletions(-)
--
2.25.1
next prev parent reply other threads:[~2021-02-22 17:28 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-18 18:49 [RFC][PATCH 0/2] rm: changes in the '.gitmodules' are staged after using '--cached' Shourya Shukla
2021-02-18 18:49 ` [PATCH 1/2] " Shourya Shukla
2021-02-18 20:14 ` Philippe Blain
2021-02-18 20:39 ` Philippe Blain
2021-02-19 15:19 ` Shourya Shukla
2021-02-18 22:03 ` Junio C Hamano
2021-02-19 15:24 ` Shourya Shukla
2021-02-20 3:31 ` Junio C Hamano
2021-02-18 18:49 ` [PATCH 2/2] t3600: amend test 46 to check for '.gitmodules' modification Shourya Shukla
2021-02-18 20:21 ` Philippe Blain
2021-02-22 17:26 ` Shourya Shukla [this message]
2021-02-22 17:26 ` [PATCH v2 1/1] rm: stage submodule removal from '.gitmodules' when using '--cached' Shourya Shukla
2021-02-22 18:58 ` Junio C Hamano
2021-03-05 17:58 ` Shourya Shukla
2021-03-05 21:39 ` Junio C Hamano
2021-02-22 19:29 ` Junio C Hamano
2021-03-07 16:46 ` Shourya Shukla
2021-03-07 20:29 ` Junio C Hamano
2021-03-09 7:13 ` Shourya Shukla
2021-03-09 20:47 ` 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=20210222172623.69313-1-periperidip@gmail.com \
--to=periperidip@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=levraiphilippeblain@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).