Thanks. They applied cleanly on 'master' and all looked sensible.
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.
diff --git a/t/t2026-prune-linked-checkouts.sh
b/t/t2026-prune-linked-checkouts.sh
index 2936d52..e885baf 100755
--- a/t/t2026-prune-linked-checkouts.sh
+++ b/t/t2026-prune-linked-checkouts.sh
@@ -65,7 +65,7 @@ test_expect_success 'prune directories with gitdir pointing
to nowhere' '
'
test_expect_success 'not prune locked checkout' '
- test_when_finished rm -r .git/worktrees
+ test_when_finished rm -r .git/worktrees &&
mkdir -p .git/worktrees/ghi &&
: >.git/worktrees/ghi/locked &&
git prune --worktrees &&
@@ -73,7 +73,7 @@ test_expect_success 'not prune locked checkout' '
'
test_expect_success 'not prune recent checkouts' '
- test_when_finished rm -r .git/worktrees
+ test_when_finished rm -r .git/worktrees &&
mkdir zz &&
mkdir -p .git/worktrees/jlm &&
echo "$(pwd)"/zz >.git/worktrees/jlm/gitdir &&
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
