From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, T_DKIM_INVALID shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 73CFB1F405 for ; Wed, 8 Aug 2018 21:35:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729625AbeHHX4x (ORCPT ); Wed, 8 Aug 2018 19:56:53 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34729 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729221AbeHHX4x (ORCPT ); Wed, 8 Aug 2018 19:56:53 -0400 Received: by mail-wm0-f67.google.com with SMTP id l2-v6so609410wme.1 for ; Wed, 08 Aug 2018 14:35:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:user-agent:mime-version; bh=LBhG0dH0gTyOyG2MRSDZJRirpCsVhCovL5ZEnLXj6pg=; b=n1HJnKrI4Rm3vxVJBrouUZH9OsuiY+lcTopsAZ5qWmVifMU/aQwy1Xs8xX3Sqm3Gmn sQavnwGFu2T0Y1EwmeeBkDbzlYhxlYTxybUUJnDHw4fH9Cppn5GmJvmC67n5sw+X1bVL I3g9EVg8pJy4DNeUPGyjIG6ZJLQOJqf7YzMhR84XSqhh9RfQURXNWgIZtF2LabGPhpdl vP+UdDdkOEfyRzc3uvdaEyXpU+B80Dah8pz/qfZ9eDNqGuIpuwDdgEyWNfNkckgzoS5m We9kuKq69qZJqws3Irr69GkO6qx3S/8y6KLiErplC9Zec2w9ddIuEFm52ufxrE/4opiP 5CKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :user-agent:mime-version; bh=LBhG0dH0gTyOyG2MRSDZJRirpCsVhCovL5ZEnLXj6pg=; b=VG/qfVl4cMRrrr7xy84lp2wNpq7X9i0TeGRBwXwnkTgSJPhKW0di/Lwkk+pGeXlha0 MwbwGjZ2lTx0zzvUKMEfCR5D1OyJELASW88g3+fja4HgdV/6oo0NQ2an+5qmmdHbiM+r U1zvmlWJS2FRfC5Pwc3LT3xOQIuZ0ohhbhpR5d858YqDX/jSqDiFoiKccbMF9kEX5Hgn ixPeMPpjiRNvJF9rrO82YKVtQBqMKM4h7w0aNIyMBo5YGf5MtxsUcIgtCCGrN3iGe6M7 z9ZRaKJGOKrqwjWbLInroAbbUtks2srhw4yZ9GU5y/Z0Bm+/+3RQGudZrA0zaTLQGhup /Ynw== X-Gm-Message-State: AOUpUlGo7mLoh27pCNmWMfqvkA3d3/1IhknWUcqO0JZSY0WHGi+/JPVD EChF/MTB48kOXWvRr//WA1Szto4v X-Google-Smtp-Source: AA+uWPyqKAEzloY0yE/GH35yowtPLluHpFulTaECNjgNuoC8Bkg8fFnbjzt9TdXK6dlHjPrneAzhxw== X-Received: by 2002:a1c:b709:: with SMTP id h9-v6mr3056013wmf.104.1533764119406; Wed, 08 Aug 2018 14:35:19 -0700 (PDT) Received: from localhost (112.68.155.104.bc.googleusercontent.com. [104.155.68.112]) by smtp.gmail.com with ESMTPSA id j11-v6sm3404709wrr.37.2018.08.08.14.35.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Aug 2018 14:35:18 -0700 (PDT) From: Junio C Hamano To: git@vger.kernel.org Subject: [PATCH] update-index: there no longer is `apply --index-info` Date: Wed, 08 Aug 2018 14:35:18 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 --- Documentation/git-update-index.txt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 4e8e762e68..c62a683648 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -268,23 +268,20 @@ USING --INDEX-INFO multiple entry definitions from the standard input, and designed specifically for scripts. It can take inputs of three formats: - . mode SP sha1 TAB path -+ -The first format is what "git-apply --index-info" -reports, and used to reconstruct a partial tree -that is used for phony merge base tree when falling -back on 3-way merge. - . mode SP type SP sha1 TAB path + -The second format is to stuff 'git ls-tree' output -into the index file. +This format is to stuff `git ls-tree` output into the index. . mode SP sha1 SP stage TAB path + This format is to put higher order stages into the index file and matches 'git ls-files --stage' output. + . mode SP sha1 TAB path ++ +This format is no longer produced by any Git command, but is +and will continue to be supported by `update-index --index-info`. + To place a higher stage entry to the index, the path should first be removed by feeding a mode=0 entry for the path, and then feeding necessary input lines in the third format.