* [PATCH] p5310: mend broken &&-chain
@ 2015-07-10 20:40 René Scharfe
2015-07-10 20:50 ` Jeff King
0 siblings, 1 reply; 3+ messages in thread
From: René Scharfe @ 2015-07-10 20:40 UTC (permalink / raw)
To: Git Mailing List; +Cc: Junio C Hamano, Jeff King
Signed-off-by: Rene Scharfe <l.s.r@web.de>
---
GIT_TEST_CHAIN_LINT complains about the missing &&s and is enabled
by default now.
t/perf/p5310-pack-bitmaps.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/perf/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh
index f8ed857..de2a224 100755
--- a/t/perf/p5310-pack-bitmaps.sh
+++ b/t/perf/p5310-pack-bitmaps.sh
@@ -39,14 +39,14 @@ test_expect_success 'create partial bitmap state' '
# now kill off all of the refs and pretend we had
# just the one tip
- rm -rf .git/logs .git/refs/* .git/packed-refs
- git update-ref HEAD $cutoff
+ rm -rf .git/logs .git/refs/* .git/packed-refs &&
+ git update-ref HEAD $cutoff &&
# and then repack, which will leave us with a nice
# big bitmap pack of the "old" history, and all of
# the new history will be loose, as if it had been pushed
# up incrementally and exploded via unpack-objects
- git repack -Ad
+ git repack -Ad &&
# and now restore our original tip, as if the pushes
# had happened
--
2.4.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] p5310: mend broken &&-chain
2015-07-10 20:40 [PATCH] p5310: mend broken &&-chain René Scharfe
@ 2015-07-10 20:50 ` Jeff King
2015-07-11 0:50 ` René Scharfe
0 siblings, 1 reply; 3+ messages in thread
From: Jeff King @ 2015-07-10 20:50 UTC (permalink / raw)
To: René Scharfe; +Cc: Git Mailing List, Junio C Hamano
On Fri, Jul 10, 2015 at 10:40:57PM +0200, René Scharfe wrote:
> diff --git a/t/perf/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh
> index f8ed857..de2a224 100755
> --- a/t/perf/p5310-pack-bitmaps.sh
> +++ b/t/perf/p5310-pack-bitmaps.sh
> @@ -39,14 +39,14 @@ test_expect_success 'create partial bitmap state' '
>
> # now kill off all of the refs and pretend we had
> # just the one tip
> - rm -rf .git/logs .git/refs/* .git/packed-refs
> - git update-ref HEAD $cutoff
> + rm -rf .git/logs .git/refs/* .git/packed-refs &&
> + git update-ref HEAD $cutoff &&
Thanks, this definitely is a problem, but we already have a fix in the
sb/p5310-and-chain topic. I thought that had been merged-up, but it
looks like it is only in "next" right now.
-Peff
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-11 7:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-10 20:40 [PATCH] p5310: mend broken &&-chain René Scharfe
2015-07-10 20:50 ` Jeff King
2015-07-11 0:50 ` René Scharfe
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).