kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-format-patch: add --output-directory long option again 

Additionally notices and complains to an -o option without
directory or a duplicated -o option, -o and --stdout given
together.  Also delays the creation of directory until all
arguments are parsed, so that the command does not leave an
empty directory behind when it exits after seeing an unrelated
invalid option.

[jc: originally from Dennis Stosberg but with minor fixes, and
 documentation updates from Dennis.]

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 2006-06-06 08:46:23 -07:00
parent 16cee38ae2
commit efd0201684
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-format-patch.txt
View File

@ -40,8 +40,7 @@ OPTIONS
------- -------
-o|--output-directory <dir>:: -o|--output-directory <dir>::
Use <dir> to store the resulting files, instead of the Use <dir> to store the resulting files, instead of the
current working directory. This option is ignored if current working directory.
--stdout is specified.


-n|--numbered:: -n|--numbered::
Name output in '[PATCH n/m]' format. Name output in '[PATCH n/m]' format.

26
builtin-log.c
View File

@ -103,7 +103,7 @@ static int git_format_config(const char *var, const char *value)




static FILE *realstdout = NULL; static FILE *realstdout = NULL;
static char *output_directory = NULL; static const char *output_directory = NULL;


static void reopen_stdout(struct commit *commit, int nr, int keep_subject) static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
{ {
@ -206,14 +206,14 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
keep_subject = 1; keep_subject = 1;
rev.total = -1; rev.total = -1;
} }
else if (!strcmp(argv[i], "-o")) { else if (!strcmp(argv[i], "--output-directory") ||
if (argc < 3) !strcmp(argv[i], "-o")) {
die ("Which directory?");
if (mkdir(argv[i + 1], 0777) < 0 && errno != EEXIST)
die("Could not create directory %s",
argv[i + 1]);
output_directory = strdup(argv[i + 1]);
i++; i++;
if (argc <= i)
die("Which directory?");
if (output_directory)
die("Two output directories?");
output_directory = argv[i];
} }
else if (!strcmp(argv[i], "--signoff") || else if (!strcmp(argv[i], "--signoff") ||
!strcmp(argv[i], "-s")) { !strcmp(argv[i], "-s")) {
@ -243,6 +243,14 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
if (argc > 1) if (argc > 1)
die ("unrecognized argument: %s", argv[1]); die ("unrecognized argument: %s", argv[1]);


if (output_directory) {
if (use_stdout)
die("standard output, or directory, which one?");
if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
die("Could not create directory %s",
output_directory);
}

if (rev.pending_objects && rev.pending_objects->next == NULL) { if (rev.pending_objects && rev.pending_objects->next == NULL) {
rev.pending_objects->item->flags |= UNINTERESTING; rev.pending_objects->item->flags |= UNINTERESTING;
add_head(&rev); add_head(&rev);
@ -293,8 +301,6 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
if (!use_stdout) if (!use_stdout)
fclose(stdout); fclose(stdout);
} }
if (output_directory)
free(output_directory);
free(list); free(list);
return 0; return 0;
} }