author | Lars Hjemli <hjemli@gmail.com> | 2008-10-05 11:13:03 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-10-05 11:13:03 (UTC) |
commit | 204669ff4a4028a82cc48e9319632595ba3ff703 (patch) (side-by-side diff) | |
tree | b951f29e966e13fb62f9edfdf51cbdfb19e9c868 | |
parent | f82b19407dd876e6c02a572615bf34b09f6fa831 (diff) | |
download | cgit-204669ff4a4028a82cc48e9319632595ba3ff703.zip cgit-204669ff4a4028a82cc48e9319632595ba3ff703.tar.gz cgit-204669ff4a4028a82cc48e9319632595ba3ff703.tar.bz2 |
ui-snapshot.c: specify archiver_args.baselen
The struct member was introduces in git commit d53fe8187c38, but the cgit
testsuite failed to detect that cgit always generated archives without
prefixes, i.e. the result from cgit_repobasename was ignored.
This fixes the bug and the testsuite.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rwxr-xr-x | tests/t0107-snapshot.sh | 5 | ||||
-rw-r--r-- | ui-snapshot.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh index 8e90e10..d97c465 100755 --- a/tests/t0107-snapshot.sh +++ b/tests/t0107-snapshot.sh @@ -20,9 +20,12 @@ run_test 'strip off the header lines' ' tail -n +6 trash/tmp > trash/test.tar.gz ' run_test 'verify gzip format' 'gunzip --test trash/test.tar.gz' -run_test 'untar' 'tar -xf trash/test.tar.gz -C trash' +run_test 'untar' ' + rm -rf trash/foo && + tar -xf trash/test.tar.gz -C trash +' run_test 'count files' ' c=$(ls -1 trash/foo/ | wc -l) && test $c = 5 diff --git a/ui-snapshot.c b/ui-snapshot.c index 966a140..7a597ff 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -81,9 +81,15 @@ static int make_snapshot(const struct cgit_snapshot_format *format, cgit_print_error(fmt("Not a commit reference: %s", hex)); return 1; } memset(&args, 0, sizeof(args)); + if (prefix) { args.base = fmt("%s/", prefix); + args.baselen = strlen(prefix) + 1; + } else { + args.base = ""; + args.baselen = 0; + } args.tree = commit->tree; args.time = commit->date; ctx.page.mimetype = xstrdup(format->mimetype); ctx.page.filename = xstrdup(filename); |