GIT v0.99.8d

Contains the following changes since v0.99.8c.

Johannes Schindelin:
Teach git-status about spaces in file names also on MacOSX
t5400-send-pack relies on a working cpio

Jonas Fonseca:
git.sh: quote all paths

Junio C Hamano:
Also force LC_ALL in test scripts.
OpenBSD needs the strcasestr replacement.
git-check-ref-format: reject funny ref names.
Refuse to create funny refs in clone-pack, git-fetch and receive-pack.
Ignore funny refname sent from remote
Introduce notation "ref^{type}".

Martin Langhoff:
cvsimport: don't pass --cvs-direct if user options contradict us

Ralf Baechle:
rsh.c: typo fix

Note that "funny ref" bits are not strictly fixes but rather
backport from the "master" branch.  They will prevent refs and
heads with funny names from being created.  In addition, what is
in the master branch will start feeding the clients unwrapped
tag information to help Martin's findtags and possibly later
Cogito.  These backported "funny ref" changes are to prevent
clients on the "maint" branch from getting confused when talking
with newer git-upload-pack and when reading from info/refs file
prepared with newer git-update-server-info.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index 3ae3d3b4603ca8f1b43d38f67205bdfd2268a20d..a4a5ec4aa3327d5dadaca476e7f0e7135a10ac24 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@
 
 # DEFINES += -DUSE_STDEV
 
 
 # DEFINES += -DUSE_STDEV
 

-GIT_VERSION = 0.99.8c
+GIT_VERSION = 0.99.8d

 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)

diff --git a/connect.c b/connect.c
index c577f2e45573a768648c170ce82b5f87b2ac5a5f..e21d39a3574ff0815520187d21624970b19da92f 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "pkt-line.h"
 #include "quote.h"
 #include "cache.h"
 #include "pkt-line.h"
 #include "quote.h"

+#include "refs.h"

 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

diff --git a/debian/changelog b/debian/changelog
index abd8ff4514d57a374e3d250c122d7ad7f2084079..42332b6da8f41882e13eeeefdec7d0bc695c440b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-core (0.99.8d-0) unstable; urgency=low
+
+  * GIT 0.99.8d
+
+ -- Junio C Hamano <junkio@cox.net>  Sat, 15 Oct 2005 17:22:58 -0700
+

 git-core (0.99.8c-0) unstable; urgency=low
 
   * GIT 0.99.8c
 git-core (0.99.8c-0) unstable; urgency=low
 
   * GIT 0.99.8c

diff --git a/git-clone.sh b/git-clone.sh
index 71431319c008fbc5771d97c4229e7054efd76395..78c83e84c26ff6b75f08609ecc3b5cb2cac7c09b 100755 (executable)
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -53,7 +53,11 @@ Perhaps git-update-server-info needs to be run there?"
        while read sha1 refname
        do
                name=`expr "$refname" : 'refs/\(.*\)'` &&
        while read sha1 refname
        do
                name=`expr "$refname" : 'refs/\(.*\)'` &&

-               git-http-fetch -v -a -w "$name" "$name" "$1/" || exit 1
+               case "$name" in
+               *^{}) ;;
+               *)
+                       git-http-fetch -v -a -w "$name" "$name" "$1/" || exit 1 ;;
+               esac

        done <"$clone_tmp/refs"
        rm -fr "$clone_tmp"
 }
        done <"$clone_tmp/refs"
        rm -fr "$clone_tmp"
 }

diff --git a/git-fetch.sh b/git-fetch.sh
index d3988660ff8cf214cfb1f5903a4bab5ab63b6cea..8fb6fba1454ca6fc8e5eff5f1d0936877436fa7a 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -170,7 +170,11 @@ esac
 reflist=$(get_remote_refs_for_fetch "$@")
 if test "$tags"
 then
 reflist=$(get_remote_refs_for_fetch "$@")
 if test "$tags"
 then

-       taglist=$(git-ls-remote --tags "$remote" | awk '{ print "."$2":"$2 }')
+       taglist=$(git-ls-remote --tags "$remote" |
+               sed -e '
+                       /\^{}$/d
+                       s/^[^   ]*      //
+                       s/.*/&:&/')

        if test "$#" -gt 1
        then
                # remote URL plus explicit refspecs; we need to merge them.
        if test "$#" -gt 1
        then
                # remote URL plus explicit refspecs; we need to merge them.