bisect: make diff-tree output prettier

After completing a bisection, we print out the commit we found using an internal version of diff-tree. The result is aesthetically lacking: - it shows a raw diff, which is generally less informative for human readers than "--stat --summary" (which we already decided was nice for humans in format-patch's output). - by not abbreviating hashes, the result is likely to wrap on most people's terminals - we don't use "-r", so if the commit touched files in a directory, you only get to see the top-level directory mentioned - we don't specify "--cc" or similar, so merges print nothing (not even the commit message!) Even though bisect might be driven by scripts, there's no reason to consider this part of the output as machine-readable (if anything, the initial "$hash is the first bad commit" might be parsed, but we won't touch that here). Let's make it prettier and more informative for a human reading the output. While we're tweaking the options, let's also switch to using the diff "ui" config. If we're accepting that this is human-readable output, then we should respect the user's options for how to display it. Note that we have to touch a few tests in t6030. These check bisection in a corrupted repository (it's missing a subtree). They didn't fail with the previous code, because it didn't actually recurse far enough in the diff to find the broken tree. But now we'll see the corruption and complain. Adjusting the tests to expect the die() is the best fix. We still confirm that we're able to bisect within the broken repo. And we'll still print "$hash is the first bad commit" as usual before dying; showing that is a reasonable outcome in a corrupt repository (and was what might happen already, if the root tree was corrupt). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Feb 22, 2019 at 01:23 UTC b02be8b901bc65de1b75014c0dade67b233569ff
2 files changed +5 -5
bisect.c
+2 -2
@@ -897,11 +897,11 @@ static void show_diff_tree(struct repository *r,
897 struct commit *commit)
898 {
899 const char *argv[] = {
900 - "diff-tree", "--pretty", "--no-abbrev", "--raw", NULL
900 + "diff-tree", "--pretty", "--stat", "--summary", "--cc", NULL
901 };
902 struct rev_info opt;
903
904 - git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
904 + git_config(git_diff_ui_config, NULL);
905 repo_init_revisions(r, &opt, prefix);
906
907 setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL);
t/t6030-bisect-porcelain.sh
+3 -3
@@ -681,7 +681,7 @@ test_expect_success 'bisect: --no-checkout - target in breakage' '
681 check_same BROKEN_HASH6 BISECT_HEAD &&
682 git bisect bad BISECT_HEAD &&
683 check_same BROKEN_HASH5 BISECT_HEAD &&
684 - git bisect good BISECT_HEAD &&
684 + test_must_fail git bisect good BISECT_HEAD &&
685 check_same BROKEN_HASH6 bisect/bad &&
686 git bisect reset
687 '
@@ -692,7 +692,7 @@ test_expect_success 'bisect: --no-checkout - target after breakage' '
692 check_same BROKEN_HASH6 BISECT_HEAD &&
693 git bisect good BISECT_HEAD &&
694 check_same BROKEN_HASH8 BISECT_HEAD &&
695 - git bisect good BISECT_HEAD &&
695 + test_must_fail git bisect good BISECT_HEAD &&
696 check_same BROKEN_HASH9 bisect/bad &&
697 git bisect reset
698 '
@@ -701,7 +701,7 @@ test_expect_success 'bisect: demonstrate identification of damage boundary' "
701 git bisect reset &&
702 git checkout broken &&
703 git bisect start broken master --no-checkout &&
704 - git bisect run \"\$SHELL_PATH\" -c '
704 + test_must_fail git bisect run \"\$SHELL_PATH\" -c '
705 GOOD=\$(git for-each-ref \"--format=%(objectname)\" refs/bisect/good-*) &&
706 git rev-list --objects BISECT_HEAD --not \$GOOD >tmp.\$\$ &&
707 git pack-objects --stdout >/dev/null < tmp.\$\$