зеркало из https://github.com/microsoft/git.git
request-pull: improve error message for invalid revision args
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:
Родитель
239222f587
Коммит
ace33bf991
|
@ -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"
|
||||
|
|
Загрузка…
Ссылка в новой задаче