summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-08-27 08:33:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-08-28 07:10:21 (GMT)
commit170c04383bca07fb5a32227474dfd58f29258d25 (patch)
tree667334f49e0f103df639a735e75af72465505e3c
parenta005085240ef77ac0dde8eb08e27c6ef868d4bab (diff)
downloadgit-170c04383bca07fb5a32227474dfd58f29258d25.zip
git-170c04383bca07fb5a32227474dfd58f29258d25.tar.gz
git-170c04383bca07fb5a32227474dfd58f29258d25.tar.bz2
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>
-rw-r--r--Documentation/git-log.txt2
-rw-r--r--Documentation/user-manual.txt2
-rw-r--r--builtin-log.c3
3 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 1e6dbd9..5ec547c 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -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
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 06ab79f..35298e6 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -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`
-------------------------------------------------
diff --git a/builtin-log.c b/builtin-log.c
index 13bae31..a381c75 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -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)
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)
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;