summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorBert Wesarg <bert.wesarg@googlemail.com>2019-10-11 08:36:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-12 02:51:20 (GMT)
commitedefc318731f69c3e5354ead9f7505e789562375 (patch)
tree028c2bc8b344df445ea07ce86f0a932d8572c8c9 /builtin/log.c
parent50094ca45f27b8bf5f4c234b2f2643ecd61b8c86 (diff)
downloadgit-edefc318731f69c3e5354ead9f7505e789562375.zip
git-edefc318731f69c3e5354ead9f7505e789562375.tar.gz
git-edefc318731f69c3e5354ead9f7505e789562375.tar.bz2
format-patch: create leading components of output directory
'git format-patch -o <outdir>' did an equivalent of 'mkdir <outdir>' not 'mkdir -p <outdir>', which is being corrected. Avoid the usage of 'adjust_shared_perm' on the leading directories which may have security implications. Achieved by temporarily disabling of 'config.sharedRepository' like 'git init' does. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/log.c')
-rw-r--r--builtin/log.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 44b10b3..8d08632 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1765,10 +1765,26 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
setup_pager();
if (output_directory) {
+ int saved;
if (rev.diffopt.use_color != GIT_COLOR_ALWAYS)
rev.diffopt.use_color = GIT_COLOR_NEVER;
if (use_stdout)
die(_("standard output, or directory, which one?"));
+ /*
+ * We consider <outdir> as 'outside of gitdir', therefore avoid
+ * applying adjust_shared_perm in s-c-l-d.
+ */
+ saved = get_shared_repository();
+ set_shared_repository(0);
+ switch (safe_create_leading_directories_const(output_directory)) {
+ case SCLD_OK:
+ case SCLD_EXISTS:
+ break;
+ default:
+ die(_("could not create leading directories "
+ "of '%s'"), output_directory);
+ }
+ set_shared_repository(saved);
if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
die_errno(_("could not create directory '%s'"),
output_directory);