Publish testing RPMs

diff --git a/DoKernelOrg b/DoKernelOrg
index 0b35864216960cccac61666c33c8b583f8730a9a..872fa8fc24396b8c554f4cacde3907e55c9d3da7 100755 (executable)
--- a/DoKernelOrg
+++ b/DoKernelOrg
@@ -83,8 +83,20 @@ maint | master)
                ln -f git-htmldocs-$V.tar.gz git-manpages-$V.tar.gz $G/.
                ;;
        esac >>./:all.log 2>&1 &&
-       case "$NO_RPM_PLEASE" in
-       '')
+       case "$V" in
+       *.rc[0-9]*)
+               mkdir -p $G/testing &&
+               for a in $narch
+               do
+                       for rr in $HOME/rpms/RPMS/$a/*-$V-*.$a.rpm
+                       do
+                               test -f "$rr" || continue
+                               ln -f "$rr" $G/testing/.
+                       done
+               done &&
+               ln -f $HOME/rpms/SRPMS/git-$V-*.src.rpm $G/testing/.
+               ;;
+       *)
                mkdir -p $G/RPMS/$arch $G/RPMS/SRPMS &&
                for a in $narch
                do
@@ -105,8 +117,6 @@ maint | master)
                        /usr/local/bin/yummy $G/RPMS/SRPMS
                        :
                } >>./:all.log 2>&1 ;;
-       *)
-               echo Skipping RPM ;;
        esac &&
        make clean &&
 

diff --git a/prep-maint.txt b/prep-maint.txt
index 83dbea48c11b26088a036dc79813a2609cff8f0c..8641f5ee15b70b87dab4eec0a83ddbe47dfc61f7 100644 (file)
--- a/prep-maint.txt
+++ b/prep-maint.txt
@@ -1,54 +1,62 @@
-diff --git a/Documentation/RelNotes-1.5.2.3.txt b/Documentation/RelNotes-1.5.2.3.txt
+diff --git a/Documentation/RelNotes-1.5.2.4.txt b/Documentation/RelNotes-1.5.2.4.txt
 new file mode 100644
-index 0000000..6ba264d
+index 0000000..a46b495
 --- /dev/null
-+++ b/Documentation/RelNotes-1.5.2.3.txt
-@@ -0,0 +1,26 @@
-+GIT v1.5.2.3 Release Notes
++++ b/Documentation/RelNotes-1.5.2.4.txt
+@@ -0,0 +1,34 @@
++GIT v1.5.2.4 Release Notes
 +==========================
 +
-+Fixes since v1.5.2.2
++Fixes since v1.5.2.3
 +--------------------
 +
 + * Bugfixes
 +
-+   - Version 2 pack index format was introduced in version 1.5.2
-+     to support pack files that has offset that cannot be
-+     represented in 32-bit.  The runtime code to validate such
-+     an index mishandled such an index for an empty pack.
++   - "git-gui" bugfixes, including a handful fixes to run it
++     better on Cygwin/MSYS.
 +
-+   - Commit walkers (most notably, fetch over http protocol)
-+     tried to traverse commit objects contained in trees (aka
-+     subproject); they shouldn't.
++   - "git checkout" failed to switch back and forth between
++     branches, one of which has "frotz -> xyzzy" symlink and
++     file "xyzzy/filfre", while the other one has a file
++     "frotz/filfre".
++
++   - "git prune" used to segfault upon seeing a commit that is
++     referred to by a tree object (aka "subproject").
++
++   - "git diff --name-status --no-index" mishandled an added file.
++
++   - "git apply --reverse --whitespace=warn" still complained
++     about whitespaces that a forward application would have
++     introduced.
 +
 + * Documentation Fixes and Updates
 +
-+   - git-config --regexp was not documented properly.
++   - A handful documentation updates.
 +
-+-- 
++--
 +exec >/var/tmp/1
-+O=v1.5.2.2-11-gb833651
++O=v1.5.2.3-24-gec0603e
 +echo O=`git describe refs/heads/maint`
 +git shortlog --no-merges $O..refs/heads/maint
 diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
-index 3c3cd2f..5c6d2b2 100755
+index 5c6d2b2..a318baa 100755
 --- a/GIT-VERSION-GEN
 +++ b/GIT-VERSION-GEN
 @@ -1,7 +1,7 @@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
--DEF_VER=v1.5.2.2.GIT
-+DEF_VER=v1.5.2.3.GIT
+-DEF_VER=v1.5.2.3.GIT
++DEF_VER=v1.5.2.4.GIT
  
  LF='
  '
 diff --git a/RelNotes b/RelNotes
-index 61f9778..a1c82a8 120000
+index a1c82a8..1f6c16e 120000
 --- a/RelNotes
 +++ b/RelNotes
 @@ -1 +1 @@
--Documentation/RelNotes-1.5.2.2.txt
+-Documentation/RelNotes-1.5.2.3.txt
 \ No newline at end of file
-+Documentation/RelNotes-1.5.2.3.txt
++Documentation/RelNotes-1.5.2.4.txt
 \ No newline at end of file

diff --git a/prep-master.txt b/prep-master.txt
index e45631ac83159dd735b66a2c004c0df286eed744..66f01712ea81de87a7a8dc7009ade3a30783d25b 100644 (file)
--- a/prep-master.txt
+++ b/prep-master.txt
@@ -1,13 +1,15 @@
-diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
-index 06c360b..3c0032c 100755
---- a/GIT-VERSION-GEN
-+++ b/GIT-VERSION-GEN
-@@ -1,7 +1,7 @@
- #!/bin/sh
+diff --git a/Documentation/RelNotes-1.5.3.txt b/Documentation/RelNotes-1.5.3.txt
+index 03d1843..6f5d14f 100644
+--- a/Documentation/RelNotes-1.5.3.txt
++++ b/Documentation/RelNotes-1.5.3.txt
+@@ -47,8 +47,8 @@ Updates since v1.5.2
+     renaming history of a single file.
  
- GVF=GIT-VERSION-FILE
--DEF_VER=v1.5.2.GIT
-+DEF_VER=v1.5.3.GIT
+   - "git-filter-branch" lets you rewrite the revision history of
+-    the current branch, creating a new branch. You can specify a
+-    number of filters to modify the commits, files and trees.
++    specified branches. You can specify a number of filters to
++    modify the commits, files and trees.
  
- LF='
- '
+   - "git-cvsserver" learned new options (--base-path, --export-all,
+     --strict-paths) inspired by git-daemon.