Merge branch 'jk/printf-format'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2016 20:22:22 +0000 (13:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2016 20:22:22 +0000 (13:22 -0700)
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

1  2 
bisect.c
commit.c
commit.h
diff --cc bisect.c
index 47cccdfb0dae4a4a4bc09461c00f0d46db9c3c81,02f76f0f5df9e3156be037578c79ab2acc15592f..6f512c20638718df91ed4a29aae3518f985c0d30
+++ 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);
  }
  
diff --cc commit.c
Simple merge
diff --cc commit.h
Simple merge