Andrew's git - gitweb.git/blob

7b5c777f0b137d9050dfed02eebe78f1a2ebd6c9
   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
  54baserev=$(git rev-parse --verify "$base"^0) &&
  55headrev=$(git rev-parse --verify "$head"^0) || exit
  56
  57merge_base=$(git merge-base $baserev $headrev) ||
  58die "fatal: No commits in common between $base and $head"
  59
  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.
  63find_matching_ref='
  64        sub abbr {
  65                my $ref = shift;
  66                if ($ref =~ s|refs/heads/||) {
  67                        return $ref;
  68                } elsif ($ref =~ s|refs/tags/||) {
  69                        return "tag $ref";
  70                } else {
  71                        return $ref;
  72                }
  73        }
  74
  75        my ($exact, $found);
  76        while (<STDIN>) {
  77                my ($sha1, $ref, $deref) = /^(\S+)\s+(\S+?)(\^\{\})?$/;
  78                next unless ($sha1 eq $ARGV[1]);
  79                $found = abbr($ref);
  80                if ($ref =~ m|/\Q$ARGV[0]\E$|) {
  81                        $exact = $found;
  82                        last;
  83                }
  84        }
  85        if ($exact) {
  86                print "$exact\n";
  87        } elsif ($found) {
  88                print "$found\n";
  89        }
  90'
  91
  92ref=$(git ls-remote "$url" | perl -e "$find_matching_ref" "$head" "$headrev")
  93
  94url=$(git ls-remote --get-url "$url")
  95
  96git show -s --format='The following changes since commit %H:
  97
  98  %s (%ci)
  99
 100are available in the git repository at:
 101' $baserev &&
 102echo "  $url${ref+ $ref}" &&
 103git show -s --format='
 104for you to fetch changes up to %H:
 105
 106  %s (%ci)
 107
 108----------------------------------------------------------------' $headrev &&
 109
 110if test -n "$branch_name"
 111then
 112        echo "(from the branch description for $branch_name local branch)"
 113        echo
 114        git config "branch.$branch_name.description"
 115fi &&
 116
 117if test -n "$tag_name"
 118then
 119        git cat-file tag "$tag_name" |
 120        sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p
 121        echo
 122fi &&
 123
 124if test -n "$branch_name" || test -n "$tag_name"
 125then
 126        echo "----------------------------------------------------------------"
 127fi &&
 128
 129git shortlog ^$baserev $headrev &&
 130git diff -M --stat --summary $patch $merge_base..$headrev || status=1
 131
 132if test -z "$ref"
 133then
 134        echo "warn: No branch of $url is at:" >&2
 135        git show -s --format='warn:   %h: %s' $headrev >&2
 136        echo "warn: Are you sure you pushed '$head' there?" >&2
 137        status=1
 138fi
 139exit $status