update-index: there no longer is `apply --index-info`
Back when we removed `git apply --index-info` in 2007, we forgot to adjust the documentation for update-index that reads its output. Let's reorder the description of three formats to present the other two formats that are still generated by git commands before this format, and stop mentioning `git apply --index-info`. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Aug 8, 2018 at 14:35 UTC
e05aa688dd3df580c38d1df639cf37e45b66a3ee
1 file changed
+6
-9
Documentation/git-update-index.txt
+6
-9
@@ -268,23 +268,20 @@ USING --INDEX-INFO
268
multiple entry definitions from the standard input, and designed
269
specifically for scripts. It can take inputs of three formats:
270
271
- . mode SP sha1 TAB path
272
-+
273
-The first format is what "git-apply --index-info"
274
-reports, and used to reconstruct a partial tree
275
-that is used for phony merge base tree when falling
276
-back on 3-way merge.
277
-
271
. mode SP type SP sha1 TAB path
272
+
280
-The second format is to stuff 'git ls-tree' output
281
-into the index file.
273
+This format is to stuff `git ls-tree` output into the index.
274
275
. mode SP sha1 SP stage TAB path
276
+
277
This format is to put higher order stages into the
278
index file and matches 'git ls-files --stage' output.
279
280
+ . mode SP sha1 TAB path
281
++
282
+This format is no longer produced by any Git command, but is
283
+and will continue to be supported by `update-index --index-info`.
284
+
285
To place a higher stage entry to the index, the path should
286
first be removed by feeding a mode=0 entry for the path, and
287
then feeding necessary input lines in the third format.