Browse Source
A few commands learned to take the pathspec from the standard input or a named file, instead of taking it as the command line arguments. * am/pathspec-from-file: commit: support the --pathspec-from-file option doc: commit: synchronize <pathspec> description reset: support the `--pathspec-from-file` option doc: reset: synchronize <pathspec> description pathspec: add new function to parse file parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`maint
Junio C Hamano
5 years ago
9 changed files with 434 additions and 28 deletions
@ -0,0 +1,155 @@
@@ -0,0 +1,155 @@
|
||||
#!/bin/sh |
||||
|
||||
test_description='reset --pathspec-from-file' |
||||
|
||||
. ./test-lib.sh |
||||
|
||||
test_tick |
||||
|
||||
test_expect_success setup ' |
||||
echo A >fileA.t && |
||||
echo B >fileB.t && |
||||
echo C >fileC.t && |
||||
echo D >fileD.t && |
||||
git add . && |
||||
git commit --include . -m "Commit" && |
||||
git tag checkpoint |
||||
' |
||||
|
||||
restore_checkpoint () { |
||||
git reset --hard checkpoint |
||||
} |
||||
|
||||
verify_expect () { |
||||
git status --porcelain -- fileA.t fileB.t fileC.t fileD.t >actual && |
||||
test_cmp expect actual |
||||
} |
||||
|
||||
test_expect_success '--pathspec-from-file from stdin' ' |
||||
restore_checkpoint && |
||||
|
||||
git rm fileA.t && |
||||
echo fileA.t | git reset --pathspec-from-file=- && |
||||
|
||||
cat >expect <<-\EOF && |
||||
D fileA.t |
||||
EOF |
||||
verify_expect |
||||
' |
||||
|
||||
test_expect_success '--pathspec-from-file from file' ' |
||||
restore_checkpoint && |
||||
|
||||
git rm fileA.t && |
||||
echo fileA.t >list && |
||||
git reset --pathspec-from-file=list && |
||||
|
||||
cat >expect <<-\EOF && |
||||
D fileA.t |
||||
EOF |
||||
verify_expect |
||||
' |
||||
|
||||
test_expect_success 'NUL delimiters' ' |
||||
restore_checkpoint && |
||||
|
||||
git rm fileA.t fileB.t && |
||||
printf "fileA.t\0fileB.t\0" | git reset --pathspec-from-file=- --pathspec-file-nul && |
||||
|
||||
cat >expect <<-\EOF && |
||||
D fileA.t |
||||
D fileB.t |
||||
EOF |
||||
verify_expect |
||||
' |
||||
|
||||
test_expect_success 'LF delimiters' ' |
||||
restore_checkpoint && |
||||
|
||||
git rm fileA.t fileB.t && |
||||
printf "fileA.t\nfileB.t\n" | git reset --pathspec-from-file=- && |
||||
|
||||
cat >expect <<-\EOF && |
||||
D fileA.t |
||||
D fileB.t |
||||
EOF |
||||
verify_expect |
||||
' |
||||
|
||||
test_expect_success 'no trailing delimiter' ' |
||||
restore_checkpoint && |
||||
|
||||
git rm fileA.t fileB.t && |
||||
printf "fileA.t\nfileB.t" | git reset --pathspec-from-file=- && |
||||
|
||||
cat >expect <<-\EOF && |
||||
D fileA.t |
||||
D fileB.t |
||||
EOF |
||||
verify_expect |
||||
' |
||||
|
||||
test_expect_success 'CRLF delimiters' ' |
||||
restore_checkpoint && |
||||
|
||||
git rm fileA.t fileB.t && |
||||
printf "fileA.t\r\nfileB.t\r\n" | git reset --pathspec-from-file=- && |
||||
|
||||
cat >expect <<-\EOF && |
||||
D fileA.t |
||||
D fileB.t |
||||
EOF |
||||
verify_expect |
||||
' |
||||
|
||||
test_expect_success 'quotes' ' |
||||
restore_checkpoint && |
||||
|
||||
git rm fileA.t && |
||||
printf "\"file\\101.t\"" | git reset --pathspec-from-file=- && |
||||
|
||||
cat >expect <<-\EOF && |
||||
D fileA.t |
||||
EOF |
||||
verify_expect |
||||
' |
||||
|
||||
test_expect_success 'quotes not compatible with --pathspec-file-nul' ' |
||||
restore_checkpoint && |
||||
|
||||
git rm fileA.t && |
||||
printf "\"file\\101.t\"" >list && |
||||
# Note: "git reset" has not yet learned to fail on wrong pathspecs |
||||
git reset --pathspec-from-file=list --pathspec-file-nul && |
||||
|
||||
cat >expect <<-\EOF && |
||||
D fileA.t |
||||
EOF |
||||
test_must_fail verify_expect |
||||
' |
||||
|
||||
test_expect_success '--pathspec-from-file is not compatible with --soft or --hard' ' |
||||
restore_checkpoint && |
||||
|
||||
git rm fileA.t && |
||||
echo fileA.t >list && |
||||
test_must_fail git reset --soft --pathspec-from-file=list && |
||||
test_must_fail git reset --hard --pathspec-from-file=list |
||||
' |
||||
|
||||
test_expect_success 'only touches what was listed' ' |
||||
restore_checkpoint && |
||||
|
||||
git rm fileA.t fileB.t fileC.t fileD.t && |
||||
printf "fileB.t\nfileC.t\n" | git reset --pathspec-from-file=- && |
||||
|
||||
cat >expect <<-\EOF && |
||||
D fileA.t |
||||
D fileB.t |
||||
D fileC.t |
||||
D fileD.t |
||||
EOF |
||||
verify_expect |
||||
' |
||||
|
||||
test_done |
||||
@ -0,0 +1,130 @@
@@ -0,0 +1,130 @@
|
||||
#!/bin/sh |
||||
|
||||
test_description='commit --pathspec-from-file' |
||||
|
||||
. ./test-lib.sh |
||||
|
||||
test_tick |
||||
|
||||
test_expect_success setup ' |
||||
test_commit file0 && |
||||
git tag checkpoint && |
||||
|
||||
echo A >fileA.t && |
||||
echo B >fileB.t && |
||||
echo C >fileC.t && |
||||
echo D >fileD.t && |
||||
git add fileA.t fileB.t fileC.t fileD.t |
||||
' |
||||
|
||||
restore_checkpoint () { |
||||
git reset --soft checkpoint |
||||
} |
||||
|
||||
verify_expect () { |
||||
git diff-tree --no-commit-id --name-status -r HEAD >actual && |
||||
test_cmp expect actual |
||||
} |
||||
|
||||
test_expect_success '--pathspec-from-file from stdin' ' |
||||
restore_checkpoint && |
||||
|
||||
echo fileA.t | git commit --pathspec-from-file=- -m "Commit" && |
||||
|
||||
cat >expect <<-\EOF && |
||||
A fileA.t |
||||
EOF |
||||
verify_expect |
||||
' |
||||
|
||||
test_expect_success '--pathspec-from-file from file' ' |
||||
restore_checkpoint && |
||||
|
||||
echo fileA.t >list && |
||||
git commit --pathspec-from-file=list -m "Commit" && |
||||
|
||||
cat >expect <<-\EOF && |
||||
A fileA.t |
||||
EOF |
||||
verify_expect |
||||
' |
||||
|
||||
test_expect_success 'NUL delimiters' ' |
||||
restore_checkpoint && |
||||
|
||||
printf "fileA.t\0fileB.t\0" | git commit --pathspec-from-file=- --pathspec-file-nul -m "Commit" && |
||||
|
||||
cat >expect <<-\EOF && |
||||
A fileA.t |
||||
A fileB.t |
||||
EOF |
||||
verify_expect |
||||
' |
||||
|
||||
test_expect_success 'LF delimiters' ' |
||||
restore_checkpoint && |
||||
|
||||
printf "fileA.t\nfileB.t\n" | git commit --pathspec-from-file=- -m "Commit" && |
||||
|
||||
cat >expect <<-\EOF && |
||||
A fileA.t |
||||
A fileB.t |
||||
EOF |
||||
verify_expect |
||||
' |
||||
|
||||
test_expect_success 'no trailing delimiter' ' |
||||
restore_checkpoint && |
||||
|
||||
printf "fileA.t\nfileB.t" | git commit --pathspec-from-file=- -m "Commit" && |
||||
|
||||
cat >expect <<-\EOF && |
||||
A fileA.t |
||||
A fileB.t |
||||
EOF |
||||
verify_expect |
||||
' |
||||
|
||||
test_expect_success 'CRLF delimiters' ' |
||||
restore_checkpoint && |
||||
|
||||
printf "fileA.t\r\nfileB.t\r\n" | git commit --pathspec-from-file=- -m "Commit" && |
||||
|
||||
cat >expect <<-\EOF && |
||||
A fileA.t |
||||
A fileB.t |
||||
EOF |
||||
verify_expect |
||||
' |
||||
|
||||
test_expect_success 'quotes' ' |
||||
restore_checkpoint && |
||||
|
||||
printf "\"file\\101.t\"" | git commit --pathspec-from-file=- -m "Commit" && |
||||
|
||||
cat >expect <<-\EOF && |
||||
A fileA.t |
||||
EOF |
||||
verify_expect expect |
||||
' |
||||
|
||||
test_expect_success 'quotes not compatible with --pathspec-file-nul' ' |
||||
restore_checkpoint && |
||||
|
||||
printf "\"file\\101.t\"" >list && |
||||
test_must_fail git commit --pathspec-from-file=list --pathspec-file-nul -m "Commit" |
||||
' |
||||
|
||||
test_expect_success 'only touches what was listed' ' |
||||
restore_checkpoint && |
||||
|
||||
printf "fileB.t\nfileC.t\n" | git commit --pathspec-from-file=- -m "Commit" && |
||||
|
||||
cat >expect <<-\EOF && |
||||
A fileB.t |
||||
A fileC.t |
||||
EOF |
||||
verify_expect |
||||
' |
||||
|
||||
test_done |
||||
Loading…
Reference in new issue