summaryrefslogtreecommitdiff
path: root/archive-zip.c
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2008-04-09 21:14:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-04-10 07:20:38 (GMT)
commitac7fa2776c4a839a5a96c13886714774b52844de (patch)
tree9d07d1203f5cd3c2bfbd5d2c22f894f36fd805ac /archive-zip.c
parent3f36cbbaaf87b67abafa851e2808735553f92b06 (diff)
downloadgit-ac7fa2776c4a839a5a96c13886714774b52844de.zip
git-ac7fa2776c4a839a5a96c13886714774b52844de.tar.gz
git-ac7fa2776c4a839a5a96c13886714774b52844de.tar.bz2
git-archive: ignore prefix when checking file attribute
Ulrik Sverdrup noticed that git-archive doesn't correctly apply the attribute export-subst when the option --prefix is given, too. When it checked if a file has the attribute turned on, git-archive would try to look up the full path -- including the prefix -- in .gitattributes. That's wrong, as the prefix doesn't need to have any relation to any existing directories, tracked or not. This patch makes git-archive ignore the prefix when looking up if value of the attribute export-subst for a file. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'archive-zip.c')
-rw-r--r--archive-zip.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/archive-zip.c b/archive-zip.c
index 74e30f6..18c0f87 100644
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -13,6 +13,7 @@ static int verbose;
static int zip_date;
static int zip_time;
static const struct commit *commit;
+static size_t base_len;
static unsigned char *zip_dir;
static unsigned int zip_dir_size;
@@ -197,8 +198,8 @@ static int write_zip_entry(const unsigned char *sha1,
if (S_ISREG(mode) && zlib_compression_level != 0)
method = 8;
result = 0;
- buffer = sha1_file_to_archive(path, sha1, mode, &type, &size,
- commit);
+ buffer = sha1_file_to_archive(path + base_len, sha1, mode,
+ &type, &size, commit);
if (!buffer)
die("cannot read %s", sha1_to_hex(sha1));
crc = crc32(crc, buffer, size);
@@ -321,6 +322,7 @@ int write_zip_archive(struct archiver_args *args)
zip_dir_size = ZIP_DIRECTORY_MIN_SIZE;
verbose = args->verbose;
commit = args->commit;
+ base_len = args->base ? strlen(args->base) : 0;
if (args->base && plen > 0 && args->base[plen - 1] == '/') {
char *base = xstrdup(args->base);