Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH v8 3/5] bisect: simplify the addition of new bisect terms

From: Matthieu Moy <hidden>
Date: 2016-06-15 23:05:30

Junio C Hamano [off-list ref] writes:
Matthieu Moy [off-list ref] writes:
quoted
diff --git a/bisect.c b/bisect.c
index 2d3dbdc..08be634 100644
--- a/bisect.c
+++ b/bisect.c
@@ -747,7 +747,10 @@ static void handle_bad_merge_base(void)
 				"between %s and [%s].\n",
 				bad_hex, bad_hex, good_hex);
 		} else {
-			die("BUG: terms %s/%s not managed", name_bad, name_good);
+			fprintf(stderr, "The merge base %s is %s.\n"
+				"This means the first commit marked %s is "
+				"between %s and [%s].\n",
+				bad_hex, name_bad, name_bad, bad_hex, good_hex);
Indeed, I forgot to apply the previous remark. Fixed.
-		if (!strcmp(name_bad, "bad")) {
+		if (!strcmp(name_bad, "bad") && !strcmp(name_good, "good") {
Indeed. Applied.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help