Merge branch 'jk/test'
* jk/test: enable whitespace checking of test scripts avoid trailing whitespace in zero-change diffstat lines avoid whitespace on empty line in automatic usage message mask necessary whitespace policy violations in test scripts fix whitespace violations in test scripts
This commit is contained in:
commit
6419cd5566
3
diff.c
3
diff.c
@ -928,7 +928,8 @@ static void show_stats(struct diffstat_t* data, struct diff_options *options)
|
||||
total = add + del;
|
||||
}
|
||||
show_name(options->file, prefix, name, len, reset, set);
|
||||
fprintf(options->file, "%5d ", added + deleted);
|
||||
fprintf(options->file, "%5d%s", added + deleted,
|
||||
added + deleted ? " " : "");
|
||||
show_graph(options->file, '+', add, add_c, reset);
|
||||
show_graph(options->file, '-', del, del_c, reset);
|
||||
fprintf(options->file, "\n");
|
||||
|
@ -312,8 +312,12 @@ void usage_with_options_internal(const char * const *usagestr,
|
||||
fprintf(stderr, "usage: %s\n", *usagestr++);
|
||||
while (*usagestr && **usagestr)
|
||||
fprintf(stderr, " or: %s\n", *usagestr++);
|
||||
while (*usagestr)
|
||||
fprintf(stderr, " %s\n", *usagestr++);
|
||||
while (*usagestr) {
|
||||
fprintf(stderr, "%s%s\n",
|
||||
**usagestr ? " " : "",
|
||||
*usagestr);
|
||||
usagestr++;
|
||||
}
|
||||
|
||||
if (opts->type != OPTION_GROUP)
|
||||
fputc('\n', stderr);
|
||||
|
1
t/.gitattributes
vendored
1
t/.gitattributes
vendored
@ -1,2 +1 @@
|
||||
t[0-9][0-9][0-9][0-9]-*.sh -whitespace
|
||||
t[0-9][0-9][0-9][0-9]/* -whitespace
|
||||
|
@ -5,7 +5,7 @@ test_description='test git rev-parse --parseopt'
|
||||
|
||||
cat > expect.err <<EOF
|
||||
usage: some-command [options] <args>...
|
||||
|
||||
|
||||
some-command does foo and bar!
|
||||
|
||||
-h, --help show the help
|
||||
|
@ -241,11 +241,11 @@ check_verify_failure 'disallow spaces in tag email' \
|
||||
############################################################
|
||||
# 17. disallow missing tag timestamp
|
||||
|
||||
cat >tag.sig <<EOF
|
||||
tr '_' ' ' >tag.sig <<EOF
|
||||
object $head
|
||||
type commit
|
||||
tag mytag
|
||||
tagger T A Gger <tagger@example.com>
|
||||
tagger T A Gger <tagger@example.com>__
|
||||
|
||||
EOF
|
||||
|
||||
|
@ -41,7 +41,7 @@ test_expect_success 'apply needs clean working directory' '
|
||||
echo 4 > other-file &&
|
||||
git add other-file &&
|
||||
echo 5 > other-file &&
|
||||
test_must_fail git stash apply
|
||||
test_must_fail git stash apply
|
||||
'
|
||||
|
||||
test_expect_success 'apply stashed changes' '
|
||||
|
@ -98,7 +98,7 @@ test_expect_success 'extra headers' '
|
||||
sed -e "/^$/q" patch2 > hdrs2 &&
|
||||
grep "^To: R. E. Cipient <rcipient@example.com>$" hdrs2 &&
|
||||
grep "^Cc: S. E. Cipient <scipient@example.com>$" hdrs2
|
||||
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'extra headers without newlines' '
|
||||
@ -109,7 +109,7 @@ test_expect_success 'extra headers without newlines' '
|
||||
sed -e "/^$/q" patch3 > hdrs3 &&
|
||||
grep "^To: R. E. Cipient <rcipient@example.com>$" hdrs3 &&
|
||||
grep "^Cc: S. E. Cipient <scipient@example.com>$" hdrs3
|
||||
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'extra headers with multiple To:s' '
|
||||
@ -170,7 +170,7 @@ test_expect_success 'thread cover-letter' '
|
||||
git checkout side &&
|
||||
git format-patch --cover-letter --thread -o patches/ master &&
|
||||
FIRST_MID=$(grep "Message-Id:" patches/0000-* | sed "s/^[^<]*\(<[^>]*>\).*$/\1/") &&
|
||||
for i in patches/0001-* patches/0002-* patches/0003-*
|
||||
for i in patches/0001-* patches/0002-* patches/0003-*
|
||||
do
|
||||
grep "References: $FIRST_MID" $i &&
|
||||
grep "In-Reply-To: $FIRST_MID" $i || break
|
||||
|
@ -62,16 +62,16 @@ EOF
|
||||
|
||||
git update-index x
|
||||
|
||||
cat << EOF > x
|
||||
tr '_' ' ' << EOF > x
|
||||
whitespace at beginning
|
||||
whitespace change
|
||||
white space in the middle
|
||||
whitespace at end
|
||||
whitespace at end__
|
||||
unchanged line
|
||||
CR at end
|
||||
EOF
|
||||
|
||||
tr 'Q' '\015' << EOF > expect
|
||||
tr 'Q_' '\015 ' << EOF > expect
|
||||
diff --git a/x b/x
|
||||
index d99af23..8b32fb5 100644
|
||||
--- a/x
|
||||
@ -84,7 +84,7 @@ index d99af23..8b32fb5 100644
|
||||
+ whitespace at beginning
|
||||
+whitespace change
|
||||
+white space in the middle
|
||||
+whitespace at end
|
||||
+whitespace at end__
|
||||
unchanged line
|
||||
-CR at endQ
|
||||
+CR at end
|
||||
|
@ -53,13 +53,13 @@ test_expect_success 'git diff --summary -M HEAD' '
|
||||
'
|
||||
|
||||
cat >expect <<\EOF
|
||||
pathname.1 => "Rpathname\twith HT.0" | 0
|
||||
pathname.3 => "Rpathname\nwith LF.0" | 0
|
||||
"pathname\twith HT.3" => "Rpathname\nwith LF.1" | 0
|
||||
pathname.2 => Rpathname with SP.0 | 0
|
||||
"pathname\twith HT.2" => Rpathname with SP.1 | 0
|
||||
pathname.0 => Rpathname.0 | 0
|
||||
"pathname\twith HT.0" => Rpathname.1 | 0
|
||||
pathname.1 => "Rpathname\twith HT.0" | 0
|
||||
pathname.3 => "Rpathname\nwith LF.0" | 0
|
||||
"pathname\twith HT.3" => "Rpathname\nwith LF.1" | 0
|
||||
pathname.2 => Rpathname with SP.0 | 0
|
||||
"pathname\twith HT.2" => Rpathname with SP.1 | 0
|
||||
pathname.0 => Rpathname.0 | 0
|
||||
"pathname\twith HT.0" => Rpathname.1 | 0
|
||||
7 files changed, 0 insertions(+), 0 deletions(-)
|
||||
EOF
|
||||
test_expect_success 'git diff --stat -M HEAD' '
|
||||
|
@ -9,134 +9,10 @@ test_description='git apply test patches with multiple fragments.
|
||||
'
|
||||
. ./test-lib.sh
|
||||
|
||||
# setup
|
||||
|
||||
cat > patch1.patch <<\EOF
|
||||
diff --git a/main.c b/main.c
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/main.c
|
||||
@@ -0,0 +1,23 @@
|
||||
+#include <stdio.h>
|
||||
+
|
||||
+int func(int num);
|
||||
+void print_int(int num);
|
||||
+
|
||||
+int main() {
|
||||
+ int i;
|
||||
+
|
||||
+ for (i = 0; i < 10; i++) {
|
||||
+ print_int(func(i));
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+int func(int num) {
|
||||
+ return num * num;
|
||||
+}
|
||||
+
|
||||
+void print_int(int num) {
|
||||
+ printf("%d", num);
|
||||
+}
|
||||
+
|
||||
EOF
|
||||
cat > patch2.patch <<\EOF
|
||||
diff --git a/main.c b/main.c
|
||||
--- a/main.c
|
||||
+++ b/main.c
|
||||
@@ -1,7 +1,9 @@
|
||||
+#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
int func(int num);
|
||||
void print_int(int num);
|
||||
+void print_ln();
|
||||
|
||||
int main() {
|
||||
int i;
|
||||
@@ -10,6 +12,8 @@
|
||||
print_int(func(i));
|
||||
}
|
||||
|
||||
+ print_ln();
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -21,3 +25,7 @@
|
||||
printf("%d", num);
|
||||
}
|
||||
|
||||
+void print_ln() {
|
||||
+ printf("\n");
|
||||
+}
|
||||
+
|
||||
EOF
|
||||
cat > patch3.patch <<\EOF
|
||||
diff --git a/main.c b/main.c
|
||||
--- a/main.c
|
||||
+++ b/main.c
|
||||
@@ -1,9 +1,7 @@
|
||||
-#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
int func(int num);
|
||||
void print_int(int num);
|
||||
-void print_ln();
|
||||
|
||||
int main() {
|
||||
int i;
|
||||
@@ -12,8 +10,6 @@
|
||||
print_int(func(i));
|
||||
}
|
||||
|
||||
- print_ln();
|
||||
-
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -25,7 +21,3 @@
|
||||
printf("%d", num);
|
||||
}
|
||||
|
||||
-void print_ln() {
|
||||
- printf("\n");
|
||||
-}
|
||||
-
|
||||
EOF
|
||||
cat > patch4.patch <<\EOF
|
||||
diff --git a/main.c b/main.c
|
||||
--- a/main.c
|
||||
+++ b/main.c
|
||||
@@ -1,13 +1,14 @@
|
||||
#include <stdio.h>
|
||||
|
||||
int func(int num);
|
||||
-void print_int(int num);
|
||||
+int func2(int num);
|
||||
|
||||
int main() {
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 10; i++) {
|
||||
- print_int(func(i));
|
||||
+ printf("%d", func(i));
|
||||
+ printf("%d", func3(i));
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -17,7 +18,7 @@
|
||||
return num * num;
|
||||
}
|
||||
|
||||
-void print_int(int num) {
|
||||
- printf("%d", num);
|
||||
+int func2(int num) {
|
||||
+ return num * num * num;
|
||||
}
|
||||
|
||||
EOF
|
||||
cp ../t4109/patch1.patch .
|
||||
cp ../t4109/patch2.patch .
|
||||
cp ../t4109/patch3.patch .
|
||||
cp ../t4109/patch4.patch .
|
||||
|
||||
test_expect_success "S = git apply (1)" \
|
||||
'git apply patch1.patch patch2.patch'
|
||||
|
28
t/t4109/patch1.patch
Normal file
28
t/t4109/patch1.patch
Normal file
@ -0,0 +1,28 @@
|
||||
diff --git a/main.c b/main.c
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/main.c
|
||||
@@ -0,0 +1,23 @@
|
||||
+#include <stdio.h>
|
||||
+
|
||||
+int func(int num);
|
||||
+void print_int(int num);
|
||||
+
|
||||
+int main() {
|
||||
+ int i;
|
||||
+
|
||||
+ for (i = 0; i < 10; i++) {
|
||||
+ print_int(func(i));
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+int func(int num) {
|
||||
+ return num * num;
|
||||
+}
|
||||
+
|
||||
+void print_int(int num) {
|
||||
+ printf("%d", num);
|
||||
+}
|
||||
+
|
30
t/t4109/patch2.patch
Normal file
30
t/t4109/patch2.patch
Normal file
@ -0,0 +1,30 @@
|
||||
diff --git a/main.c b/main.c
|
||||
--- a/main.c
|
||||
+++ b/main.c
|
||||
@@ -1,7 +1,9 @@
|
||||
+#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
int func(int num);
|
||||
void print_int(int num);
|
||||
+void print_ln();
|
||||
|
||||
int main() {
|
||||
int i;
|
||||
@@ -10,6 +12,8 @@
|
||||
print_int(func(i));
|
||||
}
|
||||
|
||||
+ print_ln();
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -21,3 +25,7 @@
|
||||
printf("%d", num);
|
||||
}
|
||||
|
||||
+void print_ln() {
|
||||
+ printf("\n");
|
||||
+}
|
||||
+
|
31
t/t4109/patch3.patch
Normal file
31
t/t4109/patch3.patch
Normal file
@ -0,0 +1,31 @@
|
||||
cat > patch3.patch <<\EOF
|
||||
diff --git a/main.c b/main.c
|
||||
--- a/main.c
|
||||
+++ b/main.c
|
||||
@@ -1,9 +1,7 @@
|
||||
-#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
int func(int num);
|
||||
void print_int(int num);
|
||||
-void print_ln();
|
||||
|
||||
int main() {
|
||||
int i;
|
||||
@@ -12,8 +10,6 @@
|
||||
print_int(func(i));
|
||||
}
|
||||
|
||||
- print_ln();
|
||||
-
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -25,7 +21,3 @@
|
||||
printf("%d", num);
|
||||
}
|
||||
|
||||
-void print_ln() {
|
||||
- printf("\n");
|
||||
-}
|
||||
-
|
30
t/t4109/patch4.patch
Normal file
30
t/t4109/patch4.patch
Normal file
@ -0,0 +1,30 @@
|
||||
diff --git a/main.c b/main.c
|
||||
--- a/main.c
|
||||
+++ b/main.c
|
||||
@@ -1,13 +1,14 @@
|
||||
#include <stdio.h>
|
||||
|
||||
int func(int num);
|
||||
-void print_int(int num);
|
||||
+int func2(int num);
|
||||
|
||||
int main() {
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 10; i++) {
|
||||
- print_int(func(i));
|
||||
+ printf("%d", func(i));
|
||||
+ printf("%d", func3(i));
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -17,7 +18,7 @@
|
||||
return num * num;
|
||||
}
|
||||
|
||||
-void print_int(int num) {
|
||||
- printf("%d", num);
|
||||
+int func2(int num) {
|
||||
+ return num * num * num;
|
||||
}
|
||||
|
@ -19,12 +19,12 @@ test_expect_success setup '
|
||||
'
|
||||
|
||||
# Also handcraft GNU diff output; note this has trailing whitespace.
|
||||
cat >gpatch.file <<\EOF &&
|
||||
tr '_' ' ' >gpatch.file <<\EOF &&
|
||||
--- file1 2007-02-21 01:04:24.000000000 -0800
|
||||
+++ file1+ 2007-02-21 01:07:44.000000000 -0800
|
||||
@@ -1 +1 @@
|
||||
-A
|
||||
+B
|
||||
+B_
|
||||
EOF
|
||||
|
||||
sed -e 's|file1|sub/&|' gpatch.file >gpatch-sub.file &&
|
||||
|
@ -110,7 +110,7 @@ test_expect_success 'am applies patch correctly' '
|
||||
|
||||
GIT_AUTHOR_NAME="Another Thor"
|
||||
GIT_AUTHOR_EMAIL="a.thor@example.com"
|
||||
GIT_COMMITTER_NAME="Co M Miter"
|
||||
GIT_COMMITTER_NAME="Co M Miter"
|
||||
GIT_COMMITTER_EMAIL="c.miter@example.com"
|
||||
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
|
||||
|
||||
|
@ -38,7 +38,7 @@ test_expect_success 'setup remote repository' '
|
||||
cd - &&
|
||||
mv test_repo.git $HTTPD_DOCUMENT_ROOT_PATH
|
||||
'
|
||||
|
||||
|
||||
test_expect_success 'clone remote repository' '
|
||||
cd "$ROOT_PATH" &&
|
||||
git clone $HTTPD_URL/test_repo.git test_repo_clone
|
||||
|
Loading…
Reference in New Issue
Block a user