mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
archive: specfile syntax change: "$Format:%PLCHLDR$" instead of just "%PLCHLDR" (take 2)
As suggested by Johannes, --pretty=format: placeholders in specfiles need to be wrapped in $Format:...$ now. This syntax change restricts the expansion of placeholders and makes it easier to use with files that contain non-placeholder percent signs. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
b21b9f1de3
commit
df4a394f91
|
@ -432,7 +432,10 @@ several placeholders when adding this file to an archive. The
|
|||
expansion depends on the availability of a commit ID, i.e. if
|
||||
gitlink:git-archive[1] has been given a tree instead of a commit or a
|
||||
tag then no replacement will be done. The placeholders are the same
|
||||
as those for the option `--pretty=format:` of gitlink:git-log[1].
|
||||
as those for the option `--pretty=format:` of gitlink:git-log[1],
|
||||
except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`
|
||||
in the file. E.g. the string `$Format:%H$` will be replaced by the
|
||||
commit hash.
|
||||
|
||||
|
||||
GIT
|
||||
|
|
|
@ -81,14 +81,58 @@ 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)
|
||||
{
|
||||
unsigned long len = *sizep, result_len = 0;
|
||||
const char *a = format;
|
||||
char *result = NULL;
|
||||
|
||||
for (;;) {
|
||||
const char *b, *c;
|
||||
char *fmt, *formatted = NULL;
|
||||
unsigned long a_len, fmt_len, formatted_len, allocated = 0;
|
||||
|
||||
b = memmem(a, len, "$Format:", 8);
|
||||
if (!b || a + len < b + 9)
|
||||
break;
|
||||
c = memchr(b + 8, '$', len - 8);
|
||||
if (!c)
|
||||
break;
|
||||
|
||||
a_len = b - a;
|
||||
fmt_len = c - b - 8;
|
||||
fmt = xmalloc(fmt_len + 1);
|
||||
memcpy(fmt, b + 8, fmt_len);
|
||||
fmt[fmt_len] = '\0';
|
||||
|
||||
formatted_len = format_commit_message(commit, fmt, &formatted,
|
||||
&allocated);
|
||||
result = xrealloc(result, result_len + a_len + formatted_len);
|
||||
memcpy(result + result_len, a, a_len);
|
||||
memcpy(result + result_len + a_len, formatted, formatted_len);
|
||||
result_len += a_len + formatted_len;
|
||||
len -= c + 1 - a;
|
||||
a = c + 1;
|
||||
}
|
||||
|
||||
if (result && len) {
|
||||
result = xrealloc(result, result_len + len);
|
||||
memcpy(result + result_len, a, len);
|
||||
result_len += len;
|
||||
}
|
||||
|
||||
*sizep = result_len;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
static void *convert_to_archive(const char *path,
|
||||
const void *src, unsigned long *sizep,
|
||||
const struct commit *commit)
|
||||
{
|
||||
static struct git_attr *attr_specfile;
|
||||
struct git_attr_check check[1];
|
||||
char *interpolated = NULL;
|
||||
unsigned long allocated = 0;
|
||||
|
||||
if (!commit)
|
||||
return NULL;
|
||||
|
@ -102,9 +146,7 @@ static void *convert_to_archive(const char *path,
|
|||
if (!ATTR_TRUE(check[0].value))
|
||||
return NULL;
|
||||
|
||||
*sizep = format_commit_message(commit, src, &interpolated, &allocated);
|
||||
|
||||
return interpolated;
|
||||
return format_specfile(commit, src, sizep);
|
||||
}
|
||||
|
||||
void *sha1_file_to_archive(const char *path, const unsigned char *sha1,
|
||||
|
|
|
@ -36,7 +36,7 @@ test_expect_success \
|
|||
echo simple textfile >a/a &&
|
||||
mkdir a/bin &&
|
||||
cp /bin/sh a/bin &&
|
||||
printf "%s" "$SPECFILEFORMAT" >a/specfile &&
|
||||
printf "A\$Format:%s\$O" "$SPECFILEFORMAT" >a/specfile &&
|
||||
ln -s a a/l1 &&
|
||||
(p=long_path_to_a_file && cd a &&
|
||||
for depth in 1 2 3 4 5; do mkdir $p && cd $p; done &&
|
||||
|
@ -119,7 +119,7 @@ test_expect_success \
|
|||
|
||||
test_expect_success \
|
||||
'validate specfile contents' \
|
||||
'git log --max-count=1 "--pretty=format:$SPECFILEFORMAT" HEAD \
|
||||
'git log --max-count=1 "--pretty=format:A${SPECFILEFORMAT}O" HEAD \
|
||||
>f/a/specfile.expected &&
|
||||
diff f/a/specfile.expected f/a/specfile'
|
||||
|
||||
|
|
Loading…
Reference in a new issue