Merge with gitk --parents change.

diff --git a/ls-tree.c b/ls-tree.c
index 450bff2472084098af018460567c51ef90b847ad..e198a20cb3dd88ae46da1aaf005846fe42843ea7 100644 (file)
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -79,7 +79,7 @@ static struct tree_entry_list *find_entry(const char *path)
                slash = strchr(path, '/');
                if (!slash) {
                        len = strlen(path);
-                       next = 0;
+                       next = NULL;
                }
                else {
                        next = slash + 1;
@@ -208,7 +208,7 @@ static int list(char **path)
        return err;
 }
 
-static const char *ls_tree_usage =
+static const char ls_tree_usage[] =
        "git-ls-tree [-d] [-r] [-z] <tree-ish> [path...]";
 
 int main(int argc, char **argv)