From: Junio C Hamano <gitster@pobox.com>
To: Thomas Gummerer <t.gummerer@gmail.com>
Cc: git@vger.kernel.org,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Jeff King" <peff@peff.net>, "Jan Keromnes" <janx@linux.com>,
"Ingo Brückl" <ib@wupperonline.de>,
"Edward Thomson" <ethomson@edwardthomson.com>
Subject: Re: [PATCH v4 4/4] add: modify already added files when --chmod is given
Date: Wed, 14 Sep 2016 14:54:42 -0700 [thread overview]
Message-ID: <xmqq4m5iqh99.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160914210747.15485-5-t.gummerer@gmail.com> (Thomas Gummerer's message of "Wed, 14 Sep 2016 22:07:47 +0100")
Thomas Gummerer <t.gummerer@gmail.com> writes:
> When the chmod option was added to git add, it was hooked up to the diff
> machinery, meaning that it only works when the version in the index
> differs from the version on disk.
>
> As the option was supposed to mirror the chmod option in update-index,
> which always changes the mode in the index, regardless of the status of
> the file, make sure the option behaves the same way in git add.
>
> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
> ---
This change essentially reverts most of what 4e55ed32 ("add: add
--chmod=+x / --chmod=-x options", 2016-05-31) did, except that it
keeps the command line option and adjusts its validation, and adds a
separate phase to "fix-up" the executable bits for all paths that
match the given pathspec, whether they were new or modified or
unchanged.
The patch makes sense to me. Thanks.
next prev parent reply other threads:[~2016-09-14 21:54 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-01 16:08 `make profile-install` fails in 2.9.3 Jan Keromnes
2016-09-01 16:25 ` Dennis Kaarsemaker
2016-09-01 20:07 ` Thomas Gummerer
2016-09-01 21:58 ` Jeff King
2016-09-01 22:16 ` Junio C Hamano
2016-09-01 22:20 ` Jeff King
2016-09-01 22:38 ` Junio C Hamano
2016-09-04 11:39 ` [PATCH 0/4] git add --chmod: always change the file Thomas Gummerer
2016-09-04 11:39 ` [PATCH 1/4] add: document the chmod option Thomas Gummerer
2016-09-05 7:44 ` Johannes Schindelin
2016-09-05 19:22 ` Thomas Gummerer
2016-09-07 16:44 ` Junio C Hamano
2016-09-04 11:39 ` [PATCH 2/4] update-index: use the same structure for chmod as add Thomas Gummerer
2016-09-04 11:39 ` [PATCH 3/4] read-cache: introduce chmod_index_entry Thomas Gummerer
2016-09-04 11:39 ` [PATCH 4/4] add: modify already added files when --chmod is given Thomas Gummerer
2016-09-11 10:30 ` [PATCH v2 0/4] git add --chmod: always change the file Thomas Gummerer
2016-09-11 10:30 ` [PATCH v2 1/4] add: document the chmod option Thomas Gummerer
2016-09-11 10:30 ` [PATCH v2 2/4] update-index: use the same structure for chmod as add Thomas Gummerer
2016-09-11 22:28 ` Junio C Hamano
2016-09-12 19:30 ` Thomas Gummerer
2016-09-11 10:30 ` [PATCH v2 3/4] read-cache: introduce chmod_index_entry Thomas Gummerer
2016-09-11 10:30 ` [PATCH v2 4/4] add: modify already added files when --chmod is given Thomas Gummerer
2016-09-12 21:08 ` [PATCH v3 0/4] git add --chmod: always change the file Thomas Gummerer
2016-09-12 21:08 ` [PATCH v3 1/4] add: document the chmod option Thomas Gummerer
2016-09-12 21:08 ` [PATCH v3 2/4] update-index: use the same structure for chmod as add Thomas Gummerer
2016-09-12 21:59 ` Junio C Hamano
2016-09-12 21:08 ` [PATCH v3 3/4] read-cache: introduce chmod_index_entry Thomas Gummerer
2016-09-12 21:08 ` [PATCH v3 4/4] add: modify already added files when --chmod is given Thomas Gummerer
2016-09-12 22:23 ` Junio C Hamano
2016-09-14 21:07 ` [PATCH v4 0/4] git add --chmod: always change the file Thomas Gummerer
2016-09-14 21:07 ` [PATCH v4 1/4] add: document the chmod option Thomas Gummerer
2016-09-14 21:07 ` [PATCH v4 2/4] update-index: add test for chmod flags Thomas Gummerer
2016-09-14 21:07 ` [PATCH v4 3/4] read-cache: introduce chmod_index_entry Thomas Gummerer
2016-09-14 21:46 ` Junio C Hamano
2016-09-14 22:54 ` Junio C Hamano
2016-09-15 18:49 ` Thomas Gummerer
2016-09-14 21:07 ` [PATCH v4 4/4] add: modify already added files when --chmod is given Thomas Gummerer
2016-09-14 21:54 ` Junio C Hamano [this message]
2017-08-07 21:40 ` René Scharfe
2017-08-12 12:30 ` Thomas Gummerer
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=xmqq4m5iqh99.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=ethomson@edwardthomson.com \
--cc=git@vger.kernel.org \
--cc=ib@wupperonline.de \
--cc=janx@linux.com \
--cc=peff@peff.net \
--cc=t.gummerer@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).