Junio C Hamano wrote:
> As I have said in the recent What's cooking reports, the original
> posted here were based on older codebase and needed to be rebased,
> but it had some conflicts and I wanted to see the result double
> checked by the original author before we can merge it to 'next',
> cooked there and hopefully merged to 'master' before tagging -rc1.
>
> So here is the series that has been queued in 'pu' for the past
> several days.
>
> Felipe, can you double check it?
These patches don't help much, I did and interdiff with my own fixes and this
is the result:
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 284bf3f..aa3e223 100755
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -221,13 +221,16 @@ test_expect_success 'push update refs failure' '
'
clean_mark () {
- cut -f 2 -d ' ' $1 | git cat-file --batch-check | grep commit | sort > $(basename $1)
+ cut -f 2 -d ' ' "$1" |
+ git cat-file --batch-check |
+ grep commit |
+ sort >$(basename "$1")
}
cmp_marks () {
test_when_finished "rm -rf git.marks testgit.marks" &&
- clean_mark .git/testgit/$1/git.marks &&
- clean_mark .git/testgit/$1/testgit.marks &&
+ clean_mark ".git/testgit/$1/git.marks" &&
+ clean_mark ".git/testgit/$1/testgit.marks" &&
test_cmp git.marks testgit.marks
}
@@ -244,7 +247,7 @@ test_expect_success 'proper failure checks for fetching' '
test_expect_success 'proper failure checks for pushing' '
(cd local &&
git checkout -b crash master &&
- echo crash >> file &&
+ echo crash >>file &&
git commit -a -m crash &&
test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all &&
cmp_marks origin
I don't like it, but it's OK.
--
Felipe Contreras
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html