Browse Source

Porcelain level "log" family should recurse when diffing.

Most notably, "git log --name-status" stopped at top level
directory changes without "-r" option.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 18 years ago
parent
commit
170c04383b
  1. 2
      Documentation/git-log.txt
  2. 2
      Documentation/user-manual.txt
  3. 3
      builtin-log.c

2
Documentation/git-log.txt

@ -96,7 +96,7 @@ git log --since="2 weeks ago" \-- gitk:: @@ -96,7 +96,7 @@ git log --since="2 weeks ago" \-- gitk::
The "--" is necessary to avoid confusion with the *branch* named
'gitk'

git log -r --name-status release..test::
git log --name-status release..test::

Show the commits that are in the "test" branch but not yet
in the "release" branch, along with the list of paths

2
Documentation/user-manual.txt

@ -921,7 +921,7 @@ file such that it contained the given content either before or after the @@ -921,7 +921,7 @@ file such that it contained the given content either before or after the
commit. You can find out with this:

-------------------------------------------------
$ git log --raw -r --abbrev=40 --pretty=oneline -- filename |
$ git log --raw --abbrev=40 --pretty=oneline -- filename |
grep -B 1 `git hash-object filename`
-------------------------------------------------


3
builtin-log.c

@ -55,6 +55,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix, @@ -55,6 +55,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
rev->abbrev = DEFAULT_ABBREV;
rev->commit_format = CMIT_FMT_DEFAULT;
rev->verbose_header = 1;
rev->diffopt.recursive = 1;
rev->show_root_diff = default_show_root;
rev->subject_prefix = fmt_patch_subject_prefix;
argc = setup_revisions(argc, argv, rev, "HEAD");
@ -116,7 +117,6 @@ int cmd_whatchanged(int argc, const char **argv, const char *prefix) @@ -116,7 +117,6 @@ int cmd_whatchanged(int argc, const char **argv, const char *prefix)
git_config(git_log_config);
init_revisions(&rev, prefix);
rev.diff = 1;
rev.diffopt.recursive = 1;
rev.simplify_history = 0;
cmd_log_init(argc, argv, prefix, &rev);
if (!rev.diffopt.output_format)
@ -165,7 +165,6 @@ int cmd_show(int argc, const char **argv, const char *prefix) @@ -165,7 +165,6 @@ int cmd_show(int argc, const char **argv, const char *prefix)
git_config(git_log_config);
init_revisions(&rev, prefix);
rev.diff = 1;
rev.diffopt.recursive = 1;
rev.combine_merges = 1;
rev.dense_combined_merges = 1;
rev.always_show_header = 1;

Loading…
Cancel
Save