{"thread":{"id":"49079","subject":"[PATCH] update-index: there no longer is `apply --index-info`","startedAt":"2018-08-08T21:35:23Z","lastAt":"2018-08-08T22:43:40Z","messageCount":2,"participants":["Junio C Hamano","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"354930","messageId":"xmqqva8kee3t.fsf@gitster-ct.c.googlers.com","threadId":"49079","inReplyTo":null,"subject":"[PATCH] update-index: there no longer is `apply --index-info`","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-08-08T21:35:18Z","receivedAt":"2018-08-08T21:35:23Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Back when we removed `git apply --index-info` in 2007, we forgot to\nadjust the documentation for update-index that reads its output.\n\nLet's reorder the description of three formats to present the other\ntwo formats that are still generated by git commands before this\nformat, and stop mentioning `git apply --index-info`.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n Documentation/git-update-index.txt | 15 ++++++---------\n 1 file changed, 6 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt\nindex 4e8e762e68..c62a683648 100644\n--- a/Documentation/git-update-index.txt\n+++ b/Documentation/git-update-index.txt\n@@ -268,23 +268,20 @@ USING --INDEX-INFO\n multiple entry definitions from the standard input, and designed\n specifically for scripts.  It can take inputs of three formats:\n \n-    . mode         SP sha1          TAB path\n-+\n-The first format is what \"git-apply --index-info\"\n-reports, and used to reconstruct a partial tree\n-that is used for phony merge base tree when falling\n-back on 3-way merge.\n-\n     . mode SP type SP sha1          TAB path\n +\n-The second format is to stuff 'git ls-tree' output\n-into the index file.\n+This format is to stuff `git ls-tree` output into the index.\n \n     . mode         SP sha1 SP stage TAB path\n +\n This format is to put higher order stages into the\n index file and matches 'git ls-files --stage' output.\n \n+    . mode         SP sha1          TAB path\n++\n+This format is no longer produced by any Git command, but is\n+and will continue to be supported by `update-index --index-info`.\n+\n To place a higher stage entry to the index, the path should\n first be removed by feeding a mode=0 entry for the path, and\n then feeding necessary input lines in the third format.\n"},{"id":"354952","messageId":"20180808224336.GB3902@sigill.intra.peff.net","threadId":"49079","inReplyTo":"xmqqva8kee3t.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH] update-index: there no longer is `apply --index-info`","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2018-08-08T22:43:36Z","receivedAt":"2018-08-08T22:43:40Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Aug 08, 2018 at 02:35:18PM -0700, Junio C Hamano wrote:\n\n> Back when we removed `git apply --index-info` in 2007, we forgot to\n> adjust the documentation for update-index that reads its output.\n> \n> Let's reorder the description of three formats to present the other\n> two formats that are still generated by git commands before this\n> format, and stop mentioning `git apply --index-info`.\n\nYep, this makes sense.\n\n> ---\n>  Documentation/git-update-index.txt | 15 ++++++---------\n>  1 file changed, 6 insertions(+), 9 deletions(-)\n\nFor fun, I tried out my \"doc-diff\" on it, and it looks good. :)\n\n-Peff\n"}]}