From: Junio C Hamano Date: Tue, 19 Jul 2016 20:22:22 +0000 (-0700) Subject: Merge branch 'jk/printf-format' X-Git-Tag: v2.10.0-rc0~103 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=96e08010ee5b9d1dbfbcc8561fa69f972a415a38;p=thirdparty%2Fgit.git Merge branch 'jk/printf-format' Code clean-up to avoid using a variable string that compilers may feel untrustable as printf-style format given to write_file() helper function. * jk/printf-format: commit.c: remove print_commit_list() avoid using sha1_to_hex output as printf format walker: let walker_say take arbitrary formats --- 96e08010ee5b9d1dbfbcc8561fa69f972a415a38 diff --cc bisect.c index 47cccdfb0d,02f76f0f5d..6f512c2063 --- a/bisect.c +++ b/bisect.c @@@ -646,10 -646,13 +646,13 @@@ static void exit_if_skipped_commits(str printf("There are only 'skip'ped commits left to test.\n" "The first %s commit could be any of:\n", term_bad); - print_commit_list(tried, "%s\n", "%s\n"); + + for ( ; tried; tried = tried->next) + printf("%s\n", oid_to_hex(&tried->item->object.oid)); + if (bad) printf("%s\n", oid_to_hex(bad)); - printf("We cannot bisect more!\n"); + printf(_("We cannot bisect more!\n")); exit(2); }