summaryrefslogtreecommitdiff
path: root/builtin-archive.c
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2007-09-06 18:51:11 +0200
committerJunio C Hamano <gitster@pobox.com>2007-09-06 22:51:41 -0700
commit38c9c9b798a0df875968ae49d699298131dfa24d (patch)
treed103c487050454f81bfb4b440a705344c66558d0 /builtin-archive.c
parentdf4a394f91d7d107c2a57e6c1df3638517cab54f (diff)
downloadgit-38c9c9b798a0df875968ae49d699298131dfa24d.tar.gz
archive: rename attribute specfile to export-subst
As suggested by Junio and Johannes, change the name of the former attribute specfile to export-subst to indicate its function rather than purpose and to make clear that it is not applied to working tree files. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-archive.c')
-rw-r--r--builtin-archive.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/builtin-archive.c b/builtin-archive.c
index 65bf9cbec1..e221f115f9 100644
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -81,8 +81,8 @@ static int run_remote_archiver(const char *remote, int argc,
return !!rv;
}
-static void *format_specfile(const struct commit *commit, const char *format,
- unsigned long *sizep)
+static void *format_subst(const struct commit *commit, const char *format,
+ unsigned long *sizep)
{
unsigned long len = *sizep, result_len = 0;
const char *a = format;
@@ -131,22 +131,22 @@ static void *convert_to_archive(const char *path,
const void *src, unsigned long *sizep,
const struct commit *commit)
{
- static struct git_attr *attr_specfile;
+ static struct git_attr *attr_export_subst;
struct git_attr_check check[1];
if (!commit)
return NULL;
- if (!attr_specfile)
- attr_specfile = git_attr("specfile", 8);
+ if (!attr_export_subst)
+ attr_export_subst = git_attr("export-subst", 12);
- check[0].attr = attr_specfile;
+ check[0].attr = attr_export_subst;
if (git_checkattr(path, ARRAY_SIZE(check), check))
return NULL;
if (!ATTR_TRUE(check[0].value))
return NULL;
- return format_specfile(commit, src, sizep);
+ return format_subst(commit, src, sizep);
}
void *sha1_file_to_archive(const char *path, const unsigned char *sha1,