undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

request-pull: improve error message for invalid revision args

Browse Source 
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>
This commit is contained in:
Dirk Wallenstein 2013-07-17 19:28:11 +02:00 committed by Junio C Hamano
parent 239222f587
commit ace33bf991
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
git-request-pull.sh
View File

@ -51,8 +51,18 @@ fi
tag_name=$(git describe --exact "$head^0" 2>/dev/null) tag_name=$(git describe --exact "$head^0" 2>/dev/null)
test -n "$base" && test -n "$url" || usage 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) || merge_base=$(git merge-base $baserev $headrev) ||
die "fatal: No commits in common between $base and $head" die "fatal: No commits in common between $base and $head"