War on whitespace
This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
@ -28,4 +28,3 @@ full-svn-test:
|
||||
|
||||
.PHONY: $(T) clean
|
||||
.NOTPARALLEL:
|
||||
|
||||
|
||||
@ -87,7 +87,7 @@ test_expect_success \
|
||||
test_expect_success \
|
||||
'recording branch A tree' \
|
||||
'tree_A=$(git-write-tree)'
|
||||
|
||||
|
||||
################################################################
|
||||
# Branch B
|
||||
# Start from O
|
||||
|
||||
@ -37,7 +37,7 @@ fi
|
||||
find .git/objects -type f -print >should-be-empty
|
||||
test_expect_success \
|
||||
'.git/objects should be empty after git-init in an empty repo.' \
|
||||
'cmp -s /dev/null should-be-empty'
|
||||
'cmp -s /dev/null should-be-empty'
|
||||
|
||||
# also it should have 2 subdirectories; no fan-out anymore, pack, and info.
|
||||
# 3 is counting "objects" itself
|
||||
|
||||
@ -159,4 +159,3 @@ test_expect_success 'git prune-packed' 'git prune-packed'
|
||||
test_expect_failure '-> only packed objects' 'find -type f .git/objects/[0-9a-f][0-9a-f]'
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
@ -514,4 +514,3 @@ git config --list > result
|
||||
test_expect_success 'value continued on next line' 'cmp result expect'
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
@ -49,5 +49,3 @@ test_expect_success \
|
||||
'test -f path0 && test -d path1 && test -f path1/file1'
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
|
||||
@ -84,4 +84,3 @@ test_expect_success \
|
||||
test ! -h path1/file1 && test -f path1/file1'
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
@ -525,4 +525,3 @@ test_expect_success 'reset and bind merge' '
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
@ -54,4 +54,3 @@ test_expect_success 'merge and reference trees equal' \
|
||||
test_debug 'gitk --all & sleep 1'
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
@ -41,4 +41,3 @@ test_expect_success \
|
||||
'git diff expected check'
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
@ -44,4 +44,3 @@ test_expect_success \
|
||||
git diff ../t4100/t-apply-7.expect current'
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
@ -98,4 +98,3 @@ test_expect_success "S = cmp" \
|
||||
'cmp apply.txt patch.txt'
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
@ -49,10 +49,10 @@ copy to include/arch/cris/klibc/archsetjmp.h
|
||||
- * arch/x86_64/include/klibc/archsetjmp.h
|
||||
+ * arch/cris/include/klibc/archsetjmp.h
|
||||
*/
|
||||
|
||||
|
||||
#ifndef _KLIBC_ARCHSETJMP_H
|
||||
#define _KLIBC_ARCHSETJMP_H
|
||||
|
||||
|
||||
struct __jmp_buf {
|
||||
- unsigned long __rbx;
|
||||
- unsigned long __rsp;
|
||||
@ -74,9 +74,9 @@ copy to include/arch/cris/klibc/archsetjmp.h
|
||||
+ unsigned long __sp;
|
||||
+ unsigned long __srp;
|
||||
};
|
||||
|
||||
|
||||
typedef struct __jmp_buf jmp_buf[1];
|
||||
|
||||
|
||||
-#endif /* _SETJMP_H */
|
||||
+#endif /* _KLIBC_ARCHSETJMP_H */
|
||||
diff --git a/klibc/arch/x86_64/include/klibc/archsetjmp.h b/include/arch/m32r/klibc/archsetjmp.h
|
||||
@ -90,10 +90,10 @@ rename to include/arch/m32r/klibc/archsetjmp.h
|
||||
- * arch/x86_64/include/klibc/archsetjmp.h
|
||||
+ * arch/m32r/include/klibc/archsetjmp.h
|
||||
*/
|
||||
|
||||
|
||||
#ifndef _KLIBC_ARCHSETJMP_H
|
||||
#define _KLIBC_ARCHSETJMP_H
|
||||
|
||||
|
||||
struct __jmp_buf {
|
||||
- unsigned long __rbx;
|
||||
- unsigned long __rsp;
|
||||
@ -108,9 +108,9 @@ rename to include/arch/m32r/klibc/archsetjmp.h
|
||||
unsigned long __r15;
|
||||
- unsigned long __rip;
|
||||
};
|
||||
|
||||
|
||||
typedef struct __jmp_buf jmp_buf[1];
|
||||
|
||||
|
||||
-#endif /* _SETJMP_H */
|
||||
+#endif /* _KLIBC_ARCHSETJMP_H */
|
||||
EOF
|
||||
|
||||
@ -53,4 +53,3 @@ test_expect_success 'apply --apply' '
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ cat >gpatch.file <<\EOF &&
|
||||
+++ 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 &&
|
||||
|
||||
@ -30,4 +30,3 @@ test_expect_success \
|
||||
'( git diff test~2 test~1; git diff test~1 test~0 )| git apply'
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
@ -53,4 +53,3 @@ test_expect_success 'check result' '
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
@ -148,5 +148,3 @@ test_expect_success 'old records rest in peace' \
|
||||
"test ! -f $rr/preimage && test ! -f $rr2/preimage"
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
|
||||
@ -66,7 +66,7 @@ test_expect_success 'pack the destination repository' '
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'pushing rewound head should not barf but require --force' '
|
||||
'pushing rewound head should not barf but require --force' '
|
||||
# should not fail but refuse to update.
|
||||
if git-send-pack ./victim/.git/ master
|
||||
then
|
||||
|
||||
@ -54,4 +54,3 @@ test_expect_success 'the default remote . should not break explicit pull' '
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
@ -104,4 +104,3 @@ test_valid_repo'
|
||||
cd "$base_dir"
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
@ -17,17 +17,17 @@ unique_commit()
|
||||
_text=$1
|
||||
_tree=$2
|
||||
shift 2
|
||||
echo $_text | git-commit-tree $(tag $_tree) "$@"
|
||||
echo $_text | git-commit-tree $(tag $_tree) "$@"
|
||||
}
|
||||
|
||||
# Save the output of a command into the tag specified. Prepend
|
||||
# a substitution script for the tag onto the front of sed.script
|
||||
save_tag()
|
||||
{
|
||||
_tag=$1
|
||||
_tag=$1
|
||||
[ -n "$_tag" ] || error "usage: save_tag tag commit-args ..."
|
||||
shift 1
|
||||
"$@" >.git/refs/tags/$_tag
|
||||
"$@" >.git/refs/tags/$_tag
|
||||
|
||||
echo "s/$(tag $_tag)/$_tag/g" > sed.script.tmp
|
||||
cat sed.script >> sed.script.tmp
|
||||
@ -35,7 +35,7 @@ save_tag()
|
||||
mv sed.script.tmp sed.script
|
||||
}
|
||||
|
||||
# Replace unhelpful sha1 hashses with their symbolic equivalents
|
||||
# Replace unhelpful sha1 hashses with their symbolic equivalents
|
||||
entag()
|
||||
{
|
||||
sed -f sed.script
|
||||
@ -62,7 +62,7 @@ as_author()
|
||||
commit_date()
|
||||
{
|
||||
_commit=$1
|
||||
git-cat-file commit $_commit | sed -n "s/^committer .*> \([0-9]*\) .*/\1/p"
|
||||
git-cat-file commit $_commit | sed -n "s/^committer .*> \([0-9]*\) .*/\1/p"
|
||||
}
|
||||
|
||||
on_committer_date()
|
||||
@ -103,14 +103,14 @@ name_from_description()
|
||||
|
||||
# Execute the test described by the first argument, by eval'ing
|
||||
# command line specified in the 2nd argument. Check the status code
|
||||
# is zero and that the output matches the stream read from
|
||||
# is zero and that the output matches the stream read from
|
||||
# stdin.
|
||||
test_output_expect_success()
|
||||
{
|
||||
{
|
||||
_description=$1
|
||||
_test=$2
|
||||
[ $# -eq 2 ] || error "usage: test_output_expect_success description test <<EOF ... EOF"
|
||||
_name=$(echo $_description | name_from_description)
|
||||
cat > $_name.expected
|
||||
test_expect_success "$_description" "check_output $_name \"$_test\""
|
||||
test_expect_success "$_description" "check_output $_name \"$_test\""
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@ test_bisection_diff()
|
||||
|
||||
# Test if bisection size is close to half of list size within
|
||||
# tolerance.
|
||||
#
|
||||
#
|
||||
_bisect_err=`expr $_list_size - $_bisection_size \* 2`
|
||||
test "$_bisect_err" -lt 0 && _bisect_err=`expr 0 - $_bisect_err`
|
||||
_bisect_err=`expr $_bisect_err / 2` ; # floor
|
||||
@ -116,8 +116,8 @@ on_committer_date "1971-08-16 00:00:06" save_tag V unique_commit V tree -p u1 -p
|
||||
|
||||
test_sequence()
|
||||
{
|
||||
_bisect_option=$1
|
||||
|
||||
_bisect_option=$1
|
||||
|
||||
test_bisection_diff 0 $_bisect_option l0 ^root
|
||||
test_bisection_diff 0 $_bisect_option l1 ^root
|
||||
test_bisection_diff 0 $_bisect_option l2 ^root
|
||||
@ -152,7 +152,7 @@ test_sequence()
|
||||
test_bisection_diff 0 $_bisect_option u3 ^U
|
||||
test_bisection_diff 0 $_bisect_option u4 ^U
|
||||
test_bisection_diff 0 $_bisect_option u5 ^U
|
||||
|
||||
|
||||
#
|
||||
# the following illustrates Linus' binary bug blatt idea.
|
||||
#
|
||||
|
||||
@ -20,7 +20,7 @@ test_expect_success 'prepare repository' \
|
||||
7
|
||||
8
|
||||
9" > file &&
|
||||
git add file &&
|
||||
git add file &&
|
||||
git commit -m "Initial commit" file &&
|
||||
git branch A &&
|
||||
git branch B &&
|
||||
|
||||
@ -135,4 +135,3 @@ EOF
|
||||
test_expect_success "expected conflict markers" "git diff expect out"
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
@ -102,4 +102,3 @@ test_expect_success \
|
||||
#
|
||||
#
|
||||
test_done
|
||||
|
||||
|
||||
@ -40,4 +40,3 @@ test_expect_success 'short SHA-1 works' '
|
||||
test $start = $abbrv'
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
@ -109,4 +109,3 @@ test_expect_success ".rev_db auto-converted to .rev_db.UUID" "
|
||||
"
|
||||
|
||||
test_done
|
||||
|
||||
|
||||
@ -558,5 +558,3 @@ Text-content-md5: 7abb78de7f2756ca8b511cbc879fd5e7
|
||||
Content-length: 4
|
||||
|
||||
cba
|
||||
|
||||
|
||||
|
||||
@ -232,7 +232,7 @@ test_create_repo () {
|
||||
mv .git/hooks .git/hooks-disabled
|
||||
cd "$owd"
|
||||
}
|
||||
|
||||
|
||||
test_done () {
|
||||
trap - exit
|
||||
case "$test_failure" in
|
||||
|
||||
Reference in New Issue
Block a user