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>
---
On Wed, 6 Dec 2006, Jakub Narebski wrote:
> Johannes Schindelin wrote:
>
> > merge-file has the same syntax as RCS merge, but supports only
> > the "-L" option.
>
> Would it be hard to add "-p / --stdout" options, and "-q /
> --quiet" option?
No.
But the documentation has to be done by somebody else.
builtin-merge-file.c | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/builtin-merge-file.c b/builtin-merge-file.c
index 11976ea..9ae1009 100644
--- a/builtin-merge-file.c
+++ b/builtin-merge-file.c
@@ -2,7 +2,7 @@
#include "xdiff/xdiff.h"
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)
{
@@ -24,18 +24,25 @@ static int read_file(mmfile_t *ptr, const char *filename)
int cmd_merge_file(int argc, char **argv, char **envp)
{
char *names[3];
- char *buffers[3];
- mmfile_t mmfs[3], result = {NULL, 0};
- int ret = 0, i = 0;
+ mmfile_t mmfs[3];
+ mmbuffer_t result = {NULL, 0};
+ int ret = 0, i = 0, to_stdout = 0;
while (argc > 4) {
- if (!strcmp(argv[1], "-L")) {
+ if (!strcmp(argv[1], "-L") && i < 3) {
names[i++] = argv[2];
- argc -= 2;
- argv += 2;
- continue;
- }
- usage(merge_file_usage);
+ argc--;
+ argv++;
+ } 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);
+ argc--;
+ argv++;
}
if (argc != 4)
@@ -57,7 +64,7 @@ int cmd_merge_file(int argc, char **argv, char **envp)
if (ret >= 0) {
char *filename = argv[1];
- FILE *f = fopen(filename, "wb");
+ FILE *f = to_stdout ? stdout : fopen(filename, "wb");
if (!f)
ret = error("Could not open %s for writing", filename);
--
1.4.4.1.g1f348-dirty
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
