global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 01:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/t7500-pwd-windows-fix'

Browse Source 
Test fix.

* js/t7500-pwd-windows-fix:
  t7500: fix tests with absolute path following ":(optional)" on Windows
This commit is contained in:
Junio C Hamano
2025-10-24 13:48:04 -07:00
parent 411903ce4c 91e6a645e7
commit 385772e183
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
t/t7500-commit-template-squash-signoff.sh
View File

@@ -33,7 +33,7 @@ test_expect_success 'nonexistent template file should return error' '
( (
GIT_EDITOR="echo hello >" && GIT_EDITOR="echo hello >" &&
export GIT_EDITOR && export GIT_EDITOR &&
test_must_fail git commit --template "$PWD"/notexist test_must_fail git commit --template "$(pwd)"/notexist
) )
' '
@@ -43,12 +43,12 @@ test_expect_success 'nonexistent optional template file on command line' '
( (
GIT_EDITOR="echo hello >\"\$1\"" && GIT_EDITOR="echo hello >\"\$1\"" &&
export GIT_EDITOR && export GIT_EDITOR &&
git commit --template ":(optional)$PWD/notexist" git commit --template ":(optional)$(pwd)/notexist"
) )
' '
test_expect_success 'nonexistent template file in config should return error' ' test_expect_success 'nonexistent template file in config should return error' '
test_config commit.template "$PWD"/notexist && test_config commit.template "$(pwd)"/notexist &&
( (
GIT_EDITOR="echo hello >" && GIT_EDITOR="echo hello >" &&
export GIT_EDITOR && export GIT_EDITOR &&
@@ -57,7 +57,7 @@ test_expect_success 'nonexistent template file in config should return error' '
' '
test_expect_success 'nonexistent optional template file in config' ' test_expect_success 'nonexistent optional template file in config' '
test_config commit.template ":(optional)$PWD"/notexist && test_config commit.template ":(optional)$(pwd)"/notexist &&
GIT_EDITOR="echo hello >" git commit --allow-empty && GIT_EDITOR="echo hello >" git commit --allow-empty &&
git cat-file commit HEAD | sed -e "1,/^$/d" >actual && git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
echo hello >expect && echo hello >expect &&
@@ -65,7 +65,7 @@ test_expect_success 'nonexistent optional template file in config' '
' '
# From now on we'll use a template file that exists. # From now on we'll use a template file that exists.
TEMPLATE="$PWD"/template TEMPLATE="$(pwd)"/template
test_expect_success 'unedited template should not commit' ' test_expect_success 'unedited template should not commit' '
echo "template line" >"$TEMPLATE" && echo "template line" >"$TEMPLATE" &&
@@ -99,6 +99,15 @@ test_expect_success 'adding real content to a template should commit' '
commit_msg_is "template linecommit message" commit_msg_is "template linecommit message"
' '
test_expect_success 'existent template marked optional should commit' '
echo "existent template" >"$TEMPLATE" &&
(
test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
git commit --allow-empty --template ":(optional)$TEMPLATE"
) &&
commit_msg_is "existent templatecommit message"
'
test_expect_success '-t option should be short for --template' ' test_expect_success '-t option should be short for --template' '
echo "short template" > "$TEMPLATE" && echo "short template" > "$TEMPLATE" &&
echo "new content" >> foo && echo "new content" >> foo &&