Junio C Hamano <gits...@pobox.com> writes:

> I found 2026 and 5312 to be broken (there may be others that are
> excluded in my usual test set) in 'pu'.  As to these topics in "git
> log --first-parent master..pu", my preference is to queue fixups on
> the broken-out topics (available at http://github.com/gitster/git)
> independently.
>
> For example, this will go on top of nd/multiple-work-trees.

... and this goes on top of jk/prune-with-corrupt-refs until it is
rerolled.

-- >8 --
Subject: [PATCH] SQUASH??? t5312: fix broken &&-chain

Signed-off-by: Junio C Hamano <gits...@pobox.com>
---
 t/t5312-prune-corruption.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t5312-prune-corruption.sh b/t/t5312-prune-corruption.sh
index 8b54d16..9633d97 100755
--- a/t/t5312-prune-corruption.sh
+++ b/t/t5312-prune-corruption.sh
@@ -80,7 +80,7 @@ test_expect_success 'pack-refs does not silently delete 
broken loose ref' '
 # skip processing a broken ref
 test_expect_success 'create packed-refs file with broken ref' '
        rm -f .git/refs/heads/master &&
-       cat >.git/packed-refs <<-EOF
+       cat >.git/packed-refs <<-EOF &&
        $missing refs/heads/master
        $recoverable refs/heads/other
        EOF
-- 
2.3.3-401-g402122f

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to