diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-28 00:03:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-28 00:03:24 -0700 |
| commit | aab748636dbbd6412af6f4996c2791eba4246c0c (patch) | |
| tree | c80f0114021a14cd0263a98c2687cc8261e5dff1 | |
| parent | ade2ca0ca9f8335be300d5538e1ca9cb3594ae64 (diff) | |
| parent | f1be316ada93158507c315ee7948bb9e6007eb91 (diff) | |
| download | git-aab748636dbbd6412af6f4996c2791eba4246c0c.tar.gz git-aab748636dbbd6412af6f4996c2791eba4246c0c.tar.xz | |
Merge branch 'maint-1.6.4' into maint
* maint-1.6.4:
rebase -i: more graceful handling of invalid commands
help -i: properly error out if no info viewer can be found
| -rw-r--r-- | builtin-help.c | 1 | ||||
| -rwxr-xr-x | git-rebase--interactive.sh | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/builtin-help.c b/builtin-help.c index e1eba778a..e1ade8edd 100644 --- a/builtin-help.c +++ b/builtin-help.c @@ -372,6 +372,7 @@ static void show_info_page(const char *git_cmd) const char *page = cmd_to_page(git_cmd); setenv("INFOPATH", system_path(GIT_INFO_PATH), 1); execlp("info", "info", "gitman", page, NULL); + die("no info viewer handled the request"); } static void get_html_page_path(struct strbuf *page_path, const char *page) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 23ded4832..9b1e899e2 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -408,7 +408,12 @@ do_next () { ;; *) warn "Unknown command: $command $sha1 $rest" - die_with_patch $sha1 "Please fix this in the file $TODO." + if git rev-parse --verify -q "$sha1" >/dev/null + then + die_with_patch $sha1 "Please fix this in the file $TODO." + else + die "Please fix this in the file $TODO." + fi ;; esac test -s "$TODO" && return |