diff options
author | Junio C Hamano <junkio@cox.net> | 2006-05-06 21:47:22 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-05-06 21:47:22 -0700 |
commit | c2b9e6994d044b218e59abf6d19f7751c4aa13e3 (patch) | |
tree | 191050855782f098c4ef4a24bcb673cda33f1902 /builtin-log.c | |
parent | Merge branch 'jc/reupdate' into next (diff) | |
parent | fmt-patch: understand old <his> notation (diff) | |
download | tgif-c2b9e6994d044b218e59abf6d19f7751c4aa13e3.tar.xz |
Merge branch 'js/fmt-patch' into next
* js/fmt-patch:
fmt-patch: understand old <his> notation
t1300-repo-config: two new config parsing tests.
Another config file parsing fix.
Diffstat (limited to 'builtin-log.c')
-rw-r--r-- | builtin-log.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/builtin-log.c b/builtin-log.c index 0027998f10..d5bbc1cc06 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -11,6 +11,9 @@ #include "log-tree.h" #include "builtin.h" +/* this is in builtin-diff.c */ +void add_head(struct rev_info *revs); + static int cmd_log_wc(int argc, const char **argv, char **envp, struct rev_info *rev) { @@ -185,6 +188,11 @@ int cmd_format_patch(int argc, const char **argv, char **envp) if (argc > 1) die ("unrecognized argument: %s", argv[1]); + if (rev.pending_objects && rev.pending_objects->next == NULL) { + rev.pending_objects->item->flags |= UNINTERESTING; + add_head(&rev); + } + if (!use_stdout) realstdout = fdopen(dup(1), "w"); |