rpms/kernel/devel gen-patches,1.1,1.2

[Roland McGrath (roland)]

Author: roland

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

Modified Files:
	gen-patches 
Log Message:
Adjust for git changes.



Index: gen-patches
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/gen-patches,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gen-patches	8 Jun 2007 23:47:34 -0000	1.1
+++ gen-patches	9 Jun 2007 00:27:14 -0000	1.2
@@ -92,13 +92,8 @@
 base_rev()
 {
   local base=$1
-  if [ -r "$GIT_DIR/refs/tags/$base" ]; then
-    tag_rev=`git-rev-parse $base` || {
-      echo >&2 "Cannot find tag $base"
-      exit 2
-    }
-    return 0
-  fi
+  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*)
     local id=patch-${1#v}.id
@@ -107,6 +102,10 @@
     fi
     [ -r $id ] && tag_rev=`cat $id` && return 0
     ;;
+  v2*)
+    echo >&2 "Cannot find tag $base"
+    exit 2
+    ;;
   esac
   return 1
 }