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

Merge branch 'dw/request-pull-diag'

Browse Source 
* dw/request-pull-diag:
  request-pull: improve error message for invalid revision args
This commit is contained in:
Junio C Hamano 2013-07-22 11:23:24 -07:00
commit 8827a58cf0
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)
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"