mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fmt-patch: implement -o <dir>

Browse Source 
I had to move the command line parsing around a little; setup_revisions()
could mistaken <dir> for a valid ref.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Johannes Schindelin
2006-05-05 03:33:32 +02:00
committed by Junio C Hamano
parent 81f3a188a3
commit 2448482b3d
1 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
builtin-log.c
View File

@ -76,15 +76,22 @@ static int istitlechar(char c)
} }
static FILE *realstdout = NULL; static FILE *realstdout = NULL;
static char *output_directory = NULL;
static void reopen_stdout(struct commit *commit, int nr) static void reopen_stdout(struct commit *commit, int nr)
{ {
char filename[1024]; char filename[1024];
char *sol; char *sol;
int len; int len = 0;
if (output_directory) {
strncpy(filename, output_directory, 1010);
len = strlen(filename);
if (filename[len - 1] != '/')
filename[len++] = '/';
}
sprintf(filename, "%04d", nr); sprintf(filename + len, "%04d", nr);
len = strlen(filename); len = strlen(filename);
sol = strstr(commit->buffer, "\n\n"); sol = strstr(commit->buffer, "\n\n");
@ -128,7 +135,7 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
struct commit *commit; struct commit *commit;
struct commit **list = NULL; struct commit **list = NULL;
struct rev_info rev; struct rev_info rev;
int nr = 0, total; int nr = 0, total, i, j;
int use_stdout = 0; int use_stdout = 0;
init_revisions(&rev); init_revisions(&rev);
@ -140,16 +147,31 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
rev.combine_merges = 0; rev.combine_merges = 0;
rev.ignore_merges = 1; rev.ignore_merges = 1;
rev.diffopt.output_format = DIFF_FORMAT_PATCH; rev.diffopt.output_format = DIFF_FORMAT_PATCH;
argc = setup_revisions(argc, argv, &rev, "HEAD");
while (argc > 1) { /*
if (!strcmp(argv[1], "--stdout")) * Parse the arguments before setup_revisions(), or something
* like "git fmt-patch -o a123 HEAD^.." may fail; a123 is
* possibly a valid SHA1.
*/
for (i = 1, j = 1; i < argc; i++) {
if (!strcmp(argv[i], "--stdout"))
use_stdout = 1; use_stdout = 1;
else else if (!strcmp(argv[i], "-o")) {
die ("unrecognized argument: %s", argv[1]); if (argc < 3)
argc--; die ("Which directory?");
argv++; 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++;
} else
argv[j++] = argv[i];
} }
argc = j;
argc = setup_revisions(argc, argv, &rev, "HEAD");
if (argc > 1)
die ("unrecognized argument: %s", argv[1]);
if (!use_stdout) if (!use_stdout)
realstdout = fdopen(dup(1), "w"); realstdout = fdopen(dup(1), "w");
@ -177,6 +199,8 @@ 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;
} }