git-bisect: call the found commit "*the* first bad commit"
Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nanako Shiraishi committed
Aug 26, 2009 at 17:38 UTC
21d0bc2f9a5bcbee2593e9f2ad05d64d3dcf3a0e
3 files changed
+11
-11
bisect.c
+1
-1
@@ -991,7 +991,7 @@ int bisect_next_all(const char *prefix)
991
992
if (!hashcmp(bisect_rev, current_bad_sha1)) {
993
exit_if_skipped_commits(tried, current_bad_sha1);
994
- printf("%s is first bad commit\n", bisect_rev_hex);
994
+ printf("%s is the first bad commit\n", bisect_rev_hex);
995
show_diff_tree(prefix, revs.commits->item);
996
/* This means the bisection process succeeded. */
997
exit(10);
git-bisect.sh
+1
-1
@@ -405,7 +405,7 @@ bisect_run () {
405
exit $res
406
fi
407
408
- if grep "is first bad commit" "$GIT_DIR/BISECT_RUN" > /dev/null; then
408
+ if grep "is the first bad commit" "$GIT_DIR/BISECT_RUN" > /dev/null; then
409
echo "bisect run success"
410
exit 0;
411
fi
t/t6030-bisect-porcelain.sh
+9
-9
@@ -175,7 +175,7 @@ test_expect_success 'bisect skip: successfull result' '
175
git bisect start $HASH4 $HASH1 &&
176
git bisect skip &&
177
git bisect bad > my_bisect_log.txt &&
178
- grep "$HASH2 is first bad commit" my_bisect_log.txt &&
178
+ grep "$HASH2 is the first bad commit" my_bisect_log.txt &&
179
git bisect reset
180
'
181
@@ -261,7 +261,7 @@ test_expect_success \
261
git bisect good $HASH1 &&
262
git bisect bad $HASH4 &&
263
git bisect run ./test_script.sh > my_bisect_log.txt &&
264
- grep "$HASH3 is first bad commit" my_bisect_log.txt &&
264
+ grep "$HASH3 is the first bad commit" my_bisect_log.txt &&
265
git bisect reset'
266
267
# We want to automatically find the commit that
@@ -274,7 +274,7 @@ test_expect_success \
274
chmod +x test_script.sh &&
275
git bisect start $HASH4 $HASH1 &&
276
git bisect run ./test_script.sh > my_bisect_log.txt &&
277
- grep "$HASH4 is first bad commit" my_bisect_log.txt &&
277
+ grep "$HASH4 is the first bad commit" my_bisect_log.txt &&
278
git bisect reset'
279
280
# $HASH1 is good, $HASH5 is bad, we skip $HASH3
@@ -287,14 +287,14 @@ test_expect_success 'bisect skip: add line and then a new test' '
287
git bisect start $HASH5 $HASH1 &&
288
git bisect skip &&
289
git bisect good > my_bisect_log.txt &&
290
- grep "$HASH5 is first bad commit" my_bisect_log.txt &&
290
+ grep "$HASH5 is the first bad commit" my_bisect_log.txt &&
291
git bisect log > log_to_replay.txt &&
292
git bisect reset
293
'
294
295
test_expect_success 'bisect skip and bisect replay' '
296
git bisect replay log_to_replay.txt > my_bisect_log.txt &&
297
- grep "$HASH5 is first bad commit" my_bisect_log.txt &&
297
+ grep "$HASH5 is the first bad commit" my_bisect_log.txt &&
298
git bisect reset
299
'
300
@@ -335,7 +335,7 @@ test_expect_success 'bisect run & skip: find first bad' '
335
chmod +x test_script.sh &&
336
git bisect start $HASH7 $HASH1 &&
337
git bisect run ./test_script.sh > my_bisect_log.txt &&
338
- grep "$HASH6 is first bad commit" my_bisect_log.txt
338
+ grep "$HASH6 is the first bad commit" my_bisect_log.txt
339
'
340
341
test_expect_success 'bisect skip only one range' '
@@ -385,7 +385,7 @@ test_expect_success 'bisect does not create a "bisect" branch' '
385
rev_hash6=$(git rev-parse --verify HEAD) &&
386
test "$rev_hash6" = "$HASH6" &&
387
git bisect good > my_bisect_log.txt &&
388
- grep "$HASH7 is first bad commit" my_bisect_log.txt &&
388
+ grep "$HASH7 is the first bad commit" my_bisect_log.txt &&
389
git bisect reset &&
390
rev_hash6=$(git rev-parse --verify bisect) &&
391
test "$rev_hash6" = "$HASH6" &&
@@ -534,7 +534,7 @@ test_expect_success 'restricting bisection on one dir' '
534
para1=$(git rev-parse --verify HEAD) &&
535
test "$para1" = "$PARA_HASH1" &&
536
git bisect bad > my_bisect_log.txt &&
537
- grep "$PARA_HASH1 is first bad commit" my_bisect_log.txt
537
+ grep "$PARA_HASH1 is the first bad commit" my_bisect_log.txt
538
'
539
540
test_expect_success 'restricting bisection on one dir and a file' '
@@ -552,7 +552,7 @@ test_expect_success 'restricting bisection on one dir and a file' '
552
para1=$(git rev-parse --verify HEAD) &&
553
test "$para1" = "$PARA_HASH1" &&
554
git bisect good > my_bisect_log.txt &&
555
- grep "$PARA_HASH4 is first bad commit" my_bisect_log.txt
555
+ grep "$PARA_HASH4 is the first bad commit" my_bisect_log.txt
556
'
557
558
test_expect_success 'skipping away from skipped commit' '