projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pre-commit hook: complain about conflict markers.
[git.git]
/
git.c
diff --git
a/git.c
b/git.c
index
5cb0d32
..
5209b04
100644
(file)
--- a/
git.c
+++ b/
git.c
@@
-344,8
+344,6
@@
static int cmd_log(int argc, const char **argv, char **envp)
opt.ignore_merges = 0;
if (opt.dense_combined_merges)
opt.diffopt.output_format = DIFF_FORMAT_PATCH;
opt.ignore_merges = 0;
if (opt.dense_combined_merges)
opt.diffopt.output_format = DIFF_FORMAT_PATCH;
- if (opt.diffopt.output_format == DIFF_FORMAT_PATCH)
- opt.diffopt.recursive = 1;
if (!full_diff && rev.prune_data)
diff_tree_setup_paths(rev.prune_data, &opt.diffopt);
diff_setup_done(&opt.diffopt);
if (!full_diff && rev.prune_data)
diff_tree_setup_paths(rev.prune_data, &opt.diffopt);
diff_setup_done(&opt.diffopt);
@@
-354,7
+352,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)
@@
-388,9
+386,13
@@
static int cmd_log(int argc, const char **argv, char **envp)
pretty_print_commit(commit_format, commit, ~0, buf,
LOGSIZE, abbrev);
printf("%s\n", buf);
pretty_print_commit(commit_format, commit, ~0, buf,
LOGSIZE, abbrev);
printf("%s\n", buf);
- if (do_diff)
+ if (do_diff) {
+ printf("---\n");
log_tree_commit(&opt, commit);
log_tree_commit(&opt, commit);
+ }
shown = 1;
shown = 1;
+ free(commit->buffer);
+ commit->buffer = NULL;
}
free(buf);
return 0;
}
free(buf);
return 0;
@@
-409,6
+411,12
@@
static void handle_internal_command(int argc, const char **argv, char **envp)
};
int i;
};
int i;
+ /* Turn "git cmd --help" into "git help cmd" */
+ if (argc > 1 && !strcmp(argv[1], "--help")) {
+ argv[1] = argv[0];
+ argv[0] = cmd = "help";
+ }
+
for (i = 0; i < ARRAY_SIZE(commands); i++) {
struct cmd_struct *p = commands+i;
if (strcmp(p->cmd, cmd))
for (i = 0; i < ARRAY_SIZE(commands); i++) {
struct cmd_struct *p = commands+i;
if (strcmp(p->cmd, cmd))