{"thread":{"id":"57688","subject":"[PATCH] git-ls-tree.txt: fix the name of \"%(objectsize:padded)\"","startedAt":"2022-04-07T15:53:25Z","lastAt":"2022-04-08T18:20:53Z","messageCount":4,"participants":["Martin Ågren","Junio C Hamano","Ævar Arnfjörð Bjarmason"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"453269","messageId":"20220407155231.2528221-1-martin.agren@gmail.com","threadId":"57688","inReplyTo":null,"subject":"[PATCH] git-ls-tree.txt: fix the name of \"%(objectsize:padded)\"","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2022-04-07T15:52:31Z","receivedAt":"2022-04-07T15:53:25Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"Commit 455923e0a1 (\"ls-tree: introduce \"--format\" option\", 2022-03-23)\nintroduced `--format` and the various placeholders it can take, such as\n%(objectname) and %(objectsize).\n\nAt some point when that patch was being developed, those placeholders\nhad shorter names, e.g., %(name) and %(size), which can be seen in the\ncommit message of 455923e0a1. One instance of \"%(size:padded)\" also\nmanaged to enter the documentation in the final version of the patch.\nCorrect it to \"%(objectsize:padded)\".\n\nSigned-off-by: Martin Ågren \n---\n Documentation/git-ls-tree.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt\nindex 43aebb9938..8f31e2ee9d 100644\n--- a/Documentation/git-ls-tree.txt\n+++ b/Documentation/git-ls-tree.txt\n@@ -156,7 +156,7 @@ objectname::\n \tThe name of the object.\n objectsize[:padded]::\n \tThe size of the object (\"-\" if it's a tree).\n-\tIt also supports a padded format of size with \"%(size:padded)\".\n+\tIt also supports a padded format of size with \"%(objectsize:padded)\".\n path::\n \tThe pathname of the object.\n \n-- \n2.36.0.rc0\n\n"},{"id":"453277","messageId":"xmqq8rsgu8cw.fsf@gitster.g","threadId":"57688","inReplyTo":"20220407155231.2528221-1-martin.agren@gmail.com","subject":"Re: [PATCH] git-ls-tree.txt: fix the name of \"%(objectsize:padded)\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-04-07T17:11:11Z","receivedAt":"2022-04-07T17:11:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Martin Ågren writes:\n\n> Commit 455923e0a1 (\"ls-tree: introduce \"--format\" option\", 2022-03-23)\n> introduced `--format` and the various placeholders it can take, such as\n> %(objectname) and %(objectsize).\n>\n> At some point when that patch was being developed, those placeholders\n> had shorter names, e.g., %(name) and %(size), which can be seen in the\n> commit message of 455923e0a1. One instance of \"%(size:padded)\" also\n> managed to enter the documentation in the final version of the patch.\n> Correct it to \"%(objectsize:padded)\".\n>\n> Signed-off-by: Martin Ågren \n> ---\n> Documentation/git-ls-tree.txt | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n\nThanks.\n\n\n> diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt\n> index 43aebb9938..8f31e2ee9d 100644\n> --- a/Documentation/git-ls-tree.txt\n> +++ b/Documentation/git-ls-tree.txt\n> @@ -156,7 +156,7 @@ objectname::\n> \tThe name of the object.\n> objectsize[:padded]::\n> \tThe size of the object (\"-\" if it's a tree).\n> -\tIt also supports a padded format of size with \"%(size:padded)\".\n> +\tIt also supports a padded format of size with \"%(objectsize:padded)\".\n> path::\n> \tThe pathname of the object.\n"},{"id":"453338","messageId":"patch-1.1-183b9639ae7-20220408T155704Z-avarab@gmail.com","threadId":"57688","inReplyTo":"20220407155231.2528221-1-martin.agren@gmail.com","subject":"[PATCH] ls-tree doc: document interaction with submodules","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2022-04-08T16:00:25Z","receivedAt":"2022-04-08T16:00:37Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"The ls-tree documentation had never been updated after it learned to\ninteract with submodules to explicitly mention them. The initial\nsupport was added in f35a6d3bce7 (Teach core object handling functions\nabout gitlinks, 2007-04-09). E.g. the discussion of --long added in\nf35a6d3bce7 (Teach core object handling functions about gitlinks,\n2007-04-09) didn't explicitly mention them.\n\nBut this documentation added in 455923e0a15 (ls-tree: introduce\n\"--format\" option, 2022-03-23) had no such excuse, and was actively\nmisleading by providing an exhaustive but incomplete list of object\ntypes we'd emit.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason \n---\n\nOn Thu, Apr 07 2022, Martin Ågren wrote:\n\n> Commit 455923e0a1 (\"ls-tree: introduce \"--format\" option\", 2022-03-23)\n> introduced `--format` and the various placeholders it can take, such as\n> %(objectname) and %(objectsize).\n>\n> At some point when that patch was being developed, those placeholders\n> had shorter names, e.g., %(name) and %(size), which can be seen in the\n> commit message of 455923e0a1. One instance of \"%(size:padded)\" also\n> managed to enter the documentation in the final version of the patch.\n> Correct it to \"%(objectsize:padded)\"\n\nThanks, perhaps this is also worth taking before the release, it's a\nrather trivial inaccuracy in the docs, but something that's new since\nv2.36.0.\n\nI have some local patches to make \"git ls-tree --recurse-submodules\"\nwork, and noticed this again after it conflicted with your now-landed\nfix.\n\n Documentation/git-ls-tree.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt\nindex 8f31e2ee9d4..0240adb8eec 100644\n--- a/Documentation/git-ls-tree.txt\n+++ b/Documentation/git-ls-tree.txt\n@@ -151,11 +151,11 @@ names can be used:\n objectmode::\n \tThe mode of the object.\n objecttype::\n-\tThe type of the object (`blob` or `tree`).\n+\tThe type of the object (`commit`, `blob` or `tree`).\n objectname::\n \tThe name of the object.\n objectsize[:padded]::\n-\tThe size of the object (\"-\" if it's a tree).\n+\tThe size of a `blob` object (\"-\" if it's a `commit` or `tree`).\n \tIt also supports a padded format of size with \"%(objectsize:padded)\".\n path::\n \tThe pathname of the object.\n-- \n2.36.0.rc0.836.g0771277f920\n\n"},{"id":"453343","messageId":"xmqqpmlrmo7k.fsf@gitster.g","threadId":"57688","inReplyTo":"patch-1.1-183b9639ae7-20220408T155704Z-avarab@gmail.com","subject":"Re: [PATCH] ls-tree doc: document interaction with submodules","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-04-08T18:20:31Z","receivedAt":"2022-04-08T18:20:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason writes:\n\n> Thanks, perhaps this is also worth taking before the release, it's a\n> rather trivial inaccuracy in the docs, but something that's new since\n> v2.36.0.\n> ...\n> diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt\n> index 8f31e2ee9d4..0240adb8eec 100644\n> --- a/Documentation/git-ls-tree.txt\n> +++ b/Documentation/git-ls-tree.txt\n> @@ -151,11 +151,11 @@ names can be used:\n> objectmode::\n> \tThe mode of the object.\n> objecttype::\n> -\tThe type of the object (`blob` or `tree`).\n> +\tThe type of the object (`commit`, `blob` or `tree`).\n> objectname::\n> \tThe name of the object.\n> objectsize[:padded]::\n> -\tThe size of the object (\"-\" if it's a tree).\n> +\tThe size of a `blob` object (\"-\" if it's a `commit` or `tree`).\n> \tIt also supports a padded format of size with \"%(objectsize:padded)\".\n> path::\n> \tThe pathname of the object.\n\nMakes sense. Indeed we should have updated it when we added\ngitlinks to trees.\n\nWill queue.\n"}]}