Merge branch 'tg/ls-files-debug-format-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Apr 2019 07:41:20 +0000 (16:41 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Apr 2019 07:41:20 +0000 (16:41 +0900)
Debugging code fix.

* tg/ls-files-debug-format-fix:
ls-files: use correct format string

1  2 
builtin/ls-files.c
diff --combined builtin/ls-files.c
index 37a08c714bf02809f4bbdaf101f2ffce2af857ab,463105ccb555efdb28efc6c68919b8dd14b5eb31..7f83c9a6f26bd92e5e3832a8ea8d6ec44d5a5f5a
@@@ -112,11 -112,11 +112,11 @@@ static void print_debug(const struct ca
        if (debug_mode) {
                const struct stat_data *sd = &ce->ce_stat_data;
  
-               printf("  ctime: %d:%d\n", sd->sd_ctime.sec, sd->sd_ctime.nsec);
-               printf("  mtime: %d:%d\n", sd->sd_mtime.sec, sd->sd_mtime.nsec);
-               printf("  dev: %d\tino: %d\n", sd->sd_dev, sd->sd_ino);
-               printf("  uid: %d\tgid: %d\n", sd->sd_uid, sd->sd_gid);
-               printf("  size: %d\tflags: %x\n", sd->sd_size, ce->ce_flags);
+               printf("  ctime: %u:%u\n", sd->sd_ctime.sec, sd->sd_ctime.nsec);
+               printf("  mtime: %u:%u\n", sd->sd_mtime.sec, sd->sd_mtime.nsec);
+               printf("  dev: %u\tino: %u\n", sd->sd_dev, sd->sd_ino);
+               printf("  uid: %u\tgid: %u\n", sd->sd_uid, sd->sd_gid);
+               printf("  size: %u\tflags: %x\n", sd->sd_size, ce->ce_flags);
        }
  }
  
@@@ -680,7 -680,7 +680,7 @@@ int cmd_ls_files(int argc, const char *
  
        if (ps_matched) {
                int bad;
 -              bad = report_path_error(ps_matched, &pathspec, prefix);
 +              bad = report_path_error(ps_matched, &pathspec);
                if (bad)
                        fprintf(stderr, "Did you forget to 'git add'?\n");