git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jens Lehmann <Jens.Lehmann@web.de>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
	Heiko Voigt <hvoigt@hvoigt.net>,
	Ronald Weiss <weiss.ronald@gmail.com>,
	Sergey Sharybin <sergey.vfx@gmail.com>
Subject: [PATCH 0/2] status/commit: do not ignore staged submodules
Date: Sat, 05 Apr 2014 18:57:59 +0200	[thread overview]
Message-ID: <53403617.7050506@web.de> (raw)

This series fixes the problem that ignored but staged submodules do not show
up in status and commit. Even though we do change default behavior here, I
believe this is the Right Thing to do (and remember all interested parties in
the discussion that raised this issue agreed on that [1]).

[1] http://article.gmane.org/gmane.comp.version-control.git/238173

Jens Lehmann (2):
  status/commit: show staged submodules regardless of ignore config
  commit -m: commit staged submodules regardless of ignore config

 Documentation/config.txt     |  8 +++--
 Documentation/gitmodules.txt |  4 ++-
 builtin/commit.c             | 18 +++++++++--
 t/t7508-status.sh            | 74 ++++++++++++++++++++++++++++++++++++++++++--
 wt-status.c                  | 12 ++++++-
 5 files changed, 108 insertions(+), 8 deletions(-)

-- 
1.9.1.476.g510abc7

             reply	other threads:[~2014-04-05 16:58 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-05 16:57 Jens Lehmann [this message]
2014-04-05 16:59 ` [PATCH 1/2] status/commit: show staged submodules regardless of ignore config Jens Lehmann
2014-04-05 16:59 ` [PATCH 2/2] commit -m: commit " 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=53403617.7050506@web.de \
    --to=jens.lehmann@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=hvoigt@hvoigt.net \
    --cc=sergey.vfx@gmail.com \
    --cc=weiss.ronald@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.
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 NNTP newsgroup(s).