Re: [PATCH v3 1/1] bisect: add support for bisecting bare repositories

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

Re: [PATCH v3 1/1] bisect: add support for bisecting bare repositories

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:51:46

Jon Seymour [off-list ref] writes:
This extension to js/bisect-no-checkout adds support for bisecting bare repositories.

It does this by relaxing the requirement that git bisect is invoked in a repository with a working tree and by defaulting to --no-checkout in the case of a bare repository.

Two tests are included to demonstrate this behaviour.
I'd wrap the long line myself but next time please be careful.
quoted hunk
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 4fb7d11..62125ec 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -592,6 +592,37 @@ test_expect_success 'erroring out when using bad path parameters' '
 	grep "bad path parameters" error.txt
 '
 
+test_expect_success 'test bisection on bare repo - --no-checkout specified' '
+	git clone --bare . bare.nocheckout &&
+	(
+		cd bare.nocheckout &&
+		git bisect start --no-checkout &&
+		git bisect good $HASH1 &&
+		git bisect bad $HASH4 &&
+		git bisect run eval \
+			"test \$(git rev-list BISECT_HEAD ^$HASH2 --max-count=1 | wc -l) = 0" \
+			>../nocheckout.log &&
+		git bisect reset
+	) &&
+	grep "$HASH3 is the first bad commit" nocheckout.log
+'
git-bisect does not have any cd_to_toplevel so with a working tree you can
run a bisection from a subdirectory, it seems. I wonder what would happen
if you did "cd bare.nocheckout/objects" or something silly like that.

Just wondering...

Re: [PATCH v3 1/1] bisect: add support for bisecting bare repositories

From: Jon Seymour <hidden>
Date: 2016-06-15 22:51:46

On Wed, Aug 10, 2011 at 3:26 AM, Junio C Hamano [off-list ref] wrote:
Jon Seymour [off-list ref] writes:
quoted
This extension to js/bisect-no-checkout adds support for bisecting bare repositories.

It does this by relaxing the requirement that git bisect is invoked in a repository with a working tree and by defaulting to --no-checkout in the case of a bare repository.

Two tests are included to demonstrate this behaviour.
I'd wrap the long line myself but next time please be careful.
quoted
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 4fb7d11..62125ec 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -592,6 +592,37 @@ test_expect_success 'erroring out when using bad path parameters' '
      grep "bad path parameters" error.txt
 '

+test_expect_success 'test bisection on bare repo - --no-checkout specified' '
+     git clone --bare . bare.nocheckout &&
+     (
+             cd bare.nocheckout &&
+             git bisect start --no-checkout &&
+             git bisect good $HASH1 &&
+             git bisect bad $HASH4 &&
+             git bisect run eval \
+                     "test \$(git rev-list BISECT_HEAD ^$HASH2 --max-count=1 | wc -l) = 0" \
+                     >../nocheckout.log &&
+             git bisect reset
+     ) &&
+     grep "$HASH3 is the first bad commit" nocheckout.log
+'
git-bisect does not have any cd_to_toplevel so with a working tree you can
run a bisection from a subdirectory, it seems. I wonder what would happen
if you did "cd bare.nocheckout/objects" or something silly like that.

Just wondering...
Well, nothing obviously breaks...

expecting success:
	git clone --bare . bare.silly &&
	(
		cd bare.silly/objects &&
		git bisect start &&
		git bisect good $HASH1 &&
		git bisect bad $HASH4 &&
		git bisect run eval \
			"test \$(git rev-list BISECT_HEAD ^$HASH2 --max-count=1 | wc -l) = 0" \
			>../../silly.log &&
		git bisect reset
	) &&
	grep "$HASH3 is the first bad commit" silly.log

Cloning into bare repository bare.silly...
done.
Bisecting: 0 revisions left to test after this (roughly 1 step)
[3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for
git> into <hello>.
3de952f2416b6084f557ec417709eac740c6818c is the first bad commit
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help