GIT 1.0.6

Junio C Hamano · Junio C Hamano · commit 17dff84b5e74 · 2005-12-27T18:08:58.000-08:00
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,14 @@ int copy_fd(int ifd, int ofd)`
`22`	`22`	`buf += written;`
`23`	`23`	`len -= written;`
`24`	`24`	`}`
`25`		`- else if (!written)`
	`25`	`+ else if (!written) {`
	`26`	`+ close(ifd);`
`26`	`27`	`return error("copy-fd: write returned 0");`
`27`		`- else`
	`28`	`+ } else {`
	`29`	`+ close(ifd);`
`28`	`30`	`return error("copy-fd: write returned %s",`
`29`	`31`	`strerror(errno));`
	`32`	`+ }`
`30`	`33`	`}`
`31`	`34`	`}`
`32`	`35`	`close(ifd);`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ save_tag g4 unique_commit g6 tree -p g3 -p h2`
`110`	`110`
`111`	`111`	`git-update-ref HEAD $(tag l5)`
`112`	`112`
`113`		`-test_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD \| wc -l \| tr -s " "' <<EOF`
	`113`	`+test_output_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD \| wc -l \| tr -d \" \"' <<EOF`
`114`	`114`	`19`
`115`	`115`	`EOF`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ save_tag g4 unique_commit g6 tree -p g3 -p h2`
`79`	`79`
`80`	`80`	`git-update-ref HEAD $(tag l5)`
`81`	`81`
`82`		`-test_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD \| wc -l \| tr -s " "' <<EOF`
	`82`	`+test_output_expect_success 'rev-list has correct number of entries' 'git-rev-list HEAD \| wc -l \| tr -d \" \"' <<EOF`
`83`	`83`	`19`
`84`	`84`	`EOF`
`85`	`85`