undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-file: support -p and -q; fix compile warnings

Browse Source 
Now merge-file also understands --stdout and --quiet options. While
at it, two compile warnings were fixed.

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-12-06 16:45:42 +01:00 committed by Junio C Hamano
parent ba1f5f3537
commit fbe0b24ca5
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
builtin-merge-file.c
View File

@ -2,7 +2,7 @@
#include "xdiff/xdiff.h" #include "xdiff/xdiff.h"
static const char merge_file_usage[] = static const char merge_file_usage[] =
"git merge-file [-L name1 [-L orig [-L name2]]] file1 orig_file file2"; "git merge-file [-p | --stdout] [-q | --quiet] [-L name1 [-L orig [-L name2]]] file1 orig_file file2";
static int read_file(mmfile_t *ptr, const char *filename) static int read_file(mmfile_t *ptr, const char *filename)
{ {
@ -27,16 +27,23 @@ int cmd_merge_file(int argc, char **argv, char **envp)
mmfile_t mmfs[3]; mmfile_t mmfs[3];
mmbuffer_t result = {NULL, 0}; mmbuffer_t result = {NULL, 0};
xpparam_t xpp = {XDF_NEED_MINIMAL}; xpparam_t xpp = {XDF_NEED_MINIMAL};
int ret = 0, i = 0; int ret = 0, i = 0, to_stdout = 0;
while (argc > 4) { while (argc > 4) {
if (!strcmp(argv[1], "-L")) { if (!strcmp(argv[1], "-L") && i < 3) {
names[i++] = argv[2]; names[i++] = argv[2];
argc -= 2; argc--;
argv += 2; argv++;
continue; } else if (!strcmp(argv[1], "-p") ||
} !strcmp(argv[1], "--stdout"))
to_stdout = 1;
else if (!strcmp(argv[1], "-q") ||
!strcmp(argv[1], "--quiet"))
freopen("/dev/null", "w", stderr);
else
usage(merge_file_usage); usage(merge_file_usage);
argc--;
argv++;
} }
if (argc != 4) if (argc != 4)
@ -57,7 +64,7 @@ int cmd_merge_file(int argc, char **argv, char **envp)
if (ret >= 0) { if (ret >= 0) {
char *filename = argv[1]; char *filename = argv[1];
FILE *f = fopen(filename, "wb"); FILE *f = to_stdout ? stdout : fopen(filename, "wb");
if (!f) if (!f)
ret = error("Could not open %s for writing", filename); ret = error("Could not open %s for writing", filename);