mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'jk/archive-zip-userdiff-config'
"git archive" did not read the standard configuration files, and failed to notice a file that is marked as binary via the userdiff driver configuration. * jk/archive-zip-userdiff-config: archive-zip: load userdiff config
This commit is contained in:
commit
0f650e1479
|
@ -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;
|
||||
}
|
||||
|
||||
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,
|
||||
struct archiver_args *args)
|
||||
{
|
||||
int err;
|
||||
|
||||
git_config(archive_zip_config, NULL);
|
||||
|
||||
dos_time(&args->time, &zip_date, &zip_time);
|
||||
|
||||
zip_dir = xmalloc(ZIP_DIRECTORY_MIN_SIZE);
|
||||
|
|
|
@ -64,6 +64,12 @@ check_zip() {
|
|||
test_cmp_bin $original/nodiff.crlf $extracted/nodiff.crlf &&
|
||||
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 \
|
||||
|
@ -78,6 +84,9 @@ test_expect_success \
|
|||
printf "text\r" >a/nodiff.cr &&
|
||||
printf "text\r\n" >a/nodiff.crlf &&
|
||||
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\n" >a/binary.crlf &&
|
||||
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' '
|
||||
echo "a/nodiff.* -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 &&
|
||||
git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
|
||||
>a/substfile1
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'create bare clone' \
|
||||
'git clone --bare . bare.git &&
|
||||
cp .git/info/attributes bare.git/info/attributes'
|
||||
test_expect_success 'create bare clone' '
|
||||
git clone --bare . bare.git &&
|
||||
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 \
|
||||
'remove ignored file' \
|
||||
|
|
Loading…
Reference in a new issue