rpms/kernel/devel gen-patches,1.4,1.5

[Roland McGrath (roland)]

Author: roland

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7749

Modified Files:
	gen-patches 
Log Message:
git magic to cope with tags



Index: gen-patches
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/gen-patches,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gen-patches	3 Jan 2008 23:46:08 -0000	1.4
+++ gen-patches	9 Jan 2008 08:05:11 -0000	1.5
@@ -95,7 +95,7 @@
 base_rev()
 {
   local base=$1
-  tag_rev=`git-rev-parse --revs-only --verify $base 2> /dev/null` &&
+  tag_rev=`git-rev-parse --revs-only --verify "$base^{}" 2> /dev/null` &&
   [ "`git-describe --tags $tag_rev`" = "$base" ] && return 0
   case "$1" in
   v*-git*)
@@ -133,7 +133,7 @@
 last_base=$base
 last_base_rev=$base_rev
 for branch; do
-  branch_rev=`git-rev-parse $branch` || exit 2
+  branch_rev=`git-rev-parse "$branch^{}"` || exit 2
   merge_base=`git-merge-base $last_base_rev $branch_rev` || {
     echo >&2 "No common ancestor for $last_base and $branch"
     exit 2