summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b7200e8)
raw | patch | inline | side by side (parent: b7200e8)
author | Junio C Hamano <gitster@pobox.com> | |
Fri, 16 Sep 2011 18:22:57 +0000 (11:22 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 5 Oct 2011 21:51:26 +0000 (14:51 -0700) |
Make it a bit more conforming to Documentation/Codingstyle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-request-pull.sh | patch | blob | history |
diff --git a/git-request-pull.sh b/git-request-pull.sh
index fc080cc5e45d02e618e7224c052de1be676f4360..afb75e80b6b89d1c366ca3ba3e561a83dac66fb5 100755 (executable)
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
shift
done
-base=$1
-url=$2
-head=${3-HEAD}
+base=$1 url=$2 head=${3-HEAD}
-[ "$base" ] || usage
-[ "$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 "$base"^0` &&
-headrev=`git rev-parse --verify "$head"^0` || exit
-
-merge_base=`git merge-base $baserev $headrev` ||
+merge_base=$(git merge-base $baserev $headrev) ||
die "fatal: No commits in common between $base and $head"
-branch=$(git ls-remote "$url" \
- | sed -n -e "/^$headrev refs.heads./{
- s/^.* refs.heads.//
- p
- q
- }")
+find_matching_branch="/^$headrev "'refs\/heads\//{
+ s/^.* refs\/heads\///
+ p
+ q
+}'
+branch=$(git ls-remote "$url" | sed -n -e "$find_matching_branch")
url=$(git ls-remote --get-url "$url")
-if [ -z "$branch" ]; then
+if test -z "$branch"
+then
echo "warn: No branch of $url is at:" >&2
git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2
echo "warn: Are you sure you pushed $head there?" >&2