kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t7102,t7201: remove whitespace after redirect operator 

According to Documentation/CodingGuidelines, redirect
operator is written with space before, but no space
after them.

Let's remove these whitespaces after redirect operators.

Signed-off-by: Charvi Mendiratta <charvi077@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Charvi Mendiratta 2020-10-20 17:13:17 +05:30 committed by Junio C Hamano
parent 78b8d9340d
commit c327762f81
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
t/t7102-reset.sh
View File

@ -70,15 +70,15 @@ check_changes () {


test_expect_success 'reset --hard message' ' test_expect_success 'reset --hard message' '
hex=$(git log -1 --format="%h") && hex=$(git log -1 --format="%h") &&
git reset --hard > .actual && git reset --hard >.actual &&
echo HEAD is now at $hex $(commit_msg) > .expected && echo HEAD is now at $hex $(commit_msg) >.expected &&
test_i18ncmp .expected .actual test_i18ncmp .expected .actual
' '


test_expect_success 'reset --hard message (ISO8859-1 logoutputencoding)' ' test_expect_success 'reset --hard message (ISO8859-1 logoutputencoding)' '
hex=$(git log -1 --format="%h") && hex=$(git log -1 --format="%h") &&
git -c "i18n.logOutputEncoding=$test_encoding" reset --hard > .actual && git -c "i18n.logOutputEncoding=$test_encoding" reset --hard >.actual &&
echo HEAD is now at $hex $(commit_msg $test_encoding) > .expected && echo HEAD is now at $hex $(commit_msg $test_encoding) >.expected &&
test_i18ncmp .expected .actual test_i18ncmp .expected .actual
' '


@ -387,25 +387,25 @@ test_expect_success '--hard reset to ORIG_HEAD should clear a fast-forward merge
' '


test_expect_success 'test --mixed <paths>' ' test_expect_success 'test --mixed <paths>' '
echo 1 > file1 && echo 1 >file1 &&
echo 2 > file2 && echo 2 >file2 &&
git add file1 file2 && git add file1 file2 &&
test_tick && test_tick &&
git commit -m files && git commit -m files &&
before1=$(git rev-parse --short HEAD:file1) && before1=$(git rev-parse --short HEAD:file1) &&
before2=$(git rev-parse --short HEAD:file2) && before2=$(git rev-parse --short HEAD:file2) &&
git rm file2 && git rm file2 &&
echo 3 > file3 && echo 3 >file3 &&
echo 4 > file4 && echo 4 >file4 &&
echo 5 > file1 && echo 5 >file1 &&
after1=$(git rev-parse --short $(git hash-object file1)) && after1=$(git rev-parse --short $(git hash-object file1)) &&
after4=$(git rev-parse --short $(git hash-object file4)) && after4=$(git rev-parse --short $(git hash-object file4)) &&
git add file1 file3 file4 && git add file1 file3 file4 &&
git reset HEAD -- file1 file2 file3 && git reset HEAD -- file1 file2 file3 &&
test_must_fail git diff --quiet && test_must_fail git diff --quiet &&
git diff > output && git diff >output &&


cat > expect <<-EOF && cat >expect <<-EOF &&
diff --git a/file1 b/file1 diff --git a/file1 b/file1
index $before1..$after1 100644 index $before1..$after1 100644
--- a/file1 --- a/file1
@ -423,9 +423,9 @@ test_expect_success 'test --mixed <paths>' '
EOF EOF


test_cmp expect output && test_cmp expect output &&
git diff --cached > output && git diff --cached >output &&


cat > cached_expect <<-EOF && cat >cached_expect <<-EOF &&
diff --git a/file4 b/file4 diff --git a/file4 b/file4
new file mode 100644 new file mode 100644
index 0000000..$after4 index 0000000..$after4
@ -460,14 +460,14 @@ test_expect_success 'resetting an unmodified path is a no-op' '
git diff-index --cached --exit-code HEAD git diff-index --cached --exit-code HEAD
' '


cat > expect << EOF cat >expect <<EOF
Unstaged changes after reset: Unstaged changes after reset:
M file2 M file2
EOF EOF


test_expect_success '--mixed refreshes the index' ' test_expect_success '--mixed refreshes the index' '
echo 123 >> file2 && echo 123 >>file2 &&
git reset --mixed HEAD > output && git reset --mixed HEAD >output &&
test_i18ncmp expect output test_i18ncmp expect output
' '



10
t/t7201-co.sh
View File

@ -33,7 +33,7 @@ fill () {




test_expect_success setup ' test_expect_success setup '
fill x y z > same && fill x y z >same &&
fill 1 2 3 4 5 6 7 8 >one && fill 1 2 3 4 5 6 7 8 >one &&
fill a b c d e >two && fill a b c d e >two &&
git add same one two && git add same one two &&
@ -55,7 +55,7 @@ test_expect_success setup '


git checkout -b simple master && git checkout -b simple master &&
rm -f one && rm -f one &&
fill a c e > two && fill a c e >two &&
git commit -a -m "Simple D one, M two" && git commit -a -m "Simple D one, M two" &&


git checkout master git checkout master
@ -95,7 +95,7 @@ test_expect_success 'checkout -m with dirty tree' '
git clean -f && git clean -f &&


fill 0 1 2 3 4 5 6 7 8 >one && fill 0 1 2 3 4 5 6 7 8 >one &&
git checkout -m side > messages && git checkout -m side >messages &&


test "$(git symbolic-ref HEAD)" = "refs/heads/side" && test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&


@ -159,7 +159,7 @@ test_expect_success 'checkout -m with merge conflict' '
test_expect_success 'format of merge conflict from checkout -m' ' test_expect_success 'format of merge conflict from checkout -m' '
git checkout -f master && git clean -f && git checkout -f master && git clean -f &&


fill b d > two && fill b d >two &&
git checkout -m simple && git checkout -m simple &&


git ls-files >current && git ls-files >current &&
@ -182,7 +182,7 @@ test_expect_success 'format of merge conflict from checkout -m' '
test_expect_success 'checkout --merge --conflict=diff3 <branch>' ' test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
git checkout -f master && git reset --hard && git clean -f && git checkout -f master && git reset --hard && git clean -f &&


fill b d > two && fill b d >two &&
git checkout --merge --conflict=diff3 simple && git checkout --merge --conflict=diff3 simple &&


cat <<-EOF >expect && cat <<-EOF >expect &&