mirror of
https://github.com/git/git.git
synced 2024-11-23 18:05:29 +08:00
t/*: fix ordering of expected/observed arguments
Fix various places where the ordering was obviously wrong, meaning it was easy to find with grep. Signed-off-by: Matthew DeVore <matvore@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthew DeVore
Junio C Hamano
parent
bdbc17e86a
commit
dcbaa0b361
@ -1018,7 +1018,7 @@ test_expect_success SHA1 'validate git diff-files output for a know cache/work t
|
||||
:120000 120000 6649a1ebe9e9f1c553b66f5a6e74136a07ccc57c 0000000000000000000000000000000000000000 M path3/subp3/file3sym
|
||||
EOF
|
||||
git diff-files >current &&
|
||||
test_cmp current expected
|
||||
test_cmp expected current
|
||||
'
|
||||
|
||||
test_expect_success 'git update-index --refresh should succeed' '
|
||||
|
||||
@ -166,10 +166,10 @@ test_expect_success expanded_in_repo '
|
||||
rm -f expanded-keywords expanded-keywords-crlf &&
|
||||
|
||||
git checkout -- expanded-keywords &&
|
||||
test_cmp expanded-keywords expected-output &&
|
||||
test_cmp expected-output expanded-keywords &&
|
||||
|
||||
git checkout -- expanded-keywords-crlf &&
|
||||
test_cmp expanded-keywords-crlf expected-output-crlf
|
||||
test_cmp expected-output-crlf expanded-keywords-crlf
|
||||
'
|
||||
|
||||
# The use of %f in a filter definition is expanded to the path to
|
||||
|
||||
@ -1001,7 +1001,7 @@ EOF
|
||||
|
||||
test_expect_success 'value continued on next line' '
|
||||
git config --list > result &&
|
||||
test_cmp result expect
|
||||
test_cmp expect result
|
||||
'
|
||||
|
||||
cat > .git/config <<\EOF
|
||||
@ -1882,7 +1882,7 @@ test_expect_success '--replace-all does not invent newlines' '
|
||||
Qkey = b
|
||||
EOF
|
||||
git config --replace-all abc.key b &&
|
||||
test_cmp .git/config expect
|
||||
test_cmp expect .git/config
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
@ -14,7 +14,7 @@ setup() {
|
||||
check() {
|
||||
echo "$2" >expected
|
||||
git config --get "$1" >actual 2>&1
|
||||
test_cmp actual expected
|
||||
test_cmp expected actual
|
||||
}
|
||||
|
||||
# 'check section.key regex value' verifies that the entry for
|
||||
@ -22,7 +22,7 @@ check() {
|
||||
check_regex() {
|
||||
echo "$3" >expected
|
||||
git config --get "$1" "$2" >actual 2>&1
|
||||
test_cmp actual expected
|
||||
test_cmp expected actual
|
||||
}
|
||||
|
||||
test_expect_success 'modify same key' '
|
||||
|
||||
@ -73,7 +73,7 @@ test_expect_success 'update-index --update from subdir' '
|
||||
100644 $(git hash-object dir1/file3) 0 dir1/file3
|
||||
100644 $file2 0 file2
|
||||
EOF
|
||||
test_cmp current expected
|
||||
test_cmp expected current
|
||||
'
|
||||
|
||||
test_expect_success 'update-index --update with pathspec' '
|
||||
|
||||
@ -1221,7 +1221,7 @@ test_expect_success 'use --edit-description' '
|
||||
EOF
|
||||
EDITOR=./editor git branch --edit-description &&
|
||||
echo "New contents" >expect &&
|
||||
test_cmp EDITOR_OUTPUT expect
|
||||
test_cmp expect EDITOR_OUTPUT
|
||||
'
|
||||
|
||||
test_expect_success 'detect typo in branch name when using --edit-description' '
|
||||
|
||||
@ -44,7 +44,7 @@ test_expect_success 'merge z into y fails and sets NOTES_MERGE_REF' '
|
||||
git config core.notesRef refs/notes/y &&
|
||||
test_must_fail git notes merge z &&
|
||||
echo "ref: refs/notes/y" >expect &&
|
||||
test_cmp .git/NOTES_MERGE_REF expect
|
||||
test_cmp expect .git/NOTES_MERGE_REF
|
||||
'
|
||||
|
||||
test_expect_success 'merge z into y while mid-merge in another workdir fails' '
|
||||
@ -66,7 +66,7 @@ test_expect_success 'merge z into x while mid-merge on y succeeds' '
|
||||
grep -v "A notes merge into refs/notes/x is already in-progress in" out
|
||||
) &&
|
||||
echo "ref: refs/notes/x" >expect &&
|
||||
test_cmp .git/worktrees/worktree2/NOTES_MERGE_REF expect
|
||||
test_cmp expect .git/worktrees/worktree2/NOTES_MERGE_REF
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
@ -183,13 +183,13 @@ test_expect_success 'cherry-picked commits and fork-point work together' '
|
||||
test_commit final_B B "Final B" &&
|
||||
git rebase &&
|
||||
echo Amended >expect &&
|
||||
test_cmp A expect &&
|
||||
test_cmp expect A &&
|
||||
echo "Final B" >expect &&
|
||||
test_cmp B expect &&
|
||||
test_cmp expect B &&
|
||||
echo C >expect &&
|
||||
test_cmp C expect &&
|
||||
test_cmp expect C &&
|
||||
echo D >expect &&
|
||||
test_cmp D expect
|
||||
test_cmp expect D
|
||||
'
|
||||
|
||||
test_expect_success 'rebase -q is quiet' '
|
||||
|
||||
@ -55,7 +55,7 @@ test_expect_success 'blank line at end of file; extend at end of file' '
|
||||
git add file && git commit -m second &&
|
||||
git rebase --whitespace=fix HEAD^^ &&
|
||||
git diff --exit-code HEAD^:file expect-first &&
|
||||
test_cmp file expect-second
|
||||
test_cmp expect-second file
|
||||
'
|
||||
|
||||
# prepare third revision of "file"
|
||||
@ -82,7 +82,7 @@ test_expect_success 'two blanks line at end of file; extend at end of file' '
|
||||
cp third file && git add file && git commit -m third &&
|
||||
git rebase --whitespace=fix HEAD^^ &&
|
||||
git diff --exit-code HEAD^:file expect-second &&
|
||||
test_cmp file expect-third
|
||||
test_cmp expect-third file
|
||||
'
|
||||
|
||||
test_expect_success 'same, but do not remove trailing spaces' '
|
||||
@ -120,7 +120,7 @@ test_expect_success 'at beginning of file' '
|
||||
done >> file &&
|
||||
git commit -m more file &&
|
||||
git rebase --whitespace=fix HEAD^^ &&
|
||||
test_cmp file expect-beginning
|
||||
test_cmp expect-beginning file
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
@ -110,10 +110,10 @@ test_expect_success 'add -e' '
|
||||
cp second-part file &&
|
||||
git add -e &&
|
||||
test_cmp second-part file &&
|
||||
test_cmp orig-patch expected-patch &&
|
||||
test_cmp expected-patch orig-patch &&
|
||||
git diff --cached >actual &&
|
||||
grep -v index actual >out &&
|
||||
test_cmp out expected
|
||||
test_cmp expected out
|
||||
|
||||
'
|
||||
|
||||
|
||||
@ -36,7 +36,7 @@ EOF
|
||||
test_expect_success 'parents of stash' '
|
||||
test $(git rev-parse stash^) = $(git rev-parse HEAD) &&
|
||||
git diff stash^2..stash > output &&
|
||||
test_cmp output expect
|
||||
test_cmp expect output
|
||||
'
|
||||
|
||||
test_expect_success 'applying bogus stash does nothing' '
|
||||
@ -210,9 +210,9 @@ test_expect_success 'stash branch' '
|
||||
test refs/heads/stashbranch = $(git symbolic-ref HEAD) &&
|
||||
test $(git rev-parse HEAD) = $(git rev-parse master^) &&
|
||||
git diff --cached > output &&
|
||||
test_cmp output expect &&
|
||||
test_cmp expect output &&
|
||||
git diff > output &&
|
||||
test_cmp output expect1 &&
|
||||
test_cmp expect1 output &&
|
||||
git add file &&
|
||||
git commit -m alternate\ second &&
|
||||
git diff master..stashbranch > output &&
|
||||
@ -710,7 +710,7 @@ test_expect_success 'stash where working directory contains "HEAD" file' '
|
||||
git diff-index --cached --quiet HEAD &&
|
||||
test "$(git rev-parse stash^)" = "$(git rev-parse HEAD)" &&
|
||||
git diff stash^..stash > output &&
|
||||
test_cmp output expect
|
||||
test_cmp expect output
|
||||
'
|
||||
|
||||
test_expect_success 'store called with invalid commit' '
|
||||
|
||||
@ -142,7 +142,7 @@ test_expect_success 'stash save --include-untracked removed files' '
|
||||
rm -f file &&
|
||||
git stash save --include-untracked &&
|
||||
echo 1 > expect &&
|
||||
test_cmp file expect
|
||||
test_cmp expect file
|
||||
'
|
||||
|
||||
rm -f expect
|
||||
|
||||
@ -37,7 +37,7 @@ test_expect_success 'hunk header truncation with an overly long line' '
|
||||
echo " A $N$N$N$N$N$N$N$N$N2" &&
|
||||
echo " L $N$N$N$N$N$N$N$N$N1"
|
||||
) >expected &&
|
||||
test_cmp actual expected
|
||||
test_cmp expected actual
|
||||
|
||||
'
|
||||
|
||||
|
||||
@ -72,7 +72,7 @@ test_expect_success 'apply with --reject should fail but update the file' '
|
||||
rm -f file1.rej file2.rej &&
|
||||
|
||||
test_must_fail git apply --reject patch.1 &&
|
||||
test_cmp file1 expected &&
|
||||
test_cmp expected file1 &&
|
||||
|
||||
cat file1.rej &&
|
||||
test_path_is_missing file2.rej
|
||||
@ -85,7 +85,7 @@ test_expect_success 'apply with --reject should fail but update the file' '
|
||||
|
||||
test_must_fail git apply --reject patch.2 >rejects &&
|
||||
test_path_is_missing file1 &&
|
||||
test_cmp file2 expected &&
|
||||
test_cmp expected file2 &&
|
||||
|
||||
cat file2.rej &&
|
||||
test_path_is_missing file1.rej
|
||||
@ -99,7 +99,7 @@ test_expect_success 'the same test with --verbose' '
|
||||
|
||||
test_must_fail git apply --reject --verbose patch.2 >rejects &&
|
||||
test_path_is_missing file1 &&
|
||||
test_cmp file2 expected &&
|
||||
test_cmp expected file2 &&
|
||||
|
||||
cat file2.rej &&
|
||||
test_path_is_missing file1.rej
|
||||
|
||||
@ -313,9 +313,9 @@ test_expect_success 'applying beyond EOF requires one non-blank context line' '
|
||||
{ echo a; echo; } >one &&
|
||||
cp one expect &&
|
||||
test_must_fail git apply --whitespace=fix patch &&
|
||||
test_cmp one expect &&
|
||||
test_cmp expect one &&
|
||||
test_must_fail git apply --ignore-space-change --whitespace=fix patch &&
|
||||
test_cmp one expect
|
||||
test_cmp expect one
|
||||
'
|
||||
|
||||
test_expect_success 'tons of blanks at EOF should not apply' '
|
||||
@ -342,10 +342,10 @@ test_expect_success 'missing blank line at end with --whitespace=fix' '
|
||||
cp one saved-one &&
|
||||
test_must_fail git apply patch &&
|
||||
git apply --whitespace=fix patch &&
|
||||
test_cmp one expect &&
|
||||
test_cmp expect one &&
|
||||
mv saved-one one &&
|
||||
git apply --ignore-space-change --whitespace=fix patch &&
|
||||
test_cmp one expect
|
||||
test_cmp expect one
|
||||
'
|
||||
|
||||
test_expect_success 'two missing blank lines at end with --whitespace=fix' '
|
||||
@ -360,11 +360,11 @@ test_expect_success 'two missing blank lines at end with --whitespace=fix' '
|
||||
cp no-blank-lines one &&
|
||||
test_must_fail git apply patch &&
|
||||
git apply --whitespace=fix patch &&
|
||||
test_cmp one expect &&
|
||||
test_cmp expect one &&
|
||||
mv no-blank-lines one &&
|
||||
test_must_fail git apply patch &&
|
||||
git apply --ignore-space-change --whitespace=fix patch &&
|
||||
test_cmp one expect
|
||||
test_cmp expect one
|
||||
'
|
||||
|
||||
test_expect_success 'missing blank line at end, insert before end, --whitespace=fix' '
|
||||
@ -376,7 +376,7 @@ test_expect_success 'missing blank line at end, insert before end, --whitespace=
|
||||
echo a >one &&
|
||||
test_must_fail git apply patch &&
|
||||
git apply --whitespace=fix patch &&
|
||||
test_cmp one expect
|
||||
test_cmp expect one
|
||||
'
|
||||
|
||||
test_expect_success 'shrink file with tons of missing blanks at end of file' '
|
||||
@ -392,10 +392,10 @@ test_expect_success 'shrink file with tons of missing blanks at end of file' '
|
||||
cp no-blank-lines one &&
|
||||
test_must_fail git apply patch &&
|
||||
git apply --whitespace=fix patch &&
|
||||
test_cmp one expect &&
|
||||
test_cmp expect one &&
|
||||
mv no-blank-lines one &&
|
||||
git apply --ignore-space-change --whitespace=fix patch &&
|
||||
test_cmp one expect
|
||||
test_cmp expect one
|
||||
'
|
||||
|
||||
test_expect_success 'missing blanks at EOF must only match blank lines' '
|
||||
@ -427,7 +427,7 @@ test_expect_success 'missing blank line should match context line with spaces' '
|
||||
git add one &&
|
||||
|
||||
git apply --whitespace=fix patch &&
|
||||
test_cmp one expect
|
||||
test_cmp expect one
|
||||
'
|
||||
|
||||
sed -e's/Z//' >one <<EOF
|
||||
@ -447,7 +447,7 @@ test_expect_success 'same, but with the --ignore-space-option' '
|
||||
|
||||
git checkout-index -f one &&
|
||||
git apply --ignore-space-change --whitespace=fix patch &&
|
||||
test_cmp one expect
|
||||
test_cmp expect one
|
||||
'
|
||||
|
||||
test_expect_success 'same, but with CR-LF line endings && cr-at-eol set' '
|
||||
@ -464,7 +464,7 @@ test_expect_success 'same, but with CR-LF line endings && cr-at-eol set' '
|
||||
mv save-one one &&
|
||||
|
||||
git apply --ignore-space-change --whitespace=fix patch &&
|
||||
test_cmp one expect
|
||||
test_cmp expect one
|
||||
'
|
||||
|
||||
test_expect_success 'CR-LF line endings && add line && text=auto' '
|
||||
@ -478,7 +478,7 @@ test_expect_success 'CR-LF line endings && add line && text=auto' '
|
||||
mv save-one one &&
|
||||
echo "one text=auto" >.gitattributes &&
|
||||
git apply patch &&
|
||||
test_cmp one expect
|
||||
test_cmp expect one
|
||||
'
|
||||
|
||||
test_expect_success 'CR-LF line endings && change line && text=auto' '
|
||||
@ -491,7 +491,7 @@ test_expect_success 'CR-LF line endings && change line && text=auto' '
|
||||
mv save-one one &&
|
||||
echo "one text=auto" >.gitattributes &&
|
||||
git apply patch &&
|
||||
test_cmp one expect
|
||||
test_cmp expect one
|
||||
'
|
||||
|
||||
test_expect_success 'LF in repo, CRLF in worktree && change line && text=auto' '
|
||||
@ -503,7 +503,7 @@ test_expect_success 'LF in repo, CRLF in worktree && change line && text=auto' '
|
||||
echo "one text=auto" >.gitattributes &&
|
||||
git -c core.eol=CRLF apply patch &&
|
||||
printf "b\r\n" >expect &&
|
||||
test_cmp one expect
|
||||
test_cmp expect one
|
||||
'
|
||||
|
||||
test_expect_success 'whitespace=fix to expand' '
|
||||
|
||||
@ -114,7 +114,7 @@ for t in 1 2 3 4
|
||||
do
|
||||
test_expect_success 'apply with ws expansion (t=$t)' '
|
||||
git apply patch$t.patch &&
|
||||
test_cmp test-$t expect-$t
|
||||
test_cmp expect-$t test-$t
|
||||
'
|
||||
done
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ test_expect_success 'verify blob count in normal packfile' '
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify blob:none packfile has no blobs' '
|
||||
@ -63,7 +63,7 @@ test_expect_success 'verify normal and blob:none packfiles have same commits/tre
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
# Test blob:limit=<n>[kmg] filter.
|
||||
@ -96,7 +96,7 @@ test_expect_success 'verify blob count in normal packfile' '
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify blob:limit=500 omits all blobs' '
|
||||
@ -144,7 +144,7 @@ test_expect_success 'verify blob:limit=1001' '
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify blob:limit=10001' '
|
||||
@ -162,7 +162,7 @@ test_expect_success 'verify blob:limit=10001' '
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify blob:limit=1k' '
|
||||
@ -180,7 +180,7 @@ test_expect_success 'verify blob:limit=1k' '
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify explicitly specifying oversized blob in input' '
|
||||
@ -199,7 +199,7 @@ test_expect_success 'verify explicitly specifying oversized blob in input' '
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify blob:limit=1m' '
|
||||
@ -217,7 +217,7 @@ test_expect_success 'verify blob:limit=1m' '
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify normal and blob:limit packfiles have same commits/trees' '
|
||||
@ -231,7 +231,7 @@ test_expect_success 'verify normal and blob:limit packfiles have same commits/tr
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
# Test sparse:path=<path> filter.
|
||||
@ -269,7 +269,7 @@ test_expect_success 'verify blob count in normal packfile' '
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify sparse:path=pattern1' '
|
||||
@ -287,7 +287,7 @@ test_expect_success 'verify sparse:path=pattern1' '
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify normal and sparse:path=pattern1 packfiles have same commits/trees' '
|
||||
@ -301,7 +301,7 @@ test_expect_success 'verify normal and sparse:path=pattern1 packfiles have same
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify sparse:path=pattern2' '
|
||||
@ -319,7 +319,7 @@ test_expect_success 'verify sparse:path=pattern2' '
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify normal and sparse:path=pattern2 packfiles have same commits/trees' '
|
||||
@ -333,7 +333,7 @@ test_expect_success 'verify normal and sparse:path=pattern2 packfiles have same
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
# Test sparse:oid=<oid-ish> filter.
|
||||
@ -370,7 +370,7 @@ test_expect_success 'verify blob count in normal packfile' '
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify sparse:oid=OID' '
|
||||
@ -389,7 +389,7 @@ test_expect_success 'verify sparse:oid=OID' '
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify sparse:oid=oid-ish' '
|
||||
@ -407,7 +407,7 @@ test_expect_success 'verify sparse:oid=oid-ish' '
|
||||
awk -f print_1.awk |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
# Delete some loose objects and use pack-objects, but WITHOUT any filtering.
|
||||
|
||||
@ -35,7 +35,7 @@ test_expect_success 'create commits and repack' '
|
||||
graph_git_two_modes() {
|
||||
git -c core.commitGraph=true $1 >output
|
||||
git -c core.commitGraph=false $1 >expect
|
||||
test_cmp output expect
|
||||
test_cmp expect output
|
||||
}
|
||||
|
||||
graph_git_behavior() {
|
||||
|
||||
@ -16,7 +16,7 @@ test_expect_success 'test capability advertisement' '
|
||||
|
||||
git serve --advertise-capabilities >out &&
|
||||
test-pkt-line unpack <out >actual &&
|
||||
test_cmp actual expect
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'stateless-rpc flag does not list capabilities' '
|
||||
@ -89,7 +89,7 @@ test_expect_success 'basics of ls-refs' '
|
||||
|
||||
git serve --stateless-rpc <in >out &&
|
||||
test-pkt-line unpack <out >actual &&
|
||||
test_cmp actual expect
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'basic ref-prefixes' '
|
||||
@ -109,7 +109,7 @@ test_expect_success 'basic ref-prefixes' '
|
||||
|
||||
git serve --stateless-rpc <in >out &&
|
||||
test-pkt-line unpack <out >actual &&
|
||||
test_cmp actual expect
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'refs/heads prefix' '
|
||||
@ -129,7 +129,7 @@ test_expect_success 'refs/heads prefix' '
|
||||
|
||||
git serve --stateless-rpc <in >out &&
|
||||
test-pkt-line unpack <out >actual &&
|
||||
test_cmp actual expect
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'peel parameter' '
|
||||
@ -150,7 +150,7 @@ test_expect_success 'peel parameter' '
|
||||
|
||||
git serve --stateless-rpc <in >out &&
|
||||
test-pkt-line unpack <out >actual &&
|
||||
test_cmp actual expect
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'symrefs parameter' '
|
||||
@ -171,7 +171,7 @@ test_expect_success 'symrefs parameter' '
|
||||
|
||||
git serve --stateless-rpc <in >out &&
|
||||
test-pkt-line unpack <out >actual &&
|
||||
test_cmp actual expect
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'sending server-options' '
|
||||
@ -191,7 +191,7 @@ test_expect_success 'sending server-options' '
|
||||
|
||||
git serve --stateless-rpc <in >out &&
|
||||
test-pkt-line unpack <out >actual &&
|
||||
test_cmp actual expect
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'unexpected lines are not allowed in fetch request' '
|
||||
|
||||
@ -29,7 +29,7 @@ test_expect_success 'list refs with git:// using protocol v2' '
|
||||
grep "git< version 2" log &&
|
||||
|
||||
git ls-remote --symref "$GIT_DAEMON_URL/parent" >expect &&
|
||||
test_cmp actual expect
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'ref advertisment is filtered with ls-remote using protocol v2' '
|
||||
@ -42,7 +42,7 @@ test_expect_success 'ref advertisment is filtered with ls-remote using protocol
|
||||
$(git -C "$daemon_parent" rev-parse refs/heads/master)$(printf "\t")refs/heads/master
|
||||
EOF
|
||||
|
||||
test_cmp actual expect
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'clone with git:// using protocol v2' '
|
||||
@ -138,7 +138,7 @@ test_expect_success 'list refs with file:// using protocol v2' '
|
||||
grep "git< version 2" log &&
|
||||
|
||||
git ls-remote --symref "file://$(pwd)/file_parent" >expect &&
|
||||
test_cmp actual expect
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'ref advertisment is filtered with ls-remote using protocol v2' '
|
||||
@ -151,7 +151,7 @@ test_expect_success 'ref advertisment is filtered with ls-remote using protocol
|
||||
$(git -C file_parent rev-parse refs/heads/master)$(printf "\t")refs/heads/master
|
||||
EOF
|
||||
|
||||
test_cmp actual expect
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'server-options are sent when using ls-remote' '
|
||||
@ -164,7 +164,7 @@ test_expect_success 'server-options are sent when using ls-remote' '
|
||||
$(git -C file_parent rev-parse refs/heads/master)$(printf "\t")refs/heads/master
|
||||
EOF
|
||||
|
||||
test_cmp actual expect &&
|
||||
test_cmp expect actual &&
|
||||
grep "server-option=hello" log &&
|
||||
grep "server-option=world" log
|
||||
'
|
||||
|
||||
@ -99,7 +99,7 @@ EOF
|
||||
printf "propter nomen suum." >> expect.txt
|
||||
|
||||
test_expect_success "merge does not add LF away of change" \
|
||||
"test_cmp test3.txt expect.txt"
|
||||
"test_cmp expect.txt test3.txt"
|
||||
|
||||
cp test.txt backup.txt
|
||||
test_expect_success "merge with conflicts" \
|
||||
@ -122,7 +122,7 @@ non timebo mala, quoniam tu mecum es:
|
||||
virga tua et baculus tuus ipsa me consolata sunt.
|
||||
EOF
|
||||
|
||||
test_expect_success "expected conflict markers" "test_cmp test.txt expect.txt"
|
||||
test_expect_success "expected conflict markers" "test_cmp expect.txt test.txt"
|
||||
|
||||
cp backup.txt test.txt
|
||||
|
||||
@ -138,7 +138,7 @@ non timebo mala, quoniam tu mecum es:
|
||||
virga tua et baculus tuus ipsa me consolata sunt.
|
||||
EOF
|
||||
test_expect_success "merge conflicting with --ours" \
|
||||
"git merge-file --ours test.txt orig.txt new3.txt && test_cmp test.txt expect.txt"
|
||||
"git merge-file --ours test.txt orig.txt new3.txt && test_cmp expect.txt test.txt"
|
||||
cp backup.txt test.txt
|
||||
|
||||
cat > expect.txt << EOF
|
||||
@ -154,7 +154,7 @@ non timebo mala, quoniam tu mecum es:
|
||||
virga tua et baculus tuus ipsa me consolata sunt.
|
||||
EOF
|
||||
test_expect_success "merge conflicting with --theirs" \
|
||||
"git merge-file --theirs test.txt orig.txt new3.txt && test_cmp test.txt expect.txt"
|
||||
"git merge-file --theirs test.txt orig.txt new3.txt && test_cmp expect.txt test.txt"
|
||||
cp backup.txt test.txt
|
||||
|
||||
cat > expect.txt << EOF
|
||||
@ -171,7 +171,7 @@ non timebo mala, quoniam tu mecum es:
|
||||
virga tua et baculus tuus ipsa me consolata sunt.
|
||||
EOF
|
||||
test_expect_success "merge conflicting with --union" \
|
||||
"git merge-file --union test.txt orig.txt new3.txt && test_cmp test.txt expect.txt"
|
||||
"git merge-file --union test.txt orig.txt new3.txt && test_cmp expect.txt test.txt"
|
||||
cp backup.txt test.txt
|
||||
|
||||
test_expect_success "merge with conflicts, using -L" \
|
||||
@ -195,7 +195,7 @@ virga tua et baculus tuus ipsa me consolata sunt.
|
||||
EOF
|
||||
|
||||
test_expect_success "expected conflict markers, with -L" \
|
||||
"test_cmp test.txt expect.txt"
|
||||
"test_cmp expect.txt test.txt"
|
||||
|
||||
sed "s/ tu / TU /" < new1.txt > new5.txt
|
||||
test_expect_success "conflict in removed tail" \
|
||||
|
||||
@ -45,7 +45,7 @@ test_expect_success resolve '
|
||||
false
|
||||
else
|
||||
git ls-files -s >current
|
||||
test_cmp current expect
|
||||
test_cmp expect current
|
||||
fi
|
||||
'
|
||||
|
||||
@ -60,7 +60,7 @@ test_expect_success recursive '
|
||||
false
|
||||
else
|
||||
git ls-files -s >current
|
||||
test_cmp current expect
|
||||
test_cmp expect current
|
||||
fi
|
||||
'
|
||||
|
||||
|
||||
@ -61,7 +61,7 @@ do_both_modes () {
|
||||
git checkout -f a2 &&
|
||||
test_must_fail git merge -s $strategy b2 &&
|
||||
git ls-files -u >actual &&
|
||||
test_cmp actual expect &&
|
||||
test_cmp expect actual &&
|
||||
git ls-files -s file2 | grep ^100755
|
||||
'
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@ test_expect_success 'verify blob:none omits all 5 blobs' '
|
||||
sed "s/~//" |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify emitted+omitted == all' '
|
||||
@ -42,7 +42,7 @@ test_expect_success 'verify emitted+omitted == all' '
|
||||
sed "s/~//" |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
|
||||
@ -71,7 +71,7 @@ test_expect_success 'verify blob:limit=500 omits all blobs' '
|
||||
sed "s/~//" |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify emitted+omitted == all' '
|
||||
@ -84,7 +84,7 @@ test_expect_success 'verify emitted+omitted == all' '
|
||||
sed "s/~//" |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify blob:limit=1000' '
|
||||
@ -97,7 +97,7 @@ test_expect_success 'verify blob:limit=1000' '
|
||||
sed "s/~//" |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify blob:limit=1001' '
|
||||
@ -110,7 +110,7 @@ test_expect_success 'verify blob:limit=1001' '
|
||||
sed "s/~//" |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify blob:limit=1k' '
|
||||
@ -123,7 +123,7 @@ test_expect_success 'verify blob:limit=1k' '
|
||||
sed "s/~//" |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify blob:limit=1m' '
|
||||
@ -165,7 +165,7 @@ test_expect_success 'verify sparse:path=pattern1 omits top-level files' '
|
||||
sed "s/~//" |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify sparse:path=pattern2 omits both sparse2 files' '
|
||||
@ -178,7 +178,7 @@ test_expect_success 'verify sparse:path=pattern2 omits both sparse2 files' '
|
||||
sed "s/~//" |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
# Test sparse:oid=<oid-ish> filter.
|
||||
@ -203,7 +203,7 @@ test_expect_success 'verify sparse:oid=OID omits top-level files' '
|
||||
sed "s/~//" |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'verify sparse:oid=oid-ish omits top-level files' '
|
||||
@ -216,7 +216,7 @@ test_expect_success 'verify sparse:oid=oid-ish omits top-level files' '
|
||||
sed "s/~//" |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
# Delete some loose objects and use rev-list, but WITHOUT any filtering.
|
||||
@ -237,7 +237,7 @@ test_expect_success 'rev-list W/ --missing=print' '
|
||||
sed "s/?//" |
|
||||
sort >observed &&
|
||||
|
||||
test_cmp observed expected
|
||||
test_cmp expected observed
|
||||
'
|
||||
|
||||
test_expect_success 'rev-list W/O --missing fails' '
|
||||
|
||||
@ -160,7 +160,7 @@ test_expect_success 'checkout -m with merge conflict' '
|
||||
git diff master:one :3:uno |
|
||||
sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
|
||||
fill d2 aT d7 aS >expect &&
|
||||
test_cmp current expect &&
|
||||
test_cmp expect current &&
|
||||
git diff --cached two >current &&
|
||||
test_must_be_empty current
|
||||
'
|
||||
@ -174,7 +174,7 @@ test_expect_success 'format of merge conflict from checkout -m' '
|
||||
|
||||
git ls-files >current &&
|
||||
fill same two two two >expect &&
|
||||
test_cmp current expect &&
|
||||
test_cmp expect current &&
|
||||
|
||||
cat <<-EOF >expect &&
|
||||
<<<<<<< simple
|
||||
|
||||
@ -789,7 +789,7 @@ test_expect_success 'submodule add places git-dir in superprojects git-dir' '
|
||||
(cd .git/modules/deeper/submodule &&
|
||||
git log > ../../../../actual
|
||||
) &&
|
||||
test_cmp actual expected
|
||||
test_cmp expected actual
|
||||
)
|
||||
'
|
||||
|
||||
@ -807,7 +807,7 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir' '
|
||||
(cd .git/modules/deeper/submodule &&
|
||||
git log > ../../../../actual
|
||||
) &&
|
||||
test_cmp actual expected
|
||||
test_cmp expected actual
|
||||
)
|
||||
'
|
||||
|
||||
@ -827,7 +827,7 @@ test_expect_success 'submodule add places git-dir in superprojects git-dir recur
|
||||
git add deeper/submodule &&
|
||||
git commit -m "update submodule" &&
|
||||
git push origin : &&
|
||||
test_cmp actual expected
|
||||
test_cmp expected actual
|
||||
)
|
||||
'
|
||||
|
||||
@ -874,7 +874,7 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re
|
||||
(cd .git/modules/submodule/modules/subsubmodule &&
|
||||
git log > ../../../../../actual
|
||||
) &&
|
||||
test_cmp actual expected
|
||||
test_cmp expected actual
|
||||
)
|
||||
'
|
||||
|
||||
|
||||
@ -557,7 +557,7 @@ test_expect_success SYMLINKS 'difftool --dir-diff --symlink without unstaged cha
|
||||
EOF
|
||||
git difftool --dir-diff --symlink \
|
||||
--extcmd "./.git/CHECK_SYMLINKS" branch HEAD &&
|
||||
test_cmp actual expect
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
write_script modify-right-file <<\EOF
|
||||
|
||||
@ -221,7 +221,7 @@ tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
|
||||
tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4
|
||||
EOF
|
||||
|
||||
test_expect_success POSIXPERM,SYMLINKS "$name" "test_cmp a expected"
|
||||
test_expect_success POSIXPERM,SYMLINKS "$name" "test_cmp expected a"
|
||||
|
||||
test_expect_success 'exit if remote refs are ambigious' '
|
||||
git config --add svn-remote.svn.fetch \
|
||||
|
||||
@ -45,7 +45,7 @@ test_expect_success 'update git svn-cloned repo' '
|
||||
git svn rebase &&
|
||||
echo a > expect &&
|
||||
echo b >> expect &&
|
||||
test_cmp a expect &&
|
||||
test_cmp expect a &&
|
||||
rm expect
|
||||
)
|
||||
'
|
||||
@ -69,7 +69,7 @@ test_expect_success 'update git svn-cloned repo' '
|
||||
git svn rebase &&
|
||||
echo a > expect &&
|
||||
echo b >> expect &&
|
||||
test_cmp a expect &&
|
||||
test_cmp expect a &&
|
||||
rm expect
|
||||
)
|
||||
'
|
||||
@ -93,7 +93,7 @@ test_expect_success 'update git svn-cloned repo again' '
|
||||
echo a > expect &&
|
||||
echo b >> expect &&
|
||||
echo c >> expect &&
|
||||
test_cmp a expect &&
|
||||
test_cmp expect a &&
|
||||
rm expect
|
||||
)
|
||||
'
|
||||
|
||||
@ -148,7 +148,7 @@ test_expect_success PERL 'import from a CVS working tree' '
|
||||
git cvsimport -a -z0 &&
|
||||
echo 1 >expect &&
|
||||
git log -1 --pretty=format:%s%n >actual &&
|
||||
test_cmp actual expect
|
||||
test_cmp expect actual
|
||||
)
|
||||
|
||||
'
|
||||
|
||||
@ -29,11 +29,11 @@ test_expect_failure PERL 'import with criss cross times on revisions' '
|
||||
Rev 3
|
||||
Rev 2
|
||||
Rev 1" > expect-master &&
|
||||
test_cmp actual-master expect-master &&
|
||||
test_cmp expect-master actual-master &&
|
||||
|
||||
echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000
|
||||
Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A &&
|
||||
test_cmp actual-A expect-A
|
||||
test_cmp expect-A actual-A
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
@ -31,7 +31,7 @@ test_expect_success PERL 'check timestamps are UTC (TZ=CST6CDT)' '
|
||||
Rev 2 2005-02-01 00:00:00 +0000
|
||||
Rev 1 2005-01-01 00:00:00 +0000
|
||||
EOF
|
||||
test_cmp actual-1 expect-1
|
||||
test_cmp expect-1 actual-1
|
||||
'
|
||||
|
||||
test_expect_success PERL 'check timestamps with author-specific timezones' '
|
||||
@ -65,7 +65,7 @@ test_expect_success PERL 'check timestamps with author-specific timezones' '
|
||||
Rev 2 2005-01-31 18:00:00 -0600 User Two
|
||||
Rev 1 2005-01-01 00:00:00 +0000 User One
|
||||
EOF
|
||||
test_cmp actual-2 expect-2
|
||||
test_cmp expect-2 actual-2
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
Loading…
Reference in New Issue
Block a user