undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fixes up to GIT 1.0.6

Browse Source
This commit is contained in:
Junio C Hamano 2005-12-27 18:13:30 -08:00
commit 58e3fb40f7
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
copy.c
View File

@ -22,11 +22,14 @@ int copy_fd(int ifd, int ofd)
buf += written; buf += written;
len -= written; len -= written;
} }
else if (!written) else if (!written) {
close(ifd);
return error("copy-fd: write returned 0"); return error("copy-fd: write returned 0");
else } else {
close(ifd);
return error("copy-fd: write returned %s", return error("copy-fd: write returned %s",
strerror(errno)); strerror(errno));
}
} }
} }
close(ifd); close(ifd);

2
git-fetch.sh
View File

@ -192,7 +192,7 @@ then
sed -e ' sed -e '
/\^/d /\^/d
s/^[^ ]* // s/^[^ ]* //
s/.*/&:&/') s/.*/.&:&/')
if test "$#" -gt 1 if test "$#" -gt 1
then then
# remote URL plus explicit refspecs; we need to merge them. # remote URL plus explicit refspecs; we need to merge them.

2
t/t5300-pack-object.sh
View File

@ -168,7 +168,7 @@ test_expect_success \
: sum of the index file itself && : sum of the index file itself &&
l=`wc -c <test-3.idx` && l=`wc -c <test-3.idx` &&
l=`expr "$l" - 20` && l=`expr $l - 20` &&
cp test-1-${packname_1}.pack test-3.pack && 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 && dd if=/dev/zero of=test-3.idx count=20 bs=1 conv=notrunc seek=$l &&
if git-verify-pack test-3.pack if git-verify-pack test-3.pack

2
t/t6001-rev-list-merge-order.sh
View File

@ -110,7 +110,7 @@ save_tag g4 unique_commit g6 tree -p g3 -p h2
git-update-ref HEAD $(tag l5) 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 19
EOF EOF

2
t/t6003-rev-list-topo-order.sh
View File

@ -79,7 +79,7 @@ save_tag g4 unique_commit g6 tree -p g3 -p h2
git-update-ref HEAD $(tag l5) 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 19
EOF EOF