summaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-21 16:50:19 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-21 16:50:19 -0800
commita14f15427bca9af70127f26cd3cb0fcd78c8d36f (patch)
tree7ad560fc9b61303201846577c32fc653245dcbe1 /builtin-log.c
parent8318eb795e4bda87d16871ac8ddd5afed033d551 (diff)
parent9800a754f931d05c2d26da9c1b188ae2c2b80eb4 (diff)
downloadgit-a14f15427bca9af70127f26cd3cb0fcd78c8d36f.tar.gz
Merge branch 'jc/maint-format-patch-o-relative'
* jc/maint-format-patch-o-relative: Teach format-patch to handle output directory relative to cwd Conflicts: t/t4014-format-patch.sh
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c28
1 files changed, 25 insertions, 3 deletions
diff --git a/builtin-log.c b/builtin-log.c
index c7aa48e748..2ae39afccd 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -545,6 +545,7 @@ static const char *get_oneline_for_filename(struct commit *commit,
static FILE *realstdout = NULL;
static const char *output_directory = NULL;
+static int outdir_offset;
static int reopen_stdout(const char *oneline, int nr, int total)
{
@@ -571,7 +572,7 @@ static int reopen_stdout(const char *oneline, int nr, int total)
strcpy(filename + len, fmt_patch_suffix);
}
- fprintf(realstdout, "%s\n", filename);
+ fprintf(realstdout, "%s\n", filename + outdir_offset);
if (freopen(filename, "w", stdout) == NULL)
return error("Cannot open patch file %s",filename);
@@ -732,6 +733,27 @@ static const char *clean_message_id(const char *msg_id)
return xmemdupz(a, z - a);
}
+static const char *set_outdir(const char *prefix, const char *output_directory)
+{
+ if (output_directory && is_absolute_path(output_directory))
+ return output_directory;
+
+ if (!prefix || !*prefix) {
+ if (output_directory)
+ return output_directory;
+ /* The user did not explicitly ask for "./" */
+ outdir_offset = 2;
+ return "./";
+ }
+
+ outdir_offset = strlen(prefix);
+ if (!output_directory)
+ return prefix;
+
+ return xstrdup(prefix_filename(prefix, outdir_offset,
+ output_directory));
+}
+
int cmd_format_patch(int argc, const char **argv, const char *prefix)
{
struct commit *commit;
@@ -909,8 +931,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (!DIFF_OPT_TST(&rev.diffopt, TEXT) && !no_binary_diff)
DIFF_OPT_SET(&rev.diffopt, BINARY);
- if (!output_directory && !use_stdout)
- output_directory = prefix;
+ if (!use_stdout)
+ output_directory = set_outdir(prefix, output_directory);
if (output_directory) {
if (use_stdout)