Re: [PATCH] request-pull: improve error message for invalid revision args
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:58:11
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] request-pull: improve error message for invalid revision args · Dirk Wallenstein <hidden>
Dirk Wallenstein [off-list ref] writes:
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 <redacted>
---
Notes:
I assume, it is not worth the trouble to even try to change the message from
rev-parse for this. People might parse the messages, which is probably why
this message still exists.You are right---such a change will break existing scripts, so it is not just "not worth the trouble" but is actively wrong to change the error message.
quoted hunk
git-request-pull.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)diff --git a/git-request-pull.sh b/git-request-pull.sh index d566015..f38f0f9 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 "$base"^0 2>/dev/null)
Use "--quiet" instead?
+if test -z "$baserev" +then + die "fatal: Not a valid revision: $base" +fi + +headrev=$(git rev-parse --verify "$head"^0 2>/dev/null) +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"