From: Heiko Voigt <hvoigt@hvoigt.net>
To: Sergey Sharybin <sergey.vfx@gmail.com>
Cc: Jens Lehmann <Jens.Lehmann@web.de>,
Jonathan Nieder <jrnieder@gmail.com>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Jeff King <peff@peff.net>, Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: [RFC/WIP PATCH 0/4] less ignorance of submodules for ignore=all
Date: Wed, 4 Dec 2013 23:16:59 +0100 [thread overview]
Message-ID: <20131204221659.GA7326@sandbox-ub> (raw)
In-Reply-To: <CAErtv259jxCtvbJYZHgQZv-VJ9U+JwNzWo0tn007SDTCCBScrA@mail.gmail.com>
This is my current work in progress. Sergey it would be awesome if you
could test these and tell me whether the behaviour is what you would
expect. Once that is settled I will add some tests and possibly clean up
some code.
Since nobody spoke against this change of behavior I assume that we
agree on the general approach I am taking here. If not please speak up
now so we can work something out and save me implementation time ;-)
Whats still missing is:
* it seems reset does not care at all about the ignore settings. It
still shows a
M submodule
line even when the submodule in question was not in the index and is
marked as ignored. Have not looked at the code yet.
* The git diff $commit question Junio mentioned here[1] it does not yet
show diffs of ignore=all submodules.
For testing convenience you can also find all patches applied to Junio's
current master here:
https://github.com/hvoigt/git/commits/hv/fix_ignore_all_submodules
Cheers Heiko
Heiko Voigt (4):
disable complete ignorance of submodules for index <-> HEAD diff
fix 'git add' to skip submodules configured as ignored
teach add -f option for ignored submodules
always show committed submodules in summary after commit
builtin/add.c | 55 ++++++++++++++++++++++++++++++++++++-----------
builtin/commit.c | 1 +
builtin/diff.c | 2 ++
diff-lib.c | 3 +++
diff.h | 2 +-
submodule.c | 26 ++++++++++++++++++++--
submodule.h | 2 ++
t/t4027-diff-submodule.sh | 12 ++++++++---
t/t7508-status.sh | 6 +++++-
9 files changed, 90 insertions(+), 19 deletions(-)
--
1.8.5.1.43.gf00fb86
next prev parent reply other threads:[~2013-12-04 22:17 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-22 7:53 Git issues with submodules Sergey Sharybin
2013-11-22 11:16 ` Ramkumar Ramachandra
2013-11-22 11:35 ` Sergey Sharybin
2013-11-22 13:08 ` Ramkumar Ramachandra
2013-11-22 15:11 ` Jeff King
2013-11-22 15:42 ` Sergey Sharybin
2013-11-22 16:35 ` Ramkumar Ramachandra
2013-11-22 17:01 ` Sergey Sharybin
2013-11-22 17:40 ` Sergey Sharybin
2013-11-22 18:11 ` Ramkumar Ramachandra
2013-11-22 21:01 ` Jens Lehmann
2013-11-22 21:46 ` Sergey Sharybin
2013-11-22 21:54 ` Heiko Voigt
2013-11-22 22:09 ` Jonathan Nieder
2013-11-23 20:10 ` Jens Lehmann
2013-11-24 0:52 ` Heiko Voigt
2013-11-24 16:29 ` Jens Lehmann
2013-11-25 9:02 ` Sergey Sharybin
2013-11-25 17:49 ` Heiko Voigt
2013-11-25 17:57 ` Sergey Sharybin
2013-11-25 18:15 ` Heiko Voigt
2013-12-04 22:16 ` Heiko Voigt [this message]
2013-12-04 22:19 ` [RFC/WIP PATCH 1/4] disable complete ignorance of submodules for index <-> HEAD diff Heiko Voigt
2013-12-04 22:21 ` [RFC/WIP PATCH 2/4] fix 'git add' to skip submodules configured as ignored Heiko Voigt
2013-12-04 22:21 ` [RFC/WIP PATCH 3/4] teach add -f option for ignored submodules Heiko Voigt
2013-12-06 23:10 ` Junio C Hamano
2013-12-09 21:51 ` Heiko Voigt
2013-12-04 22:23 ` [RFC/WIP PATCH 4/4] always show committed submodules in summary after commit Heiko Voigt
2013-12-04 22:26 ` [RFC/WIP PATCH 0/4] less ignorance of submodules for ignore=all Heiko Voigt
2013-12-04 22:32 ` Junio C Hamano
2013-12-04 23:19 ` Heiko Voigt
2013-12-05 20:51 ` Jens Lehmann
2013-12-09 21:41 ` Heiko Voigt
2013-12-09 22:25 ` Junio C Hamano
2013-11-25 21:01 ` Git issues with submodules Junio C Hamano
2013-11-26 18:44 ` Jens Lehmann
2013-11-26 19:33 ` Junio C Hamano
2013-11-26 19:51 ` Jonathan Nieder
2013-11-26 22:19 ` Junio C Hamano
2013-11-23 1:11 ` [RFC PATCH] disable complete ignorance of submodules for index <-> HEAD diff Heiko Voigt
2013-11-25 9:01 ` Sergey Sharybin
2013-11-28 7:10 ` Heiko Voigt
2013-11-29 23:11 ` [RFC/WIP PATCH v2] " Heiko Voigt
2013-11-23 7:04 ` Re: Git issues with submodules Ramkumar Ramachandra
2013-11-23 20:32 ` Jens Lehmann
2013-11-24 1:06 ` Heiko Voigt
2013-11-25 20:53 ` Junio C Hamano
2013-11-29 22:50 ` Heiko Voigt
2013-11-23 6:53 ` Ramkumar Ramachandra
2013-11-22 16:12 ` Ramkumar Ramachandra
2013-11-22 20:20 ` Jens Lehmann
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=20131204221659.GA7326@sandbox-ub \
--to=hvoigt@hvoigt.net \
--cc=Jens.Lehmann@web.de \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=sergey.vfx@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).