Andrew's git - gitweb.git/blob - git-request-pull.sh

   1#!/bin/sh
   2# Copyright 2005, Ryan Anderson <ryan@michonline.com>
   3#
   4# This file is licensed under the GPL v2, or a later version
   5# at the discretion of Linus Torvalds.
   6
   7USAGE='<start> <url> [<end>]'
   8LONG_USAGE='Summarizes the changes between two commits to the standard output,
   9and includes the given URL in the generated summary.'
  10SUBDIRECTORY_OK='Yes'
  11OPTIONS_KEEPDASHDASH=
  12OPTIONS_SPEC='git request-pull [options] start url [end]
  13--
  14p    show patch text as well
  15'
  16
  17. git-sh-setup
  18
  19GIT_PAGER=
  20export GIT_PAGER
  21
  22patch=
  23while   case "$#" in 0) break ;; esac
  24do
  25        case "$1" in
  26        -p)
  27                patch=-p ;;
  28        --)
  29                shift; break ;;
  30        -*)
  31                usage ;;
  32        *)
  33                break ;;
  34        esac
  35        shift
  36done
  37
  38base=$1 url=$2 head=${3-HEAD} status=0 branch_name=
  39
  40headref=$(git symbolic-ref -q "$head")
  41if git show-ref -q --verify "$headref"
  42then
  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=
  48        fi
  49fi
  50
  51tag_name=$(git describe --exact "$head^0" 2>/dev/null)
  52
  53test -n "$base" && test -n "$url" || usage
  54
  55baserev=$(git rev-parse --verify --quiet "$base"^0)
  56if test -z "$baserev"
  57then
  58    die "fatal: Not a valid revision: $base"
  59fi
  60
  61headrev=$(git rev-parse --verify --quiet "$head"^0)
  62if test -z "$headrev"
  63then
  64    die "fatal: Not a valid revision: $head"
  65fi
  66
  67merge_base=$(git merge-base $baserev $headrev) ||
  68die "fatal: No commits in common between $base and $head"
  69
  70# $head is the token given from the command line, and $tag_name, if
  71# exists, is the tag we are going to show the commit information for.
  72# If that tag exists at the remote and it points at the commit, use it.
  73# Otherwise, if a branch with the same name as $head exists at the remote
  74# and their values match, use that instead.
  75#
  76# Otherwise find a random ref that matches $headrev.
  77find_matching_ref='
  78        sub abbr {
  79                my $ref = shift;
  80                if ($ref =~ s|^refs/heads/|| || $ref =~ s|^refs/tags/|tags/|) {
  81                        return $ref;
  82                } else {
  83                        return $ref;
  84                }
  85        }
  86
  87        my ($tagged, $branch, $found);
  88        while (<STDIN>) {
  89                my ($sha1, $ref, $deref) = /^(\S+)\s+(\S+?)(\^\{\})?$/;
  90                next unless ($sha1 eq $ARGV[1]);
  91                $found = abbr($ref);
  92                if ($deref && $ref eq "tags/$ARGV[2]") {
  93                        $tagged = $found;
  94                        last;
  95                }
  96                if ($ref =~ m|/\Q$ARGV[0]\E$|) {
  97                        $exact = $found;
  98                }
  99        }
 100        if ($tagged) {
 101                print "$tagged\n";
 102        } elsif ($exact) {
 103                print "$exact\n";
 104        } elsif ($found) {
 105                print "$found\n";
 106        }
 107'
 108
 109ref=$(git ls-remote "$url" | @@PERL@@ -e "$find_matching_ref" "$head" "$headrev" "$tag_name")
 110
 111url=$(git ls-remote --get-url "$url")
 112
 113git show -s --format='The following changes since commit %H:
 114
 115  %s (%ci)
 116
 117are available in the git repository at:
 118' $merge_base &&
 119echo "  $url${ref+ $ref}" &&
 120git show -s --format='
 121for you to fetch changes up to %H:
 122
 123  %s (%ci)
 124
 125----------------------------------------------------------------' $headrev &&
 126
 127if test -n "$branch_name"
 128then
 129        echo "(from the branch description for $branch_name local branch)"
 130        echo
 131        git config "branch.$branch_name.description"
 132fi &&
 133
 134if test -n "$tag_name"
 135then
 136        if test -z "$ref" || test "$ref" != "tags/$tag_name"
 137        then
 138                echo >&2 "warn: You locally have $tag_name but it does not (yet)"
 139                echo >&2 "warn: appear to be at $url"
 140                echo >&2 "warn: Do you want to push it there, perhaps?"
 141        fi
 142        git cat-file tag "$tag_name" |
 143        sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
 144        echo
 145fi &&
 146
 147if test -n "$branch_name" || test -n "$tag_name"
 148then
 149        echo "----------------------------------------------------------------"
 150fi &&
 151
 152git shortlog ^$baserev $headrev &&
 153git diff -M --stat --summary $patch $merge_base..$headrev || status=1
 154
 155if test -z "$ref"
 156then
 157        echo "warn: No branch of $url is at:" >&2
 158        git show -s --format='warn:   %h: %s' $headrev >&2
 159        echo "warn: Are you sure you pushed '$head' there?" >&2
 160        status=1
 161fi
 162exit $status