request-pull: more strictly match local/remote branches
[git/mingw.git] / git-request-pull.sh
blob659a412155d89bf1040c5006da08a419c6391bd8
1 #!/bin/sh
2 # Copyright 2005, Ryan Anderson <ryan@michonline.com>
4 # This file is licensed under the GPL v2, or a later version
5 # at the discretion of Linus Torvalds.
7 USAGE='<start> <url> [<end>]'
8 LONG_USAGE='Summarizes the changes between two commits to the standard output,
9 and includes the given URL in the generated summary.'
10 SUBDIRECTORY_OK='Yes'
11 OPTIONS_KEEPDASHDASH=
12 OPTIONS_SPEC='git request-pull [options] start url [end]
14 p show patch text as well
17 . git-sh-setup
19 GIT_PAGER=
20 export GIT_PAGER
22 patch=
23 while case "$#" in 0) break ;; esac
25 case "$1" in
26 -p)
27 patch=-p ;;
28 --)
29 shift; break ;;
30 -*)
31 usage ;;
33 break ;;
34 esac
35 shift
36 done
38 base=$1 url=$2 status=0
40 test -n "$base" && test -n "$url" || usage
42 baserev=$(git rev-parse --verify --quiet "$base"^0)
43 if test -z "$baserev"
44 then
45 die "fatal: Not a valid revision: $base"
49 # $3 must be a symbolic ref, a unique ref, or
50 # a SHA object expression
52 head=$(git symbolic-ref -q "${3-HEAD}")
53 head=${head:-$(git show-ref "${3-HEAD}" | cut -d' ' -f2)}
54 head=${head:-$(git rev-parse --quiet --verify "$3")}
56 # None of the above? Bad.
57 test -z "$head" && die "fatal: Not a valid revision: $3"
59 # This also verifies that the resulting head is unique:
60 # "git show-ref" could have shown multiple matching refs..
61 headrev=$(git rev-parse --verify --quiet "$head"^0)
62 test -z "$headrev" && die "fatal: Ambiguous revision: $3"
64 # Was it a branch with a description?
65 branch_name=${head#refs/heads/}
66 if test "z$branch_name" = "z$headref" ||
67 ! git config "branch.$branch_name.description" >/dev/null
68 then
69 branch_name=
72 prettyhead=${head#refs/}
73 prettyhead=${prettyhead#heads/}
75 merge_base=$(git merge-base $baserev $headrev) ||
76 die "fatal: No commits in common between $base and $head"
78 # $head is the refname from the command line.
79 # If a ref with the same name as $head exists at the remote
80 # and their values match, use that.
82 # Otherwise find a random ref that matches $headrev.
83 find_matching_ref='
84 my ($exact,$found);
85 while (<STDIN>) {
86 my ($sha1, $ref, $deref) = /^(\S+)\s+([^^]+)(\S*)$/;
87 next unless ($sha1 eq $ARGV[1]);
88 if ($ref eq $ARGV[0]) {
89 $exact = $ref;
91 if ($sha1 eq $ARGV[0]) {
92 $found = $sha1;
95 if ($exact) {
96 print "$exact\n";
97 } elsif ($found) {
98 print "$found\n";
102 ref=$(git ls-remote "$url" | @@PERL@@ -e "$find_matching_ref" "$head" "$headrev")
104 if test -z "$ref"
105 then
106 echo "warn: No match for $prettyhead found at $url" >&2
107 echo "warn: Are you sure you pushed '$prettyhead' there?" >&2
108 status=1
111 url=$(git ls-remote --get-url "$url")
113 git show -s --format='The following changes since commit %H:
115 %s (%ci)
117 are available in the git repository at:
118 ' $merge_base &&
119 echo " $url $prettyhead" &&
120 git show -s --format='
121 for you to fetch changes up to %H:
123 %s (%ci)
125 ----------------------------------------------------------------' $headrev &&
127 if test -n "$branch_name"
128 then
129 echo "(from the branch description for $branch_name local branch)"
130 echo
131 git config "branch.$branch_name.description"
132 echo "----------------------------------------------------------------"
133 fi &&
135 git shortlog ^$baserev $headrev &&
136 git diff -M --stat --summary $patch $merge_base..$headrev || status=1
138 exit $status