MSVC: fix poll-related macro redefines
[git/dscho.git] / git-request-pull.sh
blobe6438e24c7c787b55428a48eca9461d772db7ee6
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 head=${3-HEAD} status=0 branch_name=
40 headref=$(git symbolic-ref -q "$head")
41 if git show-ref -q --verify "$headref"
42 then
43 branch_name=${headref#refs/heads/}
44 if test "z$branch_name" = "z$headref" ||
45 ! git config "branch.$branch_name.description" >/dev/null
46 then
47 branch_name=
51 tag_name=$(git describe --exact "$head^0" 2>/dev/null)
53 test -n "$base" && test -n "$url" || usage
54 baserev=$(git rev-parse --verify "$base"^0) &&
55 headrev=$(git rev-parse --verify "$head"^0) || exit
57 merge_base=$(git merge-base $baserev $headrev) ||
58 die "fatal: No commits in common between $base and $head"
60 # $head is the token given from the command line. If a ref with that
61 # name exists at the remote and their values match, we should use it.
62 # Otherwise find a ref that matches $headrev.
63 find_matching_ref='
64 sub abbr {
65 my $ref = shift;
66 if ($ref =~ s|^refs/heads/|| || $ref =~ s|^refs/tags/|tags/|) {
67 return $ref;
68 } else {
69 return $ref;
73 my ($exact, $found);
74 while (<STDIN>) {
75 my ($sha1, $ref, $deref) = /^(\S+)\s+(\S+?)(\^\{\})?$/;
76 next unless ($sha1 eq $ARGV[1]);
77 $found = abbr($ref);
78 if ($ref =~ m|/\Q$ARGV[0]\E$|) {
79 $exact = $found;
80 last;
83 if ($exact) {
84 print "$exact\n";
85 } elsif ($found) {
86 print "$found\n";
90 ref=$(git ls-remote "$url" | perl -e "$find_matching_ref" "$head" "$headrev")
92 url=$(git ls-remote --get-url "$url")
94 git show -s --format='The following changes since commit %H:
96 %s (%ci)
98 are available in the git repository at:
99 ' $merge_base &&
100 echo " $url${ref+ $ref}" &&
101 git show -s --format='
102 for you to fetch changes up to %H:
104 %s (%ci)
106 ----------------------------------------------------------------' $headrev &&
108 if test -n "$branch_name"
109 then
110 echo "(from the branch description for $branch_name local branch)"
111 echo
112 git config "branch.$branch_name.description"
113 fi &&
115 if test -n "$tag_name"
116 then
117 git cat-file tag "$tag_name" |
118 sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
119 echo
120 fi &&
122 if test -n "$branch_name" || test -n "$tag_name"
123 then
124 echo "----------------------------------------------------------------"
125 fi &&
127 git shortlog ^$baserev $headrev &&
128 git diff -M --stat --summary $patch $merge_base..$headrev || status=1
130 if test -z "$ref"
131 then
132 echo "warn: No branch of $url is at:" >&2
133 git show -s --format='warn: %h: %s' $headrev >&2
134 echo "warn: Are you sure you pushed '$head' there?" >&2
135 status=1
137 exit $status