projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix-up previous expr changes.
[git.git]
/
git.c
diff --git
a/git.c
b/git.c
index
ad896da
..
78ed403
100644
(file)
--- a/
git.c
+++ b/
git.c
@@
-15,8
+15,8
@@
#include "cache.h"
#include "commit.h"
#include "cache.h"
#include "commit.h"
-#include "revision.h"
#include "diff.h"
#include "diff.h"
+#include "revision.h"
#include "log-tree.h"
#ifndef PATH_MAX
#include "log-tree.h"
#ifndef PATH_MAX
@@
-354,7
+354,7
@@
static int cmd_log(int argc, const char **argv, char **envp)
prepare_revision_walk(&rev);
setup_pager();
while ((commit = get_revision(&rev)) != NULL) {
prepare_revision_walk(&rev);
setup_pager();
while ((commit = get_revision(&rev)) != NULL) {
- if (
commit_format != CMIT_FMT_ONELINE && shown
)
+ if (
shown && do_diff && commit_format != CMIT_FMT_ONELINE
)
putchar('\n');
fputs(commit_prefix, stdout);
if (abbrev_commit && abbrev)
putchar('\n');
fputs(commit_prefix, stdout);
if (abbrev_commit && abbrev)
@@
-391,6
+391,8
@@
static int cmd_log(int argc, const char **argv, char **envp)
if (do_diff)
log_tree_commit(&opt, commit);
shown = 1;
if (do_diff)
log_tree_commit(&opt, commit);
shown = 1;
+ free(commit->buffer);
+ commit->buffer = NULL;
}
free(buf);
return 0;
}
free(buf);
return 0;