diff options
| author | Dirk Wallenstein <halsmit@t-online.de> | 2013-07-17 19:28:11 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-17 12:30:58 -0700 |
| commit | ace33bf991f8f6643e58a3642962ed244ba36b5b (patch) | |
| tree | 869e255f8fd229ab6d645ea999e335d1ac0ae040 | |
| parent | 239222f587ed06f96d90dd71c66d80a2b1e3dc9f (diff) | |
| download | git-ace33bf991f8f6643e58a3642962ed244ba36b5b.tar.gz | |
request-pull: improve error message for invalid revision argsdw/request-pull-diag
Currently, when an invalid revision is specified, the error message is:
fatal: Needed a single revision
This is misleading because, you might think there is something wrong
with the command line as a whole.
Now the user gets a more meaningful error message, showing the invalid
revision.
Signed-off-by: Dirk Wallenstein <halsmit@t-online.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-request-pull.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/git-request-pull.sh b/git-request-pull.sh index d566015975..ebf1269d29 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh @@ -51,8 +51,18 @@ fi tag_name=$(git describe --exact "$head^0" 2>/dev/null) test -n "$base" && test -n "$url" || usage -baserev=$(git rev-parse --verify "$base"^0) && -headrev=$(git rev-parse --verify "$head"^0) || exit + +baserev=$(git rev-parse --verify --quiet "$base"^0) +if test -z "$baserev" +then + die "fatal: Not a valid revision: $base" +fi + +headrev=$(git rev-parse --verify --quiet "$head"^0) +if test -z "$headrev" +then + die "fatal: Not a valid revision: $head" +fi merge_base=$(git merge-base $baserev $headrev) || die "fatal: No commits in common between $base and $head" |