summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-28 02:08:58 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-28 02:08:58 (GMT)
commit17dff84b5e745ba17a5b3ae5591d79f96b165d48 (patch)
tree3917a86a3c560fdfb5027fe2428e918573865a93
parente5f5219a4f1faf3b4e1816fad3a6296a1d39b878 (diff)
parent36cd2cc7d949e1cc39104307fe904c47fe6d5526 (diff)
downloadgit-17dff84b5e745ba17a5b3ae5591d79f96b165d48.zip
git-17dff84b5e745ba17a5b3ae5591d79f96b165d48.tar.gz
git-17dff84b5e745ba17a5b3ae5591d79f96b165d48.tar.bz2
GIT 1.0.6v1.0.6
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Makefile2
-rw-r--r--copy.c7
-rwxr-xr-xgit-fetch.sh2
-rwxr-xr-xt/t5300-pack-object.sh2
-rwxr-xr-xt/t6001-rev-list-merge-order.sh2
-rwxr-xr-xt/t6003-rev-list-topo-order.sh2
6 files changed, 10 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index a5ca5db..4ff85fc 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ all:
# Define USE_STDEV below if you want git to care about the underlying device
# change being considered an inode change from the update-cache perspective.
-GIT_VERSION = 1.0.5
+GIT_VERSION = 1.0.6
# CFLAGS and LDFLAGS are for the users to override from the command line.
diff --git a/copy.c b/copy.c
index 7100eed..08a3d38 100644
--- a/copy.c
+++ b/copy.c
@@ -22,11 +22,14 @@ int copy_fd(int ifd, int ofd)
buf += written;
len -= written;
}
- else if (!written)
+ else if (!written) {
+ close(ifd);
return error("copy-fd: write returned 0");
- else
+ } else {
+ close(ifd);
return error("copy-fd: write returned %s",
strerror(errno));
+ }
}
}
close(ifd);
diff --git a/git-fetch.sh b/git-fetch.sh
index 767ca61..125bcea 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -192,7 +192,7 @@ then
sed -e '
/\^/d
s/^[^ ]* //
- s/.*/&:&/')
+ s/.*/.&:&/')
if test "$#" -gt 1
then
# remote URL plus explicit refspecs; we need to merge them.
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 1510ea9..de45ac4 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -168,7 +168,7 @@ test_expect_success \
: sum of the index file itself &&
l=`wc -c <test-3.idx` &&
- l=`expr "$l" - 20` &&
+ l=`expr $l - 20` &&
cp test-1-${packname_1}.pack test-3.pack &&
dd if=/dev/zero of=test-3.idx count=20 bs=1 conv=notrunc seek=$l &&
if git-verify-pack test-3.pack
diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
index 8ec9ebb..368b8d9 100755
--- a/t/t6001-rev-list-merge-order.sh
+++ b/t/t6001-rev-list-merge-order.sh
@@ -110,7 +110,7 @@ save_tag g4 unique_commit g6 tree -p g3 -p h2
git-update-ref HEAD $(tag l5)
-test_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -s " "' <<EOF
+test_output_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -d \" \"' <<EOF
19
EOF
diff --git a/t/t6003-rev-list-topo-order.sh b/t/t6003-rev-list-topo-order.sh
index 98f9a1e..d99a9ad 100755
--- a/t/t6003-rev-list-topo-order.sh
+++ b/t/t6003-rev-list-topo-order.sh
@@ -79,7 +79,7 @@ save_tag g4 unique_commit g6 tree -p g3 -p h2
git-update-ref HEAD $(tag l5)
-test_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -s " "' <<EOF
+test_output_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD | wc -l | tr -d \" \"' <<EOF
19
EOF