Merge branch 'jc/request-pull-show-head-4'

gitster · gitster · commit 835fbdb67aa0 · 2011-12-20T13:25:27.000-08:00
* jc/request-pull-show-head-4:
  request-pull: do not emit "tag" before the tagname
  request-pull: update the "pull" command generation logic
diff --git a/git-request-pull.sh b/git-request-pull.sh
@@ -57,12 +57,38 @@ headrev=$(git rev-parse --verify "$head"^0) || exit
 merge_base=$(git merge-base $baserev $headrev) ||
 die "fatal: No commits in common between $base and $head"
 
-find_matching_branch="/^$headrev	"'refs\/heads\//{
-	s/^.*	refs\/heads\///
-	p
-	q
-}'
-branch=$(git ls-remote "$url" | sed -n -e "$find_matching_branch")
+# $head is the token given from the command line. If a ref with that
+# name exists at the remote and their values match, we should use it.
+# Otherwise find a ref that matches $headrev.
+find_matching_ref='
+	sub abbr {
+		my $ref = shift;
+		if ($ref =~ s|refs/heads/|| || $ref =~ s|refs/tags/||) {
+			return $ref;
+		} else {
+			return $ref;
+		}
+	}
+
+	my ($exact, $found);
+	while (<STDIN>) {
+		my ($sha1, $ref, $deref) = /^(\S+)\s+(\S+?)(\^\{\})?$/;
+		next unless ($sha1 eq $ARGV[1]);
+		$found = abbr($ref);
+		if ($ref =~ m|/\Q$ARGV[0]\E$|) {
+			$exact = $found;
+			last;
+		}
+	}
+	if ($exact) {
+		print "$exact\n";
+	} elsif ($found) {
+		print "$found\n";
+	}
+'
+
+ref=$(git ls-remote "$url" | perl -e "$find_matching_ref" "$head" "$headrev")
+
 url=$(git ls-remote --get-url "$url")
 
 git show -s --format='The following changes since commit %H:
@@ -71,7 +97,7 @@ git show -s --format='The following changes since commit %H:
 
 are available in the git repository at:
 ' $baserev &&
-echo "  $url${branch+ $branch}" &&
+echo "  $url${ref+ $ref}" &&
 git show -s --format='
 for you to fetch changes up to %H:
 
@@ -81,7 +107,7 @@ for you to fetch changes up to %H:
 
 if test -n "$branch_name"
 then
-	echo "(from the branch description for $branch local branch)"
+	echo "(from the branch description for $branch_name local branch)"
 	echo
 	git config "branch.$branch_name.description"
 fi &&
@@ -101,7 +127,7 @@ fi &&
 git shortlog ^$baserev $headrev &&
 git diff -M --stat --summary $patch $merge_base..$headrev || status=1
 
-if test -z "$branch"
+if test -z "$ref"
 then
 	echo "warn: No branch of $url is at:" >&2
 	git show -s --format='warn:   %h: %s' $headrev >&2
diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
@@ -67,9 +67,11 @@ test_expect_success 'setup: two scripts for reading pull requests' '
 
 	cat <<-\EOT >read-request.sed &&
 	#!/bin/sed -nf
+	# Note that a request could ask for "tag $tagname"
 	/ in the git repository at:$/!d
 	n
 	/^$/ n
+	s/ tag \([^ ]*\)$/ tag--\1/
 	s/^[ 	]*\(.*\) \([^ ]*\)/please pull\
 	\1\
 	\2/p
@@ -178,6 +180,7 @@ test_expect_success 'request names an appropriate branch' '
 		read branch
 	} <digest &&
 	{
+		test "$branch" = full ||
 		test "$branch" = master ||
 		test "$branch" = for-upstream
 	}

Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,11 @@ test_expect_success 'setup: two scripts for reading pull requests' '`
`67`	`67`
`68`	`68`	`cat <<-\EOT >read-request.sed &&`
`69`	`69`	`#!/bin/sed -nf`
	`70`	`+ # Note that a request could ask for "tag $tagname"`
`70`	`71`	`/ in the git repository at:$/!d`
`71`	`72`	`n`
`72`	`73`	`/^$/ n`
	`74`	`+ s/ tag \([^ ]*\)$/ tag--\1/`
`73`	`75`	`s/^[ ]\(.\) \([^ ]*\)/please pull\`
`74`	`76`	`\1\`
`75`	`77`	`\2/p`
`@@ -178,6 +180,7 @@ test_expect_success 'request names an appropriate branch' '`
`178`	`180`	`read branch`
`179`	`181`	`} <digest &&`
`180`	`182`	`{`
	`183`	`+ test "$branch" = full \|\|`
`181`	`184`	`test "$branch" = master \|\|`
`182`	`185`	`test "$branch" = for-upstream`
`183`	`186`	`}`