* [PATCH 22/40] whitespace: remediate t7003-filter-branch.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t7003-filter-branch.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index e022773..96aca9e 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -147,7 +147,7 @@ test_expect_success 'use index-filter to move into a subdirectory' '
git branch directorymoved &&
git filter-branch -f --index-filter \
"git ls-files -s | sed \"s- -&newsubdir/-\" |
- GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
+ GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
git update-index --index-info &&
mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&
git diff --exit-code HEAD directorymoved:newsubdir
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 23/40] whitespace: remediate t7004-tag.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t7004-tag.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 097ce2b..1ae978c 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1239,7 +1239,7 @@ test_expect_success 'checking that third commit has no tags' "
test_expect_success 'creating simple branch' '
git branch stable v2.0 &&
- git checkout stable &&
+ git checkout stable &&
echo foo-3.0 > foo &&
git commit foo -m fourth &&
git tag v3.0
@@ -1258,7 +1258,7 @@ test_expect_success 'checking that branch head only has one tag' "
test_expect_success 'merging original branch into this branch' '
git merge --strategy=ours master &&
- git tag v4.0
+ git tag v4.0
'
cat > expected <<EOF
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 24/40] whitespace: remediate t7403-submodule-sync.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t7403-submodule-sync.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index 95ffe34..13ca668 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -57,7 +57,7 @@ test_expect_success '"git submodule sync" should update submodule URLs' '
git submodule sync
) &&
test -d "$(git config -f super-clone/submodule/.git/config \
- remote.origin.url)" &&
+ remote.origin.url)" &&
(cd super-clone/submodule &&
git checkout master &&
git pull
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 20/40] whitespace: remediate t6005-rev-list-count.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t6005-rev-list-count.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t6005-rev-list-count.sh b/t/t6005-rev-list-count.sh
index 0b64822..ee9bf64 100755
--- a/t/t6005-rev-list-count.sh
+++ b/t/t6005-rev-list-count.sh
@@ -6,9 +6,9 @@ test_description='git rev-list --max-count and --skip test'
test_expect_success 'setup' '
for n in 1 2 3 4 5 ; do \
- echo $n > a ; \
- git add a ; \
- git commit -m "$n" ; \
+ echo $n > a ; \
+ git add a ; \
+ git commit -m "$n" ; \
done
'
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 19/40] whitespace: remediate t6002-rev-list-bisect.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t6002-rev-list-bisect.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh
index fb07536..c8fac7f 100755
--- a/t/t6002-rev-list-bisect.sh
+++ b/t/t6002-rev-list-bisect.sh
@@ -18,7 +18,7 @@ test_bisection_diff()
shift 2
_bisection=$(git rev-list $_bisect_option "$@")
_list_size=$(git rev-list "$@" | wc -l)
- _head=$1
+ _head=$1
shift 1
_bisection_size=$(git rev-list $_bisection "$@" | wc -l)
[ -n "$_list_size" -a -n "$_bisection_size" ] ||
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 18/40] whitespace: remediate t5510-fetch.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t5510-fetch.sh | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 7e433b1..dee5aeb 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -384,14 +384,14 @@ test_expect_success 'fetch --dry-run' '
'
test_expect_success "should be able to fetch with duplicate refspecs" '
- mkdir dups &&
- cd dups &&
- git init &&
- git config branch.master.remote three &&
- git config remote.three.url ../three/.git &&
- git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
- git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
- git fetch three
+ mkdir dups &&
+ cd dups &&
+ git init &&
+ git config branch.master.remote three &&
+ git config remote.three.url ../three/.git &&
+ git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
+ git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
+ git fetch three
'
test_done
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 12/40] whitespace: remediate t5301-sliding-window.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t5301-sliding-window.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t5301-sliding-window.sh b/t/t5301-sliding-window.sh
index 2fc5af6..72ba567 100755
--- a/t/t5301-sliding-window.sh
+++ b/t/t5301-sliding-window.sh
@@ -11,9 +11,9 @@ test_expect_success \
'rm -f .git/index* &&
for i in a b c
do
- echo $i >$i &&
- test-genrandom "$i" 32768 >>$i &&
- git update-index --add $i || return 1
+ echo $i >$i &&
+ test-genrandom "$i" 32768 >>$i &&
+ git update-index --add $i || return 1
done &&
echo d >d && cat c >>d && git update-index --add d &&
tree=`git write-tree` &&
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 16/40] whitespace: remediate t5402-post-merge-hook.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t5402-post-merge-hook.sh | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t5402-post-merge-hook.sh b/t/t5402-post-merge-hook.sh
index 6eb2ffd..d3d757b 100755
--- a/t/t5402-post-merge-hook.sh
+++ b/t/t5402-post-merge-hook.sh
@@ -15,7 +15,7 @@ test_expect_success setup '
git update-index a &&
tree1=$(git write-tree) &&
commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
- git update-ref refs/heads/master $commit0 &&
+ git update-ref refs/heads/master $commit0 &&
git clone ./. clone1 &&
GIT_DIR=clone1/.git git update-index --add a &&
git clone ./. clone2 &&
@@ -31,26 +31,26 @@ EOF
done
test_expect_success 'post-merge does not run for up-to-date ' '
- GIT_DIR=clone1/.git git merge $commit0 &&
+ GIT_DIR=clone1/.git git merge $commit0 &&
! test -f clone1/.git/post-merge.args
'
test_expect_success 'post-merge runs as expected ' '
- GIT_DIR=clone1/.git git merge $commit1 &&
+ GIT_DIR=clone1/.git git merge $commit1 &&
test -e clone1/.git/post-merge.args
'
test_expect_success 'post-merge from normal merge receives the right argument ' '
- grep 0 clone1/.git/post-merge.args
+ grep 0 clone1/.git/post-merge.args
'
test_expect_success 'post-merge from squash merge runs as expected ' '
- GIT_DIR=clone2/.git git merge --squash $commit1 &&
+ GIT_DIR=clone2/.git git merge --squash $commit1 &&
test -e clone2/.git/post-merge.args
'
test_expect_success 'post-merge from squash merge receives the right argument ' '
- grep 1 clone2/.git/post-merge.args
+ grep 1 clone2/.git/post-merge.args
'
test_done
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 17/40] whitespace: remediate t5403-post-checkout-hook.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t5403-post-checkout-hook.sh | 46 ++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh
index d05a913..1753ef2 100755
--- a/t/t5403-post-checkout-hook.sh
+++ b/t/t5403-post-checkout-hook.sh
@@ -31,44 +31,44 @@ EOF
done
test_expect_success 'post-checkout runs as expected ' '
- GIT_DIR=clone1/.git git checkout master &&
- test -e clone1/.git/post-checkout.args
+ GIT_DIR=clone1/.git git checkout master &&
+ test -e clone1/.git/post-checkout.args
'
test_expect_success 'post-checkout receives the right arguments with HEAD unchanged ' '
- old=$(awk "{print \$1}" clone1/.git/post-checkout.args) &&
- new=$(awk "{print \$2}" clone1/.git/post-checkout.args) &&
- flag=$(awk "{print \$3}" clone1/.git/post-checkout.args) &&
- test $old = $new -a $flag = 1
+ old=$(awk "{print \$1}" clone1/.git/post-checkout.args) &&
+ new=$(awk "{print \$2}" clone1/.git/post-checkout.args) &&
+ flag=$(awk "{print \$3}" clone1/.git/post-checkout.args) &&
+ test $old = $new -a $flag = 1
'
test_expect_success 'post-checkout runs as expected ' '
- GIT_DIR=clone1/.git git checkout master &&
- test -e clone1/.git/post-checkout.args
+ GIT_DIR=clone1/.git git checkout master &&
+ test -e clone1/.git/post-checkout.args
'
test_expect_success 'post-checkout args are correct with git checkout -b ' '
- GIT_DIR=clone1/.git git checkout -b new1 &&
- old=$(awk "{print \$1}" clone1/.git/post-checkout.args) &&
- new=$(awk "{print \$2}" clone1/.git/post-checkout.args) &&
- flag=$(awk "{print \$3}" clone1/.git/post-checkout.args) &&
- test $old = $new -a $flag = 1
+ GIT_DIR=clone1/.git git checkout -b new1 &&
+ old=$(awk "{print \$1}" clone1/.git/post-checkout.args) &&
+ new=$(awk "{print \$2}" clone1/.git/post-checkout.args) &&
+ flag=$(awk "{print \$3}" clone1/.git/post-checkout.args) &&
+ test $old = $new -a $flag = 1
'
test_expect_success 'post-checkout receives the right args with HEAD changed ' '
- GIT_DIR=clone2/.git git checkout new2 &&
- old=$(awk "{print \$1}" clone2/.git/post-checkout.args) &&
- new=$(awk "{print \$2}" clone2/.git/post-checkout.args) &&
- flag=$(awk "{print \$3}" clone2/.git/post-checkout.args) &&
- test $old != $new -a $flag = 1
+ GIT_DIR=clone2/.git git checkout new2 &&
+ old=$(awk "{print \$1}" clone2/.git/post-checkout.args) &&
+ new=$(awk "{print \$2}" clone2/.git/post-checkout.args) &&
+ flag=$(awk "{print \$3}" clone2/.git/post-checkout.args) &&
+ test $old != $new -a $flag = 1
'
test_expect_success 'post-checkout receives the right args when not switching branches ' '
- GIT_DIR=clone2/.git git checkout master b &&
- old=$(awk "{print \$1}" clone2/.git/post-checkout.args) &&
- new=$(awk "{print \$2}" clone2/.git/post-checkout.args) &&
- flag=$(awk "{print \$3}" clone2/.git/post-checkout.args) &&
- test $old = $new -a $flag = 0
+ GIT_DIR=clone2/.git git checkout master b &&
+ old=$(awk "{print \$1}" clone2/.git/post-checkout.args) &&
+ new=$(awk "{print \$2}" clone2/.git/post-checkout.args) &&
+ flag=$(awk "{print \$3}" clone2/.git/post-checkout.args) &&
+ test $old = $new -a $flag = 0
'
if test "$(git config --bool core.filemode)" = true; then
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 13/40] whitespace: remediate t5302-pack-index.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t5302-pack-index.sh | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
index f8fa924..18dd695 100755
--- a/t/t5302-pack-index.sh
+++ b/t/t5302-pack-index.sh
@@ -14,16 +14,16 @@ test_expect_success \
i=1 &&
while test $i -le 100
do
- iii=`printf '%03i' $i`
- test-genrandom "bar" 200 > wide_delta_$iii &&
- test-genrandom "baz $iii" 50 >> wide_delta_$iii &&
- test-genrandom "foo"$i 100 > deep_delta_$iii &&
- test-genrandom "foo"`expr $i + 1` 100 >> deep_delta_$iii &&
- test-genrandom "foo"`expr $i + 2` 100 >> deep_delta_$iii &&
- echo $iii >file_$iii &&
- test-genrandom "$iii" 8192 >>file_$iii &&
- git update-index --add file_$iii deep_delta_$iii wide_delta_$iii &&
- i=`expr $i + 1` || return 1
+ iii=`printf '%03i' $i`
+ test-genrandom "bar" 200 > wide_delta_$iii &&
+ test-genrandom "baz $iii" 50 >> wide_delta_$iii &&
+ test-genrandom "foo"$i 100 > deep_delta_$iii &&
+ test-genrandom "foo"`expr $i + 1` 100 >> deep_delta_$iii &&
+ test-genrandom "foo"`expr $i + 2` 100 >> deep_delta_$iii &&
+ echo $iii >file_$iii &&
+ test-genrandom "$iii" 8192 >>file_$iii &&
+ git update-index --add file_$iii deep_delta_$iii wide_delta_$iii &&
+ i=`expr $i + 1` || return 1
done &&
{ echo 101 && test-genrandom 100 8192; } >file_101 &&
git update-index --add file_101 &&
@@ -154,9 +154,9 @@ test_expect_success \
nr_099=`index_obj_nr 1.idx $sha1_099` &&
chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
- if=".git/objects/pack/pack-${pack1}.idx" \
- skip=$((4 + 256 * 4 + $nr_099 * 24)) \
- bs=1 count=20 conv=notrunc &&
+ if=".git/objects/pack/pack-${pack1}.idx" \
+ skip=$((4 + 256 * 4 + $nr_099 * 24)) \
+ bs=1 count=20 conv=notrunc &&
git cat-file blob $sha1_101 > file_101_foo1'
test_expect_success \
@@ -195,9 +195,9 @@ test_expect_success \
nr_099=`index_obj_nr 1.idx $sha1_099` &&
chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
- if=".git/objects/pack/pack-${pack1}.idx" \
- skip=$((8 + 256 * 4 + $nr_099 * 20)) \
- bs=1 count=20 conv=notrunc &&
+ if=".git/objects/pack/pack-${pack1}.idx" \
+ skip=$((8 + 256 * 4 + $nr_099 * 20)) \
+ bs=1 count=20 conv=notrunc &&
git cat-file blob $sha1_101 > file_101_foo2'
test_expect_success \
@@ -222,7 +222,7 @@ test_expect_success \
nr=`index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj` &&
chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
printf xxxx | dd of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
- bs=1 count=4 seek=$((8 + 256 * 4 + `wc -l <obj-list` * 20 + $nr * 4)) &&
+ bs=1 count=4 seek=$((8 + 256 * 4 + `wc -l <obj-list` * 20 + $nr * 4)) &&
( while read obj
do git cat-file -p $obj >/dev/null || exit 1
done <obj-list ) &&
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 15/40] whitespace: remediate t5400-send-pack.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t5400-send-pack.sh | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 0eace37..8e214b0 100755
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -77,7 +77,7 @@ test_expect_success 'refuse pushing rewound head without --force' '
'
test_expect_success \
- 'push can be used to delete a ref' '
+ 'push can be used to delete a ref' '
( cd victim && git branch extra master ) &&
git send-pack ./victim :extra master &&
( cd victim &&
@@ -187,7 +187,7 @@ test_expect_success 'pushing explicit refspecs respects forcing' '
(
cd child &&
git send-pack ../parent \
- +refs/heads/master:refs/heads/master
+ +refs/heads/master:refs/heads/master
) &&
parent_head=$(cd parent && git rev-parse --verify master) &&
child_head=$(cd child && git rev-parse --verify master) &&
@@ -200,14 +200,14 @@ test_expect_success 'pushing wildcard refspecs respects forcing' '
(
cd child &&
test_must_fail git send-pack ../parent \
- "refs/heads/*:refs/heads/*"
+ "refs/heads/*:refs/heads/*"
) &&
parent_head=$(cd parent && git rev-parse --verify master) &&
test "$parent_orig" = "$parent_head" &&
(
cd child &&
git send-pack ../parent \
- "+refs/heads/*:refs/heads/*"
+ "+refs/heads/*:refs/heads/*"
) &&
parent_head=$(cd parent && git rev-parse --verify master) &&
child_head=$(cd child && git rev-parse --verify master) &&
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 14/40] whitespace: remediate t5303-pack-corruption-resilience.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t5303-pack-corruption-resilience.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t5303-pack-corruption-resilience.sh b/t/t5303-pack-corruption-resilience.sh
index 5f6cd4f..b019b83 100755
--- a/t/t5303-pack-corruption-resilience.sh
+++ b/t/t5303-pack-corruption-resilience.sh
@@ -36,14 +36,14 @@ create_new_pack() {
blob_2=`git hash-object -t blob -w file_2` &&
blob_3=`git hash-object -t blob -w file_3` &&
pack=`printf "$blob_1\n$blob_2\n$blob_3\n" |
- git pack-objects $@ .git/objects/pack/pack` &&
+ git pack-objects $@ .git/objects/pack/pack` &&
pack=".git/objects/pack/pack-${pack}" &&
git verify-pack -v ${pack}.pack
}
do_repack() {
pack=`printf "$blob_1\n$blob_2\n$blob_3\n" |
- git pack-objects $@ .git/objects/pack/pack` &&
+ git pack-objects $@ .git/objects/pack/pack` &&
pack=".git/objects/pack/pack-${pack}"
}
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 10/40] whitespace: remediate t4010-diff-pathspec.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t4010-diff-pathspec.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh
index fbc8cd8..7e0e6cc 100755
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@ -6,8 +6,8 @@
test_description='Pathspec restrictions
Prepare:
- file0
- path1/file1
+ file0
+ path1/file1
'
. ./test-lib.sh
. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 11/40] whitespace: remediate t5300-pack-object.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t5300-pack-object.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 602806d..0370994 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -57,7 +57,7 @@ test_expect_success \
'(cd ../.git && find objects -type f -print) |
while read path
do
- cmp $path ../.git/$path || {
+ cmp $path ../.git/$path || {
echo $path differs.
return 1
}
@@ -87,7 +87,7 @@ test_expect_success \
'(cd ../.git && find objects -type f -print) |
while read path
do
- cmp $path ../.git/$path || {
+ cmp $path ../.git/$path || {
echo $path differs.
return 1
}
@@ -117,7 +117,7 @@ test_expect_success \
'(cd ../.git && find objects -type f -print) |
while read path
do
- cmp $path ../.git/$path || {
+ cmp $path ../.git/$path || {
echo $path differs.
return 1
}
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 08/40] whitespace: remediate t3406-rebase-message.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t3406-rebase-message.sh | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index fe5f936..f4bc0a8 100755
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -44,22 +44,22 @@ test_expect_success 'rebase -m' '
test_expect_success 'rebase --stat' '
git reset --hard start &&
- git rebase --stat master >diffstat.txt &&
- grep "^ fileX | *1 +$" diffstat.txt
+ git rebase --stat master >diffstat.txt &&
+ grep "^ fileX | *1 +$" diffstat.txt
'
test_expect_success 'rebase w/config rebase.stat' '
git reset --hard start &&
- git config rebase.stat true &&
- git rebase master >diffstat.txt &&
- grep "^ fileX | *1 +$" diffstat.txt
+ git config rebase.stat true &&
+ git rebase master >diffstat.txt &&
+ grep "^ fileX | *1 +$" diffstat.txt
'
test_expect_success 'rebase -n overrides config rebase.stat config' '
git reset --hard start &&
- git config rebase.stat true &&
- git rebase -n master >diffstat.txt &&
- ! grep "^ fileX | *1 +$" diffstat.txt
+ git config rebase.stat true &&
+ git rebase -n master >diffstat.txt &&
+ ! grep "^ fileX | *1 +$" diffstat.txt
'
test_done
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 06/40] whitespace: remediate t3040-subprojects-basic.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t3040-subprojects-basic.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t3040-subprojects-basic.sh b/t/t3040-subprojects-basic.sh
index f6973e9..a0e80b1 100755
--- a/t/t3040-subprojects-basic.sh
+++ b/t/t3040-subprojects-basic.sh
@@ -36,7 +36,7 @@ test_expect_success 'check if commit in a subproject detected' \
echo "all:" >>Makefile &&
echo " true" >>Makefile &&
git commit -q -a -m "make all" ) && {
- git diff-files --exit-code
+ git diff-files --exit-code
test $? = 1
}'
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 04/40] whitespace: remediate t1300-repo-config.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t1300-repo-config.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 3e140c1..b835552 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -588,7 +588,7 @@ test_expect_success bool '
do
git config --bool --get bool.true$i >>result
git config --bool --get bool.false$i >>result
- done &&
+ done &&
cmp expect result'
test_expect_success 'invalid bool (--get)' '
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 03/40] whitespace: remediate t1006-cat-file.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t1006-cat-file.sh | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index d8b7f2f..c78bf87 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -14,7 +14,7 @@ strlen () {
maybe_remove_timestamp () {
if test -z "$2"; then
- echo_without_newline "$1"
+ echo_without_newline "$1"
else
echo_without_newline "$(printf '%s\n' "$1" | sed -e 's/ [0-9][0-9]* [-+][0-9][0-9][0-9][0-9]$//')"
fi
@@ -36,11 +36,11 @@ $content"
'
test_expect_success "Type of $type is correct" '
- test $type = "$(git cat-file -t $sha1)"
+ test $type = "$(git cat-file -t $sha1)"
'
test_expect_success "Size of $type is correct" '
- test $size = "$(git cat-file -s $sha1)"
+ test $size = "$(git cat-file -s $sha1)"
'
test -z "$content" ||
@@ -48,54 +48,54 @@ $content"
expect="$(maybe_remove_timestamp "$content" $no_ts)"
actual="$(maybe_remove_timestamp "$(git cat-file $type $sha1)" $no_ts)"
- if test "z$expect" = "z$actual"
+ if test "z$expect" = "z$actual"
then
: happy
else
echo "Oops: expected $expect"
echo "but got $actual"
false
- fi
+ fi
'
test_expect_success "Pretty content of $type is correct" '
expect="$(maybe_remove_timestamp "$pretty_content" $no_ts)"
actual="$(maybe_remove_timestamp "$(git cat-file -p $sha1)" $no_ts)"
- if test "z$expect" = "z$actual"
+ if test "z$expect" = "z$actual"
then
: happy
else
echo "Oops: expected $expect"
echo "but got $actual"
false
- fi
+ fi
'
test -z "$content" ||
test_expect_success "--batch output of $type is correct" '
expect="$(maybe_remove_timestamp "$batch_output" $no_ts)"
actual="$(maybe_remove_timestamp "$(echo $sha1 | git cat-file --batch)" $no_ts)"
- if test "z$expect" = "z$actual"
+ if test "z$expect" = "z$actual"
then
: happy
else
echo "Oops: expected $expect"
echo "but got $actual"
false
- fi
+ fi
'
test_expect_success "--batch-check output of $type is correct" '
expect="$sha1 $type $size"
actual="$(echo_without_newline $sha1 | git cat-file --batch-check)"
- if test "z$expect" = "z$actual"
+ if test "z$expect" = "z$actual"
then
: happy
else
echo "Oops: expected $expect"
echo "but got $actual"
false
- fi
+ fi
'
}
@@ -184,7 +184,7 @@ test_expect_success "--batch-check for a non-existent hash" '
test "0000000000000000000000000000000000000042 missing
0000000000000000000000000000000000000084 missing" = \
"$( ( echo 0000000000000000000000000000000000000042;
- echo_without_newline 0000000000000000000000000000000000000084; ) \
+ echo_without_newline 0000000000000000000000000000000000000084; ) \
| git cat-file --batch-check)"
'
@@ -193,7 +193,7 @@ test_expect_success "--batch for an existent and a non-existent hash" '
$tag_content
0000000000000000000000000000000000000000 missing" = \
"$( ( echo $tag_sha1;
- echo_without_newline 0000000000000000000000000000000000000000; ) \
+ echo_without_newline 0000000000000000000000000000000000000000; ) \
| git cat-file --batch)"
'
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 02/40] whitespace: remediate t1001-read-tree-m-2way.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t1001-read-tree-m-2way.sh | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh
index acaab07..141a35a 100755
--- a/t/t1001-read-tree-m-2way.sh
+++ b/t/t1001-read-tree-m-2way.sh
@@ -14,11 +14,11 @@ all the combinations described in the two-tree merge "carry forward"
rules, found in <Documentation/git read-tree.txt>.
In the test, these paths are used:
- bozbar - in H, stays in M, modified from bozbar to gnusto
- frotz - not in H added in M
- nitfol - in H, stays in M unmodified
- rezrov - in H, deleted in M
- yomin - not in H nor M
+ bozbar - in H, stays in M, modified from bozbar to gnusto
+ frotz - not in H added in M
+ nitfol - in H, stays in M unmodified
+ rezrov - in H, deleted in M
+ yomin - not in H nor M
'
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 01/40] test-cleaner: automate whitespace cleaning of test scripts
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620119-18369-1-git-send-email-jon.seymour@gmail.com>
This script allows the automated cleaning of test scripts.
Any whitespace fixups of a test script that do not effect the
exit status or output of the test are assumed to be safe
and are automatically committed.
To check the tests for whitespace issues, change into git's
test directory and run:
test-cleaner.sh check-whitespace t*.sh
This will:
* write one line of the form:
AUTO<tab><filename>
for each file that can be fixed automatically.
* write one line of the form:
MANUAL<tab><filename>
for each file that will require manual intervention to fix.
To fix all the automatically correctable errors, run:
./test-cleaner.sh fix-whitespace-auto t[0-9]*.sh
To generate commits for all the errors that require manual correction, run:
./test-cleaner.sh fix-whitespace-manual t[0-9]*.sh
To clean a file without running tests or generating commits, run:
./test-cleaner.sh clean-whitespace foobar.sh
clean-whitespace can be used with files that are not tests.
If no arguments are supplied, file arguments are read from stdin.
The filter itself can be run with:
./test-cleaner.sh whitespace-filter < file > some-other-file
The resulting series of commits should rebased on both the git master
and pu branches. Commits that cause merge conflicts should be purged
from the series.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/test-cleaner.sh | 185 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 185 insertions(+), 0 deletions(-)
create mode 100755 t/test-cleaner.sh
diff --git a/t/test-cleaner.sh b/t/test-cleaner.sh
new file mode 100755
index 0000000..9eb260b
--- /dev/null
+++ b/t/test-cleaner.sh
@@ -0,0 +1,185 @@
+#!/bin/sh
+
+USAGE="test-cleaner.sh
+ check-whitespace [<test-file> ...] - report on test files that need cleaning
+ fix_whitespace [<test-file> ...] - generate commits for files that need white space cleaning
+ fix-whitespace-auto [<test-file> ...] - generate commits for files that can be automatically cleaned
+ fix-whitespace-manual [<test-file> ...] - generate commits for files that need manual cleaning
+ clean-whitespace [<file> ...] - applying the cleaner to the specified file without running tests or generating commits
+"
+SUBDIRECTORY_OK=t
+. "$(git --exec-path)/git-sh-setup"
+require_clean_work_tree
+
+cleaner()
+{
+ expand -i | unexpand --first-only | sed "s/ *\$//"
+}
+
+clean_whitespace()
+{
+ rc=0
+ list_files "$@" | while read file
+ do
+ cleaner <"$file" >$$.tmp &&
+ cat $$.tmp >"$file" || rc=1
+ rm -f $$.tmp
+ test $rc = 0
+ done || exit $?
+}
+
+list_files()
+{
+ if test $# -gt 0
+ then
+ for arg in "$@"; do
+ echo $arg
+ done
+ else
+ cat
+ fi
+}
+
+fix_whitespace_auto()
+{
+ check_whitespace "$@" 2>/dev/null | grep "^AUTO" | fix_whitespace
+}
+
+fix_whitespace_auto()
+{
+ check_whitespace "$@" 2>/dev/null | grep "^MANUAL" | fix_whitespace
+}
+
+fix_whitespace()
+{
+ rc=0
+ check_whitespace "$@" 2>/dev/null | while read status file
+ do
+ case "$status" in
+ AUTO)
+ if clean_whitespace "$file" &&
+ git diff --exit-code -w -- "$file" >/dev/null
+ git add "$file" &&
+ git diff --exit-code -w HEAD -- "$file" >/dev/null
+ then
+ git commit -F - 1>&2 <<EOF
+whitespace: remediate $file
+
+This file was edited by applying:
+
+ expand -i | unexpand --first-only | sed "s/ *\$//"
+
+to the file.
+
+No change to test outputs or status code was observed.
+
+Signed-off-by: $(git config user.name) <$(git config user.email)>
+EOF
+ echo "$status $file"
+ else
+ rc=1
+ fi
+ rm -f $$.tmp
+ ;;
+ MANUAL)
+ CLEANER_PREFIX=fixer.
+ check_whitespace "$file" >/dev/null 2>$$.err
+ if clean_whitespace "$file" &&
+ git diff --exit-code -w -- "$file" >/dev/null
+ git add "$file" &&
+ git diff --exit-code -w HEAD -- "$file" >/dev/null
+ then
+ git commit -F - 1>&2 <<EOF
+FAILED: whitespace: remediate $file
+
+This file was edited by applying:
+
+ expand -i | unexpand --first-only | sed "s/ *\$//"
+
+to the file.
+
+The following errors were observed:
+
+$(cat $$.err | sed "s/^/ /")
+
+These errors should be fixed before submitting this patch upstream.
+
+Signed-off-by: $(git config user.name) <$(git config user.email)>
+EOF
+ echo "$status $file"
+ else
+ rc=1
+ fi
+ rm -f $$.tmp $$.err
+ ;;
+ *)
+ die "fix-whitespace failed on $file with unexpected output"
+ ;;
+ esac
+ test "$rc" = 0
+ done || rc=$?
+ test "$rc" = 0
+}
+
+check_whitespace()
+{
+ list_files "$@" | while read file
+ do
+ cleaner <"$file" >$$.${CLEANER_PREFIX}edited &&
+ cmp "$file" $$.${CLEANER_PREFIX}edited 1>/dev/null
+ rc=$?
+ if test $rc != 0
+ then
+ sh $file >$$.${CLEANER_PREFIX}before.output 2>$$.${CLEANER_PREFIX}before.error </dev/null
+ echo $? > $$.${CLEANER_PREFIX}before.exit
+ sh ./$$.${CLEANER_PREFIX}edited >$$.${CLEANER_PREFIX}after.output 2>$$.${CLEANER_PREFIX}after.error </dev/null
+ echo $? > $$.${CLEANER_PREFIX}after.exit
+
+ if cmp $$.${CLEANER_PREFIX}before.output $$.${CLEANER_PREFIX}after.output 1>/dev/null &&
+ cmp $$.${CLEANER_PREFIX}before.error $$.${CLEANER_PREFIX}after.error 1>/dev/null &&
+ cmp $$.${CLEANER_PREFIX}before.exit $$.${CLEANER_PREFIX}after.exit 1>/dev/null
+ then
+ echo "AUTO $file"
+ else
+ echo "MANUAL $file"
+ diff -u $$.${CLEANER_PREFIX}before.output $$.${CLEANER_PREFIX}after.output 1>&2
+ diff -u $$.${CLEANER_PREFIX}before.error $$.${CLEANER_PREFIX}after.error 1>&2
+ diff -u $$.${CLEANER_PREFIX}before.exit $$.${CLEANER_PREFIX}after.exit 1>&2
+ fi
+ looprc=1
+ fi
+ rm -f $$.${CLEANER_PREFIX}edited $$.${CLEANER_PREFIX}after.* $$.${CLEANER_PREFIX}before.*
+ test "$looprc" = 0
+ done
+}
+
+case $# in
+0)
+ usage ;;
+*)
+ cmd=$1
+ shift
+ case "$cmd" in
+ check-whitespace)
+ check_whitespace "$@"
+ ;;
+ fix-whitespace)
+ fix_whitespace "$@"
+ ;;
+ fix-whitespace-auto)
+ fix_whitespace_auto "$@"
+ ;;
+ fix-whitespace-manual)
+ fix_whitespace_manual "$@"
+ ;;
+ clean-whitespace)
+ clean_whitespace "$@"
+ ;;
+ whitespace-filter)
+ cleaner
+ ;;
+ *)
+ usage
+ ;;
+ esac
+esac
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 00/40] test whitespace - perform trivial whitespace clean ups of test scripts.
From: Jon Seymour @ 2011-08-06 8:41 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
The series applies cleanly to both master and pu.
The first patch contains a script, t/test-cleaner.sh, that can automate whitespace cleanup of tests.
The remaining patches are the result of running the example.
For example:
cd t
./test-cleaner.sh fix-whitespace-auto t[0-9]*.sh
will:
* identify test scripts with trivial white space errors
* edit the test to remove the trivial white space errors
* verify that edited test produces same outputs, errors and exit code
* creates a single commit for the edited test
fix-whitespace-manual will do the same for tests that are broken by the edit.
In this case, the commit message is prefixed with FAILED:
These scripts rely on the existence of expand and unexpand on the PATH.
Jon Seymour (40):
test-cleaner: automate whitespace cleaning of test scripts
whitespace: remediate t1001-read-tree-m-2way.sh
whitespace: remediate t1006-cat-file.sh
whitespace: remediate t1300-repo-config.sh
whitespace: remediate t1503-rev-parse-verify.sh
whitespace: remediate t3040-subprojects-basic.sh
whitespace: remediate t3200-branch.sh
whitespace: remediate t3406-rebase-message.sh
whitespace: remediate t4002-diff-basic.sh
whitespace: remediate t4010-diff-pathspec.sh
whitespace: remediate t5300-pack-object.sh
whitespace: remediate t5301-sliding-window.sh
whitespace: remediate t5302-pack-index.sh
whitespace: remediate t5303-pack-corruption-resilience.sh
whitespace: remediate t5400-send-pack.sh
whitespace: remediate t5402-post-merge-hook.sh
whitespace: remediate t5403-post-checkout-hook.sh
whitespace: remediate t5510-fetch.sh
whitespace: remediate t6002-rev-list-bisect.sh
whitespace: remediate t6005-rev-list-count.sh
whitespace: remediate t6030-bisect-porcelain.sh
whitespace: remediate t7003-filter-branch.sh
whitespace: remediate t7004-tag.sh
whitespace: remediate t7403-submodule-sync.sh
whitespace: remediate t7500-commit.sh
whitespace: remediate t7810-grep.sh
whitespace: remediate t9100-git-svn-basic.sh
whitespace: remediate t9104-git-svn-follow-parent.sh
whitespace: remediate t9107-git-svn-migrate.sh
whitespace: remediate t9108-git-svn-glob.sh
whitespace: remediate t9109-git-svn-multi-glob.sh
whitespace: remediate t9110-git-svn-use-svm-props.sh
whitespace: remediate t9118-git-svn-funky-branch-names.sh
whitespace: remediate t9125-git-svn-multi-glob-branch-names.sh
whitespace: remediate t9400-git-cvsserver-server.sh
whitespace: remediate t9401-git-cvsserver-crlf.sh
whitespace: remediate t9500-gitweb-standalone-no-errors.sh
whitespace: remediate t9603-cvsimport-patchsets.sh
whitespace: remediate t1000-read-tree-m-3way.sh
whitespace: remediate t6120-describe.sh
t/t1000-read-tree-m-3way.sh | 12 +-
t/t1001-read-tree-m-2way.sh | 10 +-
t/t1006-cat-file.sh | 26 ++--
t/t1300-repo-config.sh | 2 +-
t/t1503-rev-parse-verify.sh | 10 +-
t/t3040-subprojects-basic.sh | 2 +-
t/t3200-branch.sh | 30 +++---
t/t3406-rebase-message.sh | 16 ++--
t/t4002-diff-basic.sh | 4 +-
t/t4010-diff-pathspec.sh | 4 +-
t/t5300-pack-object.sh | 6 +-
t/t5301-sliding-window.sh | 6 +-
t/t5302-pack-index.sh | 34 +++---
t/t5303-pack-corruption-resilience.sh | 4 +-
t/t5400-send-pack.sh | 8 +-
t/t5402-post-merge-hook.sh | 12 +-
t/t5403-post-checkout-hook.sh | 46 ++++----
t/t5510-fetch.sh | 16 ++--
t/t6002-rev-list-bisect.sh | 2 +-
t/t6005-rev-list-count.sh | 6 +-
t/t6030-bisect-porcelain.sh | 14 +-
t/t6120-describe.sh | 8 +-
t/t7003-filter-branch.sh | 2 +-
t/t7004-tag.sh | 4 +-
t/t7403-submodule-sync.sh | 2 +-
t/t7500-commit.sh | 2 +-
t/t7810-grep.sh | 2 +-
t/t9100-git-svn-basic.sh | 26 ++--
t/t9104-git-svn-follow-parent.sh | 88 +++++++-------
t/t9107-git-svn-migrate.sh | 14 +-
t/t9108-git-svn-glob.sh | 16 ++--
t/t9109-git-svn-multi-glob.sh | 20 ++--
t/t9110-git-svn-use-svm-props.sh | 4 +-
t/t9118-git-svn-funky-branch-names.sh | 6 +-
t/t9125-git-svn-multi-glob-branch-names.sh | 6 +-
t/t9400-git-cvsserver-server.sh | 6 +-
t/t9401-git-cvsserver-crlf.sh | 12 +-
t/t9500-gitweb-standalone-no-errors.sh | 4 +-
t/t9603-cvsimport-patchsets.sh | 6 +-
t/test-cleaner.sh | 185 ++++++++++++++++++++++++++++
40 files changed, 434 insertions(+), 249 deletions(-)
create mode 100755 t/test-cleaner.sh
--
1.7.6.362.gf0e6
^ permalink raw reply
* Re: [PATCH 2/2] On Cygwin support both UNIX and DOS style path-names
From: Pascal Obry @ 2011-08-06 7:01 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Theo Niessink
In-Reply-To: <7vipqb3g1w.fsf@alter.siamese.dyndns.org>
Le 05/08/2011 19:48, Junio C Hamano a écrit :
> I wonder if these two that are the same as mingw should further be
> consolidated into one implementation, something like below.
Fine with me.
--
--|------------------------------------------------------
--| Pascal Obry Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--| http://www.obry.net - http://v2p.fr.eu.org
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver keys.gnupg.net --recv-key F949BD3B
^ permalink raw reply
* Re: [RFC/PATCH 0/5] macro-based key/value maps
From: Jeff King @ 2011-08-06 6:30 UTC (permalink / raw)
To: René Scharfe; +Cc: Junio C Hamano, git
In-Reply-To: <4E3C0CD9.4020902@lsrfire.ath.cx>
On Fri, Aug 05, 2011 at 05:31:37PM +0200, René Scharfe wrote:
> Am 05.08.2011 13:03, schrieb Jeff King:
> > Commits 1, 4, and 5 introduce infrastructure in the form of static
> > functions and macros that contain functions that call the statics. But
> > they don't actually instantiate the macro functions themselves, so
> > they won't compile with -Werror (due to the "unused static" warning)
> > until there is some calling code.
> >
> > That hurts bisectability a little if you compile with -Werror (you
> > need to add -Wno-error=unused-function). I don't know how much we
> > care.
>
> I don't know either, but you could avoid the issue by adding a test-maps
> command in the first patch and exercising the new functionality a bit.
Yes, but then the final git executable carries around dead code for the
test map and cache types. There are ways to split the macros versus
their instantiation so that the test instantiations only live in the
test-map program, but then that would bring back the "static is not
used" error.
Maybe carrying the dead code isn't that big a deal. It's not that much
extra code.
-Peff
^ permalink raw reply
* Re: [PATCH 00/48] Handling more corner cases in merge-recursive.c
From: Junio C Hamano @ 2011-08-06 5:22 UTC (permalink / raw)
To: Elijah Newren; +Cc: git, jgfouca
In-Reply-To: <CABPp-BFx38gLQDn0sccp74Z=RtEVzaxWiVqopxkWwXTSGuYxxw@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
> On Thu, Aug 4, 2011 at 1:03 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Elijah Newren <newren@gmail.com> writes:
>>
>>> ... It
>>> would be nice to make use of the original index we had before
>>> unpacking, but that is overwritten at the end of unpack_trees.
>>
>> I somehow thought that we can give separate src and dst index
>> to the unpack_tree() machinery these days. Aren't you using it?
>
> Ah, yes, it appears to be possible.
But why do you care about the original index (i.e. the starting state of
our side) in the first place? If your algorithm depends on the original
index, wouldn't that mean you would screw up the same merge if the user
merged branches in the opposite direction?
I think the fact you have a path "two" at stage 0, combined with the two
diffs you ran for rename detection between the common ancestor and two
branches, should be enough to decide if one branch added the path or moved
it from elsewhere (in which case the common ancestor would not have that
path), or it kept the path at the original place (with or without content
change), no?
^ permalink raw reply
* Re: [PATCH] git-send-email: Add AUTH LOGIN support
From: Joe Perches @ 2011-08-06 5:21 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Graham Barr
In-Reply-To: <7vzkjn16n6.fsf@alter.siamese.dyndns.org>
On Fri, 2011-08-05 at 21:54 -0700, Junio C Hamano wrote:
> Joe Perches <joe@perches.com> writes:
> > The current perl Net::SMTP support will not use AUTH LOGIN
> > when other authentication options are available.
> Even after reading this excuse,...
> > + if (defined $smtp_auth && $smtp_auth =~ /^login$/i) {
> > +
> > + $smtp->datasend("AUTH LOGIN\n");
> > + $smtp->response();
> > + $smtp->datasend(encode_base64("$smtp_authuser"));
> > + $smtp->response();
> > + $smtp->datasend(encode_base64("$smtp_authpass"));
> > + $smtp->response();
> > +
> > + } else {
> > +
> > + $auth ||= $smtp->auth( $smtp_authuser, $smtp_authpass ) or die $smtp->message;
> > + }
> ... this makes me feel dirty X-(. Not the desire to force "AUTH LOGIN",
> but the implementation to hand-roll the protocol exchange.
> I'd rather want to know _why_ Net::SMTP does not support it in the first
> place, and what it does for "other authentication options" that are
> available. Does it try them in turn until it finds the one that works? Why
> doesn't it fall back on "AUTH LOGIN" then?
> Specifically, if there is a reason to avoid this plaintext authentication
> method when other options are _available_ (which presumably would be the
> reason why Net::SMTP chooses not to support it), and if there is a reason
> on the user's side to _force_ this method even when people who wrote
> Net::SMTP does not recommend it be used, wouldn't it be natural to expect
> that there should be a way to configure the connection to use it, without
> resorting to coding the protocol exchange by hand line this?
I needed something now.
You are right but I believe it would take too long
to get updates to Net::SMTP in place. Doing this
admitted ugliness in git-send-email works for me and
seems to me to be appropriate for now.
I looked, there isn't a method to force a particular
AUTH type documented. I also didn't care to rewrite
Net::SMTP right now. This "works for me"...
> It probably is not as simple as installing Authen::SASL::*::LOGIN, but
> still...
cheers, Joe
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox