diff options
| -rw-r--r-- | describe.c | 2 | ||||
| -rw-r--r-- | git.c | 2 | ||||
| -rw-r--r-- | merge-tree.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/describe.c b/describe.c index 5ed052d3a1..ab192f83ae 100644 --- a/describe.c +++ b/describe.c @@ -163,7 +163,7 @@ int main(int argc, char **argv) setup_git_directory(); - if (i == argc) + if (argc <= i) describe("HEAD", 1); else while (i < argc) { @@ -294,7 +294,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp) int main(int argc, const char **argv, char **envp) { - const char *cmd = argv[0]; + const char *cmd = argv[0] ? argv[0] : "git-help"; char *slash = strrchr(cmd, '/'); const char *exec_path = NULL; int done_alias = 0; diff --git a/merge-tree.c b/merge-tree.c index c154dcfc02..692ede0e3d 100644 --- a/merge-tree.c +++ b/merge-tree.c @@ -337,7 +337,7 @@ int main(int argc, char **argv) struct tree_desc t[3]; void *buf1, *buf2, *buf3; - if (argc < 4) + if (argc != 4) usage(merge_tree_usage); setup_git_directory(); |