diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-17 16:16:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-17 16:16:48 -0800 |
| commit | 69bc0e22d37db4fa9875b717a64949bbfce4ebdf (patch) | |
| tree | adc790d89c9875d027fd996f402d05a40b0298bb /builtin-blame.c | |
| parent | 2afc29aa84f518906c50a1f005e3d715babb5c20 (diff) | |
| parent | 21b4875a51dd9aae68a1c4932d54cad9fc589401 (diff) | |
| download | git-69bc0e22d37db4fa9875b717a64949bbfce4ebdf.tar.gz git-69bc0e22d37db4fa9875b717a64949bbfce4ebdf.tar.xz | |
Merge branch 'maint'
* maint:
Update draft release notes for 1.5.0.1
Convert update-index references in docs to add.
Attempt to improve git-rebase lead-in description.
Do not take mode bits from index after type change.
git-blame: prevent argument parsing segfault
Make gitk save and restore window pane position on Linux and Cygwin.
Make gitk save and restore the user set window position.
[PATCH] gitk: Use show-ref instead of ls-remote
[PATCH] Make gitk work reasonably well on Cygwin.
[PATCH] gitk - remove trailing whitespace from a few lines.
Change git repo-config to git config
Diffstat (limited to 'builtin-blame.c')
| -rw-r--r-- | builtin-blame.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin-blame.c b/builtin-blame.c index 7a5665f09..5669a169f 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -2203,6 +2203,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix) if (!strcmp(argv[j], "--")) seen_dashdash = j; if (seen_dashdash) { + /* (2) */ if (seen_dashdash + 1 != argc - 1) usage(blame_usage); path = add_prefix(prefix, argv[seen_dashdash + 1]); @@ -2211,6 +2212,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix) } else { /* (3) */ + if (argc <= i) + usage(blame_usage); path = add_prefix(prefix, argv[i]); if (i + 1 == argc - 1) { final_commit_name = argv[i + 1]; |