diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | builtin-log.c | 1 | ||||
| -rw-r--r-- | git.c | 1 | ||||
| -rw-r--r-- | revision.c | 1 |
4 files changed, 3 insertions, 2 deletions
@@ -729,7 +729,7 @@ git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS) GIT-CFLAGS help.o: common-cmds.h git-merge-subtree$X: git-merge-recursive$X - rm -f $@ && ln git-merge-recursive$X $@ + $(QUIET_BUILT_IN)rm -f $@ && ln git-merge-recursive$X $@ $(BUILT_INS): git$X $(QUIET_BUILT_IN)rm -f $@ && ln git$X $@ diff --git a/builtin-log.c b/builtin-log.c index eea96901b9..469949457f 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -419,7 +419,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) rev.ignore_merges = 1; rev.diffopt.msg_sep = ""; rev.diffopt.recursive = 1; - rev.subject_prefix = "PATCH"; rev.extra_headers = extra_headers; @@ -66,6 +66,7 @@ static int handle_options(const char*** argv, int* argc) setenv(GIT_DIR_ENVIRONMENT, (*argv)[1], 1); (*argv)++; (*argc)--; + handled++; } else if (!prefixcmp(cmd, "--git-dir=")) { setenv(GIT_DIR_ENVIRONMENT, cmd + 10, 1); } else if (!strcmp(cmd, "--bare")) { diff --git a/revision.c b/revision.c index e9de8650d3..ce70f48ce0 100644 --- a/revision.c +++ b/revision.c @@ -651,6 +651,7 @@ void init_revisions(struct rev_info *revs, const char *prefix) revs->min_age = -1; revs->skip_count = -1; revs->max_count = -1; + revs->subject_prefix = "PATCH"; revs->prune_fn = NULL; revs->prune_data = NULL; |