mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Makefile: fix shell quoting
  tests: propagate $(TAR) down from the toplevel Makefile
  index-pack.c: correctly initialize appended objects
  send-email: find body-encoding correctly
This commit is contained in:
Junio C Hamano
2008-07-25 13:56:36 -07:00
parent c921cc92e5 bfce5087ee
commit d9d9e6ee63
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1255,8 +1255,12 @@ GIT-CFLAGS: .FORCE-GIT-CFLAGS
echo "$$FLAGS" >GIT-CFLAGS; \ echo "$$FLAGS" >GIT-CFLAGS; \
fi fi
# We need to apply sq twice, once to protect from the shell
# that runs GIT-BUILD-OPTIONS, and then again to protect it
# and the first level quoting from the shell that runs "echo".
GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS
@echo SHELL_PATH=\''$(SHELL_PATH_SQ)'\' >$@ @echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@
@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
### Detect Tck/Tk interpreter path changes ### Detect Tck/Tk interpreter path changes
ifndef NO_TCLTK ifndef NO_TCLTK

2
git-send-email.perl
View File

@ -882,7 +882,7 @@ foreach my $t (@files) {
} }
elsif (/^Content-type:/i) { elsif (/^Content-type:/i) {
$has_content_type = 1; $has_content_type = 1;
if (/charset="?[^ "]+/) { if (/charset="?([^ "]+)/) {
$body_encoding = $1; $body_encoding = $1;
} }
push @xh, $_; push @xh, $_;

4
index-pack.c
View File

@ -699,6 +699,10 @@ static struct object_entry *append_obj_to_pack(
write_or_die(output_fd, header, n); write_or_die(output_fd, header, n);
obj[0].idx.crc32 = crc32(0, Z_NULL, 0); obj[0].idx.crc32 = crc32(0, Z_NULL, 0);
obj[0].idx.crc32 = crc32(obj[0].idx.crc32, header, n); obj[0].idx.crc32 = crc32(obj[0].idx.crc32, header, n);
obj[0].size = size;
obj[0].hdr_size = n;
obj[0].type = type;
obj[0].real_type = type;
obj[1].idx.offset = obj[0].idx.offset + n; obj[1].idx.offset = obj[0].idx.offset + n;
obj[1].idx.offset += write_compressed(output_fd, buf, size, &obj[0].idx.crc32); obj[1].idx.offset += write_compressed(output_fd, buf, size, &obj[0].idx.crc32);
hashcpy(obj->idx.sha1, sha1); hashcpy(obj->idx.sha1, sha1);

11
t/t5000-tar-tree.sh
View File

@ -25,7 +25,6 @@ commit id embedding:
' '
. ./test-lib.sh . ./test-lib.sh
TAR=${TAR:-tar}
UNZIP=${UNZIP:-unzip} UNZIP=${UNZIP:-unzip}
SUBSTFORMAT=%H%n SUBSTFORMAT=%H%n
@ -77,7 +76,7 @@ test_expect_success \
test_expect_success \ test_expect_success \
'validate file modification time' \ 'validate file modification time' \
'mkdir extract && 'mkdir extract &&
$TAR xf b.tar -C extract a/a && "$TAR" xf b.tar -C extract a/a &&
perl -e '\''print((stat("extract/a/a"))[9], "\n")'\'' >b.mtime && perl -e '\''print((stat("extract/a/a"))[9], "\n")'\'' >b.mtime &&
echo "1117231200" >expected.mtime && echo "1117231200" >expected.mtime &&
diff expected.mtime b.mtime' diff expected.mtime b.mtime'
@ -89,7 +88,7 @@ test_expect_success \
test_expect_success \ test_expect_success \
'extract tar archive' \ 'extract tar archive' \
'(cd b && $TAR xf -) <b.tar' '(cd b && "$TAR" xf -) <b.tar'
test_expect_success \ test_expect_success \
'validate filenames' \ 'validate filenames' \
@ -106,7 +105,7 @@ test_expect_success \
test_expect_success \ test_expect_success \
'extract tar archive with prefix' \ 'extract tar archive with prefix' \
'(cd c && $TAR xf -) <c.tar' '(cd c && "$TAR" xf -) <c.tar'
test_expect_success \ test_expect_success \
'validate filenames with prefix' \ 'validate filenames with prefix' \
@ -126,7 +125,7 @@ test_expect_success \
test_expect_success \ test_expect_success \
'extract substfiles' \ 'extract substfiles' \
'(mkdir f && cd f && $TAR xf -) <f.tar' '(mkdir f && cd f && "$TAR" xf -) <f.tar'
test_expect_success \ test_expect_success \
'validate substfile contents' \ 'validate substfile contents' \
@ -138,7 +137,7 @@ test_expect_success \
test_expect_success \ test_expect_success \
'extract substfiles from archive with prefix' \ 'extract substfiles from archive with prefix' \
'(mkdir g && cd g && $TAR xf -) <g.tar' '(mkdir g && cd g && "$TAR" xf -) <g.tar'
test_expect_success \ test_expect_success \
'validate substfile contents from archive with prefix' \ 'validate substfile contents from archive with prefix' \