From: Mark Mentovai <mark@chromium.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Development <git@vger.kernel.org>,
Chandra Pratap <chandrapratap3519@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Subject: Re: [PATCH v2 1/2] t4129: test that git apply warns for unexpected mode changes
Date: Fri, 23 May 2025 23:10:27 -0400 (EDT) [thread overview]
Message-ID: <d14135de-ddbc-0875-3ffe-700a2fd33d90@chromium.org> (raw)
In-Reply-To: <xmqqmsb2vr6z.fsf@gitster.g>
Junio C Hamano wrote:
> Mark Mentovai <mark@chromium.org> writes:
>> diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh
>> index 2149ad5da44c..082e56db651e 100755
>> --- a/t/t4129-apply-samemode.sh
>> +++ b/t/t4129-apply-samemode.sh
>> @@ -102,15 +102,23 @@ test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree
>> )
>> '
>>
>> +test_file_mode_staged () {
>> + git ls-files --stage -- "$2" >ls-files-output &&
>> + test_grep "^10$1 " ls-files-output
>> +}
>> +
>> +test_file_mode_HEAD () {
>> + git ls-tree HEAD -- "$2" >ls-tree-output &&
>> + test_grep "^10$1 " ls-tree-output
>> +}
>
> The script is about testing executable bits, so it is fine that the
> above cannot be used to expect a symbolic link (if we wanted to
> support it, we'd just take the whole 100644 vs 120000 without
> support to let the caller give abbreviated input).
>
> But then it is curious that this asks the caller to say 0755 vs 0644,
> not 755 vs 644, which would be sufficient.
The leading 0 was because I prefer to present numbers represented in octal
in this form.
On the basis of your comment in the 2/2 patch about using 000000 for an
absent file, I'll change this to use the six-digit form uniformly.
> Very portable way to add an executable file. Would work regardless
> of the filesystem. Very nice.
Thanks!
next prev parent reply other threads:[~2025-05-24 3:10 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-22 22:02 [PATCH] apply: set file mode when --reverse creates a deleted file Mark Mentovai
2025-05-22 22:24 ` Kristoffer Haugsbakk
2025-05-22 23:15 ` Junio C Hamano
2025-05-22 22:58 ` Junio C Hamano
2025-05-22 23:48 ` Mark Mentovai
2025-05-23 14:49 ` Junio C Hamano
2025-05-23 17:21 ` [PATCH v2 0/2] " Mark Mentovai
2025-05-23 17:21 ` [PATCH v2 1/2] t4129: test that git apply warns for unexpected mode changes Mark Mentovai
2025-05-23 23:32 ` Junio C Hamano
2025-05-24 3:10 ` Mark Mentovai [this message]
2025-05-23 17:21 ` [PATCH v2 2/2] apply: set file mode when --reverse creates a deleted file Mark Mentovai
2025-05-23 23:44 ` Junio C Hamano
2025-05-24 3:19 ` Mark Mentovai
2025-05-24 3:40 ` [PATCH v3 0/2] " Mark Mentovai
2025-05-24 3:40 ` [PATCH v3 1/2] t4129: test that git apply warns for unexpected mode changes Mark Mentovai
2025-05-24 3:40 ` [PATCH v3 2/2] apply: set file mode when --reverse creates a deleted file Mark Mentovai
2025-05-27 13:56 ` [PATCH v3 0/2] " 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d14135de-ddbc-0875-3ffe-700a2fd33d90@chromium.org \
--to=mark@chromium.org \
--cc=chandrapratap3519@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=kristofferhaugsbakk@fastmail.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).