From: Chandra Pratap <chandrapratap3519@xxxxxxxxx>
When applying a patch that adds an executable file, git apply
ignores the core.fileMode setting (core.fileMode in git config
specifies whether the executable bit on files in the working tree
should be honored or not) resulting in warnings like:
warning: script.sh has type 100644, expected 100755
even when core.fileMode is set to false, which is undesired. This
is extra true for systems like Windows.
Fix this by inferring the correct file mode from the existing
index entry when core.filemode is set to false. Add a test case
that verifies the change and prevents future regression.
Signed-off-by: Chandra Pratap <chandrapratap3519@xxxxxxxxx>
---
apply: make git apply respect core.fileMode settings
Regarding this:
> I am wondering if we want to be more strict about hiding error return
> code from "git ls-files" and "git ls-tree" behind pipes like these.
> Usually we encourage using a temporary file, e.g., ... git ls-files -s
> script.sh >ls-files-output && test_grep "^100755" ls-files-output &&
> ...
I have modified the patch so that the output of git ls-files and git
ls-tree are stored in a temporary file instead of being directly piped
to grep but also noticed similar working in other test cases in the same
test file. For example,
test_expect_success FILEMODE 'same mode (index only)' ' .... .... ....
git ls-files -s file | grep "^100755"
and
test_expect_success FILEMODE 'mode update (index only)' ' ... ... ...
git ls-files -s file | grep "^100755"
Would we want to modify these scripts as well so they follow the same
convention as above or is it okay to let them be as is?
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1620%2FChand-ra%2Fdevel-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1620/Chand-ra/devel-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/1620
Range-diff vs v2:
1: 29c8c6d120e ! 1: 9a3623edfd2 Teach git apply to respect core.fileMode settings
@@ Commit message
warning: script.sh has type 100644, expected 100755
even when core.fileMode is set to false, which is undesired. This
- is extra true for systems like Windows, which don't rely on "lsat()".
+ is extra true for systems like Windows.
Fix this by inferring the correct file mode from the existing
- index entry when core.filemode is set to false. The added
- test case helps verify the change and prevents future regression.
+ index entry when core.filemode is set to false. Add a test case
+ that verifies the change and prevents future regression.
- Reviewed-by: Johannes Schindelin <johannes.schindelin@xxxxxxxxx>
Signed-off-by: Chandra Pratap <chandrapratap3519@xxxxxxxxx>
## apply.c ##
@@ t/t4129-apply-samemode.sh: test_expect_success POSIXPERM 'do not use core.shared
)
'
-+test_expect_success 'ensure git apply respects core.fileMode' '
++test_expect_success 'git apply respects core.fileMode' '
+ test_config core.fileMode false &&
+ echo true >script.sh &&
+ git add --chmod=+x script.sh &&
-+ git ls-files -s script.sh | grep "^100755" &&
++ git ls-files -s script.sh > ls-files-output &&
++ test_grep "^100755" ls-files-output &&
+ test_tick && git commit -m "Add script" &&
-+ git ls-tree -r HEAD script.sh | grep "^100755" &&
++ git ls-tree -r HEAD script.sh > ls-tree-output &&
++ test_grep "^100755" ls-tree-output &&
+
+ echo true >>script.sh &&
+ test_tick && git commit -m "Modify script" script.sh &&
+ git format-patch -1 --stdout >patch &&
-+ grep "index.*100755" patch &&
++ test_grep "^index.*100755$" patch &&
+
+ git switch -c branch HEAD^ &&
+ git apply --index patch 2>err &&
-+ ! grep "has type 100644, expected 100755" err &&
-+ git restore -S script.sh && git restore script.sh &&
++ test_grep ! "has type 100644, expected 100755" err &&
++ git reset --hard &&
+
+ git apply patch 2>err &&
-+ ! grep "has type 100644, expected 100755" err &&
++ test_grep ! "has type 100644, expected 100755" err &&
+
+ git apply --cached patch 2>err &&
-+ ! grep "has type 100644, expected 100755" err
++ test_grep ! "has type 100644, expected 100755" err
+'
+
test_done
apply.c | 8 ++++++--
t/t4129-apply-samemode.sh | 27 +++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/apply.c b/apply.c
index 3d69fec836d..58f26c40413 100644
--- a/apply.c
+++ b/apply.c
@@ -3778,8 +3778,12 @@ static int check_preimage(struct apply_state *state,
return error_errno("%s", old_name);
}
- if (!state->cached && !previous)
- st_mode = ce_mode_from_stat(*ce, st->st_mode);
+ if (!state->cached && !previous) {
+ if (!trust_executable_bit)
+ st_mode = *ce ? (*ce)->ce_mode : patch->old_mode;
+ else
+ st_mode = ce_mode_from_stat(*ce, st->st_mode);
+ }
if (patch->is_new < 0)
patch->is_new = 0;
diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh
index e7a7295f1b6..ff0c1602fd5 100755
--- a/t/t4129-apply-samemode.sh
+++ b/t/t4129-apply-samemode.sh
@@ -101,4 +101,31 @@ test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree
)
'
+test_expect_success 'git apply respects core.fileMode' '
+ test_config core.fileMode false &&
+ echo true >script.sh &&
+ git add --chmod=+x script.sh &&
+ git ls-files -s script.sh > ls-files-output &&
+ test_grep "^100755" ls-files-output &&
+ test_tick && git commit -m "Add script" &&
+ git ls-tree -r HEAD script.sh > ls-tree-output &&
+ test_grep "^100755" ls-tree-output &&
+
+ echo true >>script.sh &&
+ test_tick && git commit -m "Modify script" script.sh &&
+ git format-patch -1 --stdout >patch &&
+ test_grep "^index.*100755$" patch &&
+
+ git switch -c branch HEAD^ &&
+ git apply --index patch 2>err &&
+ test_grep ! "has type 100644, expected 100755" err &&
+ git reset --hard &&
+
+ git apply patch 2>err &&
+ test_grep ! "has type 100644, expected 100755" err &&
+
+ git apply --cached patch 2>err &&
+ test_grep ! "has type 100644, expected 100755" err
+'
+
test_done
base-commit: 1a87c842ece327d03d08096395969aca5e0a6996
--
gitgitgadget
