{"thread":{"id":"9652","subject":"[PATCH] In Examples, explain option -r and refer to git-rev-list[1]","startedAt":"2007-08-26T15:40:26Z","lastAt":"2007-08-27T10:02:44Z","messageCount":7,"participants":["Jari Aalto","Lukas Sandström","Junio C Hamano","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"51562","messageId":"r6lqfgnp.fsf@cante.net","threadId":"9652","inReplyTo":null,"subject":"[PATCH] In Examples, explain option -r and refer to git-rev-list[1]","fromName":"Jari Aalto","fromEmail":"jari.aalto@cante.net","sentAt":"2007-08-26T15:40:26Z","receivedAt":"2007-08-26T15:40:26Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"Signed-off-by: Jari Aalto \n---\n Documentation/git-log.txt | 3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\nindex 49bb539..aa42f0e 100644\n--- a/Documentation/git-log.txt\n+++ b/Documentation/git-log.txt\n@@ -76,7 +76,8 @@ git log -r --name-status release..test::\n \n \tShow the commits that are in the \"test\" branch but not yet\n \tin the \"release\" branch, along with the list of paths\n-\teach commit modifies.\n+\teach commit modifies. Opton -r (see gitlink:git-rev-list[1])\n+ descends recursively.\n \n Discussion\n ----------\n-- \n1.5.3.rc5\n"},{"id":"51643","messageId":"46D28502.3030003@etek.chalmers.se","threadId":"9652","inReplyTo":"r6lqfgnp.fsf@cante.net","subject":"Re: [PATCH] In Examples, explain option -r and refer to git-rev-list[1]","fromName":"Lukas Sandström","fromEmail":"lukass@etek.chalmers.se","sentAt":"2007-08-27T08:02:10Z","receivedAt":"2007-08-27T08:02:10Z","isPatch":true,"sender":{"key":"luksan@gmail.com","avatar":"https://avatars.githubusercontent.com/u/152281?v=4"},"body":"Jari Aalto wrote:\n> Signed-off-by: Jari Aalto \n> ---\n> Documentation/git-log.txt | 3 ++-\n> 1 files changed, 2 insertions(+), 1 deletions(-)\n> \n> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\n> index 49bb539..aa42f0e 100644\n> --- a/Documentation/git-log.txt\n> +++ b/Documentation/git-log.txt\n> @@ -76,7 +76,8 @@ git log -r --name-status release..test::\n> \n> \tShow the commits that are in the \"test\" branch but not yet\n> \tin the \"release\" branch, along with the list of paths\n> -\teach commit modifies.\n> +\teach commit modifies. Opton -r (see gitlink:git-rev-list[1])\n^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ spelling mistake (option)\n\n/Lukas\n"},{"id":"51645","messageId":"7vy7fxl7hx.fsf@gitster.siamese.dyndns.org","threadId":"9652","inReplyTo":"46D28502.3030003@etek.chalmers.se","subject":"Re: [PATCH] In Examples, explain option -r and refer to git-rev-list[1]","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-08-27T08:14:02Z","receivedAt":"2007-08-27T08:14:02Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Lukas Sandström writes:\n\n> Jari Aalto wrote:\n>> Signed-off-by: Jari Aalto \n>> ---\n>> Documentation/git-log.txt | 3 ++-\n>> 1 files changed, 2 insertions(+), 1 deletions(-)\n>> \n>> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\n>> index 49bb539..aa42f0e 100644\n>> --- a/Documentation/git-log.txt\n>> +++ b/Documentation/git-log.txt\n>> @@ -76,7 +76,8 @@ git log -r --name-status release..test::\n>> \n>> \tShow the commits that are in the \"test\" branch but not yet\n>> \tin the \"release\" branch, along with the list of paths\n>> -\teach commit modifies.\n>> +\teach commit modifies. Opton -r (see gitlink:git-rev-list[1])\n> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ spelling mistake (option)\n\nI think it makes more sense to make Porcelain including \"git\nlog\" to always recurse in its diff operations (when diff output\nis asked for), in which case the example should simply lose\nthe \"-r\" option.\n\nBut that is a post-1.5.3 change. That's why I am planning to\ndrop this patch for now.\n"},{"id":"51652","messageId":"7vbqctl6ky.fsf@gitster.siamese.dyndns.org","threadId":"9652","inReplyTo":"7vy7fxl7hx.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] In Examples, explain option -r and refer to git-rev-list[1]","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-08-27T08:33:49Z","receivedAt":"2007-08-27T08:33:49Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Lukas Sandström writes:\n>\n>> Jari Aalto wrote:\n>>> Signed-off-by: Jari Aalto \n>>> ---\n>>> Documentation/git-log.txt | 3 ++-\n>>> 1 files changed, 2 insertions(+), 1 deletions(-)\n>>> \n>>> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\n>>> index 49bb539..aa42f0e 100644\n>>> --- a/Documentation/git-log.txt\n>>> +++ b/Documentation/git-log.txt\n>>> @@ -76,7 +76,8 @@ git log -r --name-status release..test::\n>>> \n>>> \tShow the commits that are in the \"test\" branch but not yet\n>>> \tin the \"release\" branch, along with the list of paths\n>>> -\teach commit modifies.\n>>> +\teach commit modifies. Opton -r (see gitlink:git-rev-list[1])\n>> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ spelling mistake (option)\n>\n> I think it makes more sense to make Porcelain including \"git\n> log\" to always recurse in its diff operations (when diff output\n> is asked for), in which case the example should simply lose\n> the \"-r\" option.\n>\n> But that is a post-1.5.3 change. That's why I am planning to\n> drop this patch for now.\n\nThe change would probably look something like this. Testing is\nleft as an exercise to the readers ;-).\n\n---\n\n Documentation/git-log.txt | 2 +-\n Documentation/user-manual.txt | 2 +-\n builtin-log.c | 1 +\n 3 files changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\nindex 1e6dbd9..5ec547c 100644\n--- a/Documentation/git-log.txt\n+++ b/Documentation/git-log.txt\n@@ -96,7 +96,7 @@ git log --since=\"2 weeks ago\" \\-- gitk::\n \tThe \"--\" is necessary to avoid confusion with the *branch* named\n \t'gitk'\n \n-git log -r --name-status release..test::\n+git log --name-status release..test::\n \n \tShow the commits that are in the \"test\" branch but not yet\n \tin the \"release\" branch, along with the list of paths\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 06ab79f..35298e6 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -921,7 +921,7 @@ file such that it contained the given content either before or after the\n commit. You can find out with this:\n \n -------------------------------------------------\n-$ git log --raw -r --abbrev=40 --pretty=oneline -- filename |\n+$ git log --raw --abbrev=40 --pretty=oneline -- filename |\n \tgrep -B 1 `git hash-object filename`\n -------------------------------------------------\n \ndiff --git a/builtin-log.c b/builtin-log.c\nindex 13bae31..d6cf9d5 100644\n--- a/builtin-log.c\n+++ b/builtin-log.c\n@@ -258,6 +258,7 @@ int cmd_log(int argc, const char **argv, const char *prefix)\n \tgit_config(git_log_config);\n \tinit_revisions(&rev, prefix);\n \trev.always_show_header = 1;\n+\trev.diffopt.recursive = 1;\n \tcmd_log_init(argc, argv, prefix, &rev);\n \treturn cmd_log_walk(&rev);\n }\n"},{"id":"51655","messageId":"20070827084423.GA19230@coredump.intra.peff.net","threadId":"9652","inReplyTo":"7vbqctl6ky.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] In Examples, explain option -r and refer to git-rev-list[1]","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2007-08-27T08:44:23Z","receivedAt":"2007-08-27T08:44:23Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Aug 27, 2007 at 01:33:49AM -0700, Junio C Hamano wrote:\n\n> --- a/builtin-log.c\n> +++ b/builtin-log.c\n> @@ -258,6 +258,7 @@ int cmd_log(int argc, const char **argv, const char *prefix)\n> \tgit_config(git_log_config);\n> \tinit_revisions(&rev, prefix);\n> \trev.always_show_header = 1;\n> +\trev.diffopt.recursive = 1;\n> \tcmd_log_init(argc, argv, prefix, &rev);\n> \treturn cmd_log_walk(&rev);\n> }\n\nThis should perhaps rather go in cmd_log_init (and be removed from\ncmd_show and cmd_whatchanged). I think this is semantically a little\nmore clear, and the change will affect other log porcelains (right now\njust \"git-reflog --name-status\", but also new ones if they are added).\n\nBut yes, this is post-1.5.3, so I will shut up rather than nitpicking\nyour \"not meant to be applied now\" patches.\n\n-Peff\n"},{"id":"51670","messageId":"7vy7fxjo90.fsf@gitster.siamese.dyndns.org","threadId":"9652","inReplyTo":"20070827084423.GA19230@coredump.intra.peff.net","subject":"Re: [PATCH] In Examples, explain option -r and refer to git-rev-list[1]","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-08-27T09:55:07Z","receivedAt":"2007-08-27T09:55:07Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Mon, Aug 27, 2007 at 01:33:49AM -0700, Junio C Hamano wrote:\n>\n>> --- a/builtin-log.c\n>> +++ b/builtin-log.c\n>> @@ -258,6 +258,7 @@ int cmd_log(int argc, const char **argv, const char *prefix)\n>> \tgit_config(git_log_config);\n>> \tinit_revisions(&rev, prefix);\n>> \trev.always_show_header = 1;\n>> +\trev.diffopt.recursive = 1;\n>> \tcmd_log_init(argc, argv, prefix, &rev);\n>> \treturn cmd_log_walk(&rev);\n>> }\n>\n> This should perhaps rather go in cmd_log_init (and be removed from\n> cmd_show and cmd_whatchanged). I think this is semantically a little\n> more clear, and the change will affect other log porcelains (right now\n> just \"git-reflog --name-status\", but also new ones if they are added).\n>\n> But yes, this is post-1.5.3, so I will shut up rather than nitpicking\n> your \"not meant to be applied now\" patches.\n\nThanks for your comments; rather than shutting up, could you\nsend an improvement after 1.5.3 happens?\n"},{"id":"51674","messageId":"20070827100244.GA23248@coredump.intra.peff.net","threadId":"9652","inReplyTo":"7vy7fxjo90.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] In Examples, explain option -r and refer to git-rev-list[1]","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2007-08-27T10:02:44Z","receivedAt":"2007-08-27T10:02:44Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Aug 27, 2007 at 02:55:07AM -0700, Junio C Hamano wrote:\n\n> > But yes, this is post-1.5.3, so I will shut up rather than nitpicking\n> > your \"not meant to be applied now\" patches.\n> \n> Thanks for your comments; rather than shutting up, could you\n> send an improvement after 1.5.3 happens?\n\nWill do.\n\n-Peff\n"}]}