kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

archive-zip: load userdiff config 

Since 4aff646d17 (archive-zip: mark text files in archives,
2015-03-05), the zip archiver will look at the userdiff
driver to decide whether a file is text or binary. This
usually doesn't need to look any further than the attributes
themselves (e.g., "-diff", etc). But if the user defines a
custom driver like "diff=foo", we need to look at
"diff.foo.binary" in the config. Prior to this patch, we
didn't actually load it.

Signed-off-by: Jeff King <peff@peff.net>
Acked-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2017-01-02 17:25:09 -05:00 committed by Junio C Hamano
parent c3808ca698
commit 965cba2e7e
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archive-zip.c
View File

@ -554,11 +554,18 @@ static void dos_time(time_t *time, int *dos_date, int *dos_time)
*dos_time = t->tm_sec / 2 + t->tm_min * 32 + t->tm_hour * 2048; *dos_time = t->tm_sec / 2 + t->tm_min * 32 + t->tm_hour * 2048;
} }


static int archive_zip_config(const char *var, const char *value, void *data)
{
return userdiff_config(var, value);
}

static int write_zip_archive(const struct archiver *ar, static int write_zip_archive(const struct archiver *ar,
struct archiver_args *args) struct archiver_args *args)
{ {
int err; int err;


git_config(archive_zip_config, NULL);

dos_time(&args->time, &zip_date, &zip_time); dos_time(&args->time, &zip_date, &zip_time);


zip_dir = xmalloc(ZIP_DIRECTORY_MIN_SIZE); zip_dir = xmalloc(ZIP_DIRECTORY_MIN_SIZE);

22
t/t5003-archive-zip.sh
View File

@ -64,6 +64,12 @@ check_zip() {
test_cmp_bin $original/nodiff.crlf $extracted/nodiff.crlf && test_cmp_bin $original/nodiff.crlf $extracted/nodiff.crlf &&
test_cmp_bin $original/nodiff.lf $extracted/nodiff.lf test_cmp_bin $original/nodiff.lf $extracted/nodiff.lf
" "

test_expect_success UNZIP " validate that custom diff is unchanged " "
test_cmp_bin $original/custom.cr $extracted/custom.cr &&
test_cmp_bin $original/custom.crlf $extracted/custom.crlf &&
test_cmp_bin $original/custom.lf $extracted/custom.lf
"
} }


test_expect_success \ test_expect_success \
@ -78,6 +84,9 @@ test_expect_success \
printf "text\r" >a/nodiff.cr && printf "text\r" >a/nodiff.cr &&
printf "text\r\n" >a/nodiff.crlf && printf "text\r\n" >a/nodiff.crlf &&
printf "text\n" >a/nodiff.lf && printf "text\n" >a/nodiff.lf &&
printf "text\r" >a/custom.cr &&
printf "text\r\n" >a/custom.crlf &&
printf "text\n" >a/custom.lf &&
printf "\0\r" >a/binary.cr && printf "\0\r" >a/binary.cr &&
printf "\0\r\n" >a/binary.crlf && printf "\0\r\n" >a/binary.crlf &&
printf "\0\n" >a/binary.lf && printf "\0\n" >a/binary.lf &&
@ -112,15 +121,20 @@ test_expect_success 'add files to repository' '
test_expect_success 'setup export-subst and diff attributes' ' test_expect_success 'setup export-subst and diff attributes' '
echo "a/nodiff.* -diff" >>.git/info/attributes && echo "a/nodiff.* -diff" >>.git/info/attributes &&
echo "a/diff.* diff" >>.git/info/attributes && echo "a/diff.* diff" >>.git/info/attributes &&
echo "a/custom.* diff=custom" >>.git/info/attributes &&
git config diff.custom.binary true &&
echo "substfile?" export-subst >>.git/info/attributes && echo "substfile?" export-subst >>.git/info/attributes &&
git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \ git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
>a/substfile1 >a/substfile1
' '


test_expect_success \ test_expect_success 'create bare clone' '
'create bare clone' \ git clone --bare . bare.git &&
'git clone --bare . bare.git && cp .git/info/attributes bare.git/info/attributes &&
cp .git/info/attributes bare.git/info/attributes' # Recreate our changes to .git/config rather than just copying it, as
# we do not want to clobber core.bare or other settings.
git -C bare.git config diff.custom.binary true
'


test_expect_success \ test_expect_success \
'remove ignored file' \ 'remove ignored file' \