diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-27 18:13:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-27 18:13:30 -0800 |
| commit | 58e3fb40f7ca1c28f9105c15166884f80bb22e55 (patch) | |
| tree | 4e7e791ecc24975530de1f2855cf5f17f112140b | |
| parent | cfee10a773be0f8d0024f2567164c910d4213244 (diff) | |
| parent | 17dff84b5e745ba17a5b3ae5591d79f96b165d48 (diff) | |
| download | git-58e3fb40f7ca1c28f9105c15166884f80bb22e55.tar.gz git-58e3fb40f7ca1c28f9105c15166884f80bb22e55.tar.xz | |
Merge fixes up to GIT 1.0.6
| -rw-r--r-- | copy.c | 7 | ||||
| -rwxr-xr-x | git-fetch.sh | 2 | ||||
| -rwxr-xr-x | t/t5300-pack-object.sh | 2 | ||||
| -rwxr-xr-x | t/t6001-rev-list-merge-order.sh | 2 | ||||
| -rwxr-xr-x | t/t6003-rev-list-topo-order.sh | 2 |
5 files changed, 9 insertions, 6 deletions
@@ -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 767ca61ca..125bcea1b 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 1510ea9fc..de45ac4e0 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 8ec9ebb98..368b8d9e0 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 98f9a1e67..d99a9ad39 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 |