Re: [PATCH 0/25] detecting &&-chain breakage

Subsystems: the rest

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH 0/25] detecting &&-chain breakage

From: Junio C Hamano <hidden>
Date: 2016-06-15 23:04:13

Junio C Hamano [off-list ref] 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 <redacted>
---
 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

Re: [PATCH 0/25] detecting &&-chain breakage

From: Jeff King <hidden>
Date: 2016-06-15 23:04:13

On Fri, Mar 20, 2015 at 11:00:05AM -0700, Junio C Hamano wrote:
Junio C Hamano [off-list ref] writes:
quoted
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.
Heh, I just crossed emails with you over the same patch.
... and this goes on top of jk/prune-with-corrupt-refs until it is
rerolled.
I'm actually about to send out a re-roll of that, as I think all of the
review comments have been addressed.

-Peff
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help