difftool/mergetool: refactor commands to use git-mergetool--lib

[git.git] / builtin-ls-tree.c

diff --git a/builtin-ls-tree.c b/builtin-ls-tree.c
index 5b63e6eada5cd6de764acef694da624a70ce6dab..22008dfa8fb94d971b6fb1bd7342ede02a8d3fd0 100644 (file)
--- a/builtin-ls-tree.c
+++ b/builtin-ls-tree.c
@@ -60,7 +60,6 @@ static int show_tree(const unsigned char *sha1, const char *base, int baselen,
 {
        int retval = 0;
        const char *type = blob_type;
-       unsigned long size;
 
        if (S_ISGITLINK(mode)) {
                /*
@@ -68,13 +67,8 @@ static int show_tree(const unsigned char *sha1, const char *base, int baselen,
                 *
                 * Something similar to this incomplete example:
                 *
-               if (show_subprojects(base, baselen, pathname)) {
-                       struct child_process ls_tree;
-
-                       ls_tree.dir = base;
-                       ls_tree.argv = ls-tree;
-                       start_command(&ls_tree);
-               }
+               if (show_subprojects(base, baselen, pathname))
+                       retval = READ_TREE_RECURSIVE;
                 *
                 */
                type = commit_type;
@@ -95,17 +89,20 @@ static int show_tree(const unsigned char *sha1, const char *base, int baselen,
 
        if (!(ls_options & LS_NAME_ONLY)) {
                if (ls_options & LS_SHOW_SIZE) {
+                       char size_text[24];
                        if (!strcmp(type, blob_type)) {
-                               sha1_object_info(sha1, &size);
-                               printf("%06o %s %s %7lu\t", mode, type,
-                                      abbrev ? find_unique_abbrev(sha1, abbrev)
-                                             : sha1_to_hex(sha1),
-                                      size);
+                               unsigned long size;
+                               if (sha1_object_info(sha1, &size) == OBJ_BAD)
+                                       strcpy(size_text, "BAD");
+                               else
+                                       snprintf(size_text, sizeof(size_text),
+                                                "%lu", size);
                        } else
-                               printf("%06o %s %s %7c\t", mode, type,
-                                      abbrev ? find_unique_abbrev(sha1, abbrev)
-                                             : sha1_to_hex(sha1),
-                                      '-');
+                               strcpy(size_text, "-");
+                       printf("%06o %s %s %7s\t", mode, type,
+                              abbrev ? find_unique_abbrev(sha1, abbrev)
+                                     : sha1_to_hex(sha1),
+                              size_text);
                } else
                        printf("%06o %s %s\t", mode, type,
                               abbrev ? find_unique_abbrev(sha1, abbrev)