Browse Source

t3905: remove spaces after redirect operators

For shell scripts, the usual convention is for there to be no space
after redirection operators, (e.g. `>file`, not `> file`). Remove these
spaces wherever they appear.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Denton Liu 4 years ago committed by Junio C Hamano
parent
commit
32b7385e43
  1. 40
      t/t3905-stash-include-untracked.sh

40
t/t3905-stash-include-untracked.sh

@ -8,16 +8,16 @@ test_description='Test git stash --include-untracked'
. ./test-lib.sh . ./test-lib.sh


test_expect_success 'stash save --include-untracked some dirty working directory' ' test_expect_success 'stash save --include-untracked some dirty working directory' '
echo 1 > file && echo 1 >file &&
git add file && git add file &&
test_tick && test_tick &&
git commit -m initial && git commit -m initial &&
echo 2 > file && echo 2 >file &&
git add file && git add file &&
echo 3 > file && echo 3 >file &&
test_tick && test_tick &&
echo 1 > file2 && echo 1 >file2 &&
echo 1 > HEAD && echo 1 >HEAD &&
mkdir untracked && mkdir untracked &&
echo untracked >untracked/untracked && echo untracked >untracked/untracked &&
git stash --include-untracked && git stash --include-untracked &&
@ -25,7 +25,7 @@ test_expect_success 'stash save --include-untracked some dirty working directory
git diff-index --cached --quiet HEAD git diff-index --cached --quiet HEAD
' '


cat > expect <<EOF cat >expect <<EOF
?? actual ?? actual
?? expect ?? expect
EOF EOF
@ -37,7 +37,7 @@ test_expect_success 'stash save --include-untracked cleaned the untracked files'


tracked=$(git rev-parse --short $(echo 1 | git hash-object --stdin)) tracked=$(git rev-parse --short $(echo 1 | git hash-object --stdin))
untracked=$(git rev-parse --short $(echo untracked | git hash-object --stdin)) untracked=$(git rev-parse --short $(echo untracked | git hash-object --stdin))
cat > expect.diff <<EOF cat >expect.diff <<EOF
diff --git a/HEAD b/HEAD diff --git a/HEAD b/HEAD
new file mode 100644 new file mode 100644
index 0000000..$tracked index 0000000..$tracked
@ -60,7 +60,7 @@ index 0000000..$untracked
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+untracked +untracked
EOF EOF
cat > expect.lstree <<EOF cat >expect.lstree <<EOF
HEAD HEAD
file2 file2
untracked untracked
@ -85,7 +85,7 @@ test_expect_success 'stash save --patch --all fails' '


git clean --force --quiet git clean --force --quiet


cat > expect <<EOF cat >expect <<EOF
M file M file
?? HEAD ?? HEAD
?? actual ?? actual
@ -105,14 +105,14 @@ test_expect_success 'stash pop after save --include-untracked leaves files untra
git clean --force --quiet -d git clean --force --quiet -d


test_expect_success 'stash save -u dirty index' ' test_expect_success 'stash save -u dirty index' '
echo 4 > file3 && echo 4 >file3 &&
git add file3 && git add file3 &&
test_tick && test_tick &&
git stash -u git stash -u
' '


blob=$(git rev-parse --short $(echo 4 | git hash-object --stdin)) blob=$(git rev-parse --short $(echo 4 | git hash-object --stdin))
cat > expect <<EOF cat >expect <<EOF
diff --git a/file3 b/file3 diff --git a/file3 b/file3
new file mode 100644 new file mode 100644
index 0000000..$blob index 0000000..$blob
@ -128,12 +128,12 @@ test_expect_success 'stash save --include-untracked dirty index got stashed' '
test_cmp expect actual test_cmp expect actual
' '


git reset > /dev/null git reset >/dev/null


# Must direct output somewhere where it won't be considered an untracked file # Must direct output somewhere where it won't be considered an untracked file
test_expect_success 'stash save --include-untracked -q is quiet' ' test_expect_success 'stash save --include-untracked -q is quiet' '
echo 1 > file5 && echo 1 >file5 &&
git stash save --include-untracked --quiet > .git/stash-output.out 2>&1 && git stash save --include-untracked --quiet >.git/stash-output.out 2>&1 &&
test_line_count = 0 .git/stash-output.out && test_line_count = 0 .git/stash-output.out &&
rm -f .git/stash-output.out rm -f .git/stash-output.out
' '
@ -141,7 +141,7 @@ test_expect_success 'stash save --include-untracked -q is quiet' '
test_expect_success 'stash save --include-untracked removed files' ' test_expect_success 'stash save --include-untracked removed files' '
rm -f file && rm -f file &&
git stash save --include-untracked && git stash save --include-untracked &&
echo 1 > expect && echo 1 >expect &&
test_cmp expect file test_cmp expect file
' '


@ -152,14 +152,14 @@ test_expect_success 'stash save --include-untracked removed files got stashed' '
test_path_is_missing file test_path_is_missing file
' '


cat > .gitignore <<EOF cat >.gitignore <<EOF
.gitignore .gitignore
ignored ignored
ignored.d/ ignored.d/
EOF EOF


test_expect_success 'stash save --include-untracked respects .gitignore' ' test_expect_success 'stash save --include-untracked respects .gitignore' '
echo ignored > ignored && echo ignored >ignored &&
mkdir ignored.d && mkdir ignored.d &&
echo ignored >ignored.d/untracked && echo ignored >ignored.d/untracked &&
git stash -u && git stash -u &&
@ -169,7 +169,7 @@ test_expect_success 'stash save --include-untracked respects .gitignore' '
' '


test_expect_success 'stash save -u can stash with only untracked files different' ' test_expect_success 'stash save -u can stash with only untracked files different' '
echo 4 > file4 && echo 4 >file4 &&
git stash -u && git stash -u &&
test_path_is_missing file4 test_path_is_missing file4
' '
@ -214,7 +214,7 @@ test_expect_success 'stash push with $IFS character' '
test_path_is_file bar test_path_is_file bar
' '


cat > .gitignore <<EOF cat >.gitignore <<EOF
ignored ignored
ignored.d/* ignored.d/*
EOF EOF
@ -224,7 +224,7 @@ test_expect_success 'stash previously ignored file' '
git add .gitignore && git add .gitignore &&
git commit -m "Add .gitignore" && git commit -m "Add .gitignore" &&
>ignored.d/foo && >ignored.d/foo &&
echo "!ignored.d/foo" >> .gitignore && echo "!ignored.d/foo" >>.gitignore &&
git stash save --include-untracked && git stash save --include-untracked &&
test_path_is_missing ignored.d/foo && test_path_is_missing ignored.d/foo &&
git stash pop && git stash pop &&

Loading…
Cancel
Save