From patchwork Mon Oct 4 19:00:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Altmanninger X-Patchwork-Id: 12534539 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9FF56C433F5 for ; Mon, 4 Oct 2021 19:01:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 814846140D for ; Mon, 4 Oct 2021 19:01:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236812AbhJDTDK (ORCPT ); Mon, 4 Oct 2021 15:03:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235402AbhJDTDK (ORCPT ); Mon, 4 Oct 2021 15:03:10 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBBA6C061745 for ; Mon, 4 Oct 2021 12:01:20 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id bd28so68581404edb.9 for ; Mon, 04 Oct 2021 12:01:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kN7ch9qE7mBUOojOyozOOO3RJmY1VglsON0PVxeocCs=; b=KzPcq2njZsUxY27/8uPH3QTKsksCi9a7Z5ERl26aKvc/upjlHzKYxtjA4EirvMi/eI lKxtdI5dkKdvqVKSpaRbeyVIBwHoIwydOK18YAaQtSuEO2SR87ZGfd79Q0QJQVpdIz86 MBn7MAitvZIURRN0hskqBuOO189mZVvEj2XhwunGFnWwCE7zMWJPvfaBJlPfFqmqdMXp UvvOjgU4jjWb/WNNtImKBWFfhPi/raI5H1XrFhJ/wGvyJpRnvFf7L4avTvvHx5mryalt rIO0BNSiJ0RSzwHljojh5//CtNUU2zWGh8VQbRDRS83yAcoRz5SmneqSaevg8+9oKBZn C0+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kN7ch9qE7mBUOojOyozOOO3RJmY1VglsON0PVxeocCs=; b=n5wpBixiwnDK3CburoGvqssGsaNiUuL51CRDM5FuRs4hGmbcalzvtcaznOve+pSD9X d0tOdkt0oRa4j7/SMVcIlM2qgpw4p0Zm17tkXcnIgMK2Q+7csVlfdzt6lt6GZ/HwEGMA 54J/Pj1TccGR5tSJxd9Q2UbNTZSc6vz06UjIuaY+gBoQoFuZ72t7pxu1SN+MMkY5OTkF LBDE08Xed3gxctPSKisUrDiuVyKgyhqwlhS1QiEXNLnb8AAVfcmnNyNtzuDpTIu9N8EL nmpfpEx1gxc+linKVs1a5E0C0Z2IkPjcPa09YlTx1ukTGgwX6YVJ2UWUAKH91wbTaY5j jfog== X-Gm-Message-State: AOAM532EVVPxzr08e0gT+YtOK6LkTUB/snS9qwoMxYwImBfqGsZvjpDw bzcF6ecqpMZWRVO1/VF/0AsOTxt96Zk= X-Google-Smtp-Source: ABdhPJznEYhO7XIf3T9J2EkcYnRVHdfz2rRhH1g9oMFG3g4NLKD33WxUHa9sluW+dMewACYo2FzbkA== X-Received: by 2002:a17:906:ca12:: with SMTP id jt18mr18708242ejb.451.1633374079431; Mon, 04 Oct 2021 12:01:19 -0700 (PDT) Received: from localhost.localdomain (178.115.74.220.wireless.dyn.drei.com. [178.115.74.220]) by smtp.gmail.com with ESMTPSA id v13sm6759357ejo.36.2021.10.04.12.01.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Oct 2021 12:01:18 -0700 (PDT) From: Johannes Altmanninger To: newren@gmail.com Cc: aclopte@gmail.com, git@vger.kernel.org Subject: [PATCH v2 1/4] Documentation/git-status: remove impossible porcelain status DR and DC Date: Mon, 4 Oct 2021 21:00:47 +0200 Message-Id: <20211004190050.921109-1-aclopte@gmail.com> X-Mailer: git-send-email 2.33.0.rc2.dirty In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Commit 176ea74793 ("wt-status.c: handle worktree renames", 2017-12-27) made a porcelain status like .R or .C possible. They occur only when the source file is added to the index and the destination file is added with --intent-to-add. They also documented DR, but that status is impossible. The index change D means that the source file does not exist in the index. The worktree change R/C states that the file has been renamed/copied since the index, but that's impossible if it did not exist there. Reported-by: Elijah Newren Signed-off-by: Johannes Altmanninger --- Documentation/git-status.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (the diff looks off by one column but that's just because we use tabs for indentation) diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 83f38e3198..20f496094a 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -225,8 +225,8 @@ C [ MD] copied in index [MARC] index and work tree matches [ MARC] M work tree changed since index [ MARC] D deleted in work tree -[ D] R renamed in work tree -[ D] C copied in work tree + R renamed in work tree + C copied in work tree ------------------------------------------------- D D unmerged, both deleted A U unmerged, added by us From patchwork Mon Oct 4 19:00:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Altmanninger X-Patchwork-Id: 12534541 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9500C433EF for ; Mon, 4 Oct 2021 19:01:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B0821611C1 for ; Mon, 4 Oct 2021 19:01:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236851AbhJDTDU (ORCPT ); Mon, 4 Oct 2021 15:03:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238848AbhJDTDS (ORCPT ); Mon, 4 Oct 2021 15:03:18 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D39EEC061753 for ; Mon, 4 Oct 2021 12:01:28 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id r18so68660759edv.12 for ; Mon, 04 Oct 2021 12:01:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s48i5v8GwHMa/ouii3922x6xwOakkUk1PXb6afKIa10=; b=Sg4Xc8kZ+tjfle6YAKiwUx0bVFF8b6lAZGiqYABoIl4638v3af9L8buVdhO7qVVfz3 x/XMKXm1sVUzwtoTHunGSZP/FP/A9nlU4WPSIlu3ptvjdBOFiS3n9SAHYZS8vw/24dr0 /8ieYGwlOTiiYoxmploiPD42mCRG+5GtGGMHv7XxLsXzz8nCgla/WFkd9PVg3izroq7i rpJqn7AQAn5wCcJPpPRZ8onWplz+gw2mVs0h5It6wQhSKmJdfjYCpL1Oggp9OPmWiwnY Kd2BRALw2Lwa4sEMOVq/cDnkmCakHLvFYSgQ8Tw4kzmPTFxECTf23Z0wQmN8y0eVE4X7 668g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s48i5v8GwHMa/ouii3922x6xwOakkUk1PXb6afKIa10=; b=Bx8QGZZDkM1BJiBmwiG3HIGnirObPNwsZFigNkkcy+sqdcHj7+7MlZAExNfvGP2gDs 75xCaoqD/sNyFzhbtXKq55xFcbOp8q0jLvkj8SV4W37G58MfBa6a5MUXvM3CHVlAw+Vk hv19Rx7ccWbXstaLQyQzyRyXmQNMBGMLS/gchTBTU5YjF4PiCaEwAecNFDYjuVq/7Ynr Z49YeumRWtOQFqRClikkLJCSA4fqbHds8iQ8F+SNsXbRbK5OfNyd/X5YWLtC3RnppEfC TYKJNIGKxkH7TXC8Hswng4LdwEAz6+82OwCx34XDZhTxfyuT9JA2ZxjP9r4d2TPTOuoA q0Mw== X-Gm-Message-State: AOAM53018UQNUpwKkPJ4d7NJfSs63NPu1SmFqroABPV3Q09DTWTyQ/0L qpcYx+lmNo/8Ne38Sd8UlRmpYcXGcSU= X-Google-Smtp-Source: ABdhPJzotBTYMprzi2v4D1XFewEWTeeKp4DQL+rdru3a+Wf3p66YHouj/WNhhbfSw9lsvcT0AC/DBw== X-Received: by 2002:a17:906:3281:: with SMTP id 1mr18877781ejw.167.1633374087179; Mon, 04 Oct 2021 12:01:27 -0700 (PDT) Received: from localhost.localdomain (178.115.74.220.wireless.dyn.drei.com. [178.115.74.220]) by smtp.gmail.com with ESMTPSA id v13sm6759357ejo.36.2021.10.04.12.01.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Oct 2021 12:01:26 -0700 (PDT) From: Johannes Altmanninger To: newren@gmail.com Cc: aclopte@gmail.com, git@vger.kernel.org Subject: [PATCH v2 2/4] Documentation/diff-format: state in which cases porcelain status is T Date: Mon, 4 Oct 2021 21:00:48 +0200 Message-Id: <20211004190050.921109-2-aclopte@gmail.com> X-Mailer: git-send-email 2.33.0.rc2.dirty In-Reply-To: <20211004190050.921109-1-aclopte@gmail.com> References: <20211004190050.921109-1-aclopte@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Porcelain status letter T is documented as "type of the file", which is technically correct but not enough information for users that are not so familiar with this term from systems programming. In particular, given that the only supported file types are "regular file", "symbolic link" and "submodule", the term "file type" is surely opaque to the many(?) users who are not aware that symbolic links can be tracked - I thought that a "chmod +x" could cause the T status (wrong, it's M). Explicitly document the three file types so users know if/how they want to handle this. Signed-off-by: Johannes Altmanninger --- Documentation/diff-format.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index fbbd410a84..7a9c3b6ff4 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -59,7 +59,7 @@ Possible status letters are: - D: deletion of a file - M: modification of the contents or mode of a file - R: renaming of a file -- T: change in the type of the file +- T: change in the type of the file (regular file, symbolic link or submodule) - U: file is unmerged (you must complete the merge before it can be committed) - X: "unknown" change type (most probably a bug, please report it) From patchwork Mon Oct 4 19:00:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Altmanninger X-Patchwork-Id: 12534543 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44EBDC433F5 for ; Mon, 4 Oct 2021 19:01:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 288BB60F6E for ; Mon, 4 Oct 2021 19:01:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237044AbhJDTDV (ORCPT ); Mon, 4 Oct 2021 15:03:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238835AbhJDTDU (ORCPT ); Mon, 4 Oct 2021 15:03:20 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 509FCC061745 for ; Mon, 4 Oct 2021 12:01:31 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id x7so66627355edd.6 for ; Mon, 04 Oct 2021 12:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dgj5lg7aBlw0FduMwbwfje/QFmuDp5IV0mw9ALApOpM=; b=ptU96YHqKAuHv1xJrqeKm5WMTBTQ/VpMX/KZxSdjeY1aSh2TT2Ky+7Aq5MPYKxD0wT YHSyXTtXlGG5oVtY4O+vR2RPt1Ju6C1zeXJGV36CWvAkrYDZlveh9Fii5JHD+9aW1Z6H 8Wz/ev1ck5sDfUZwa+Wt7kRAOwoazVZEf0oFPAYPQnr3kzK3QOIhLqSpEclom6oQ/mOQ iFuV6svocicPl3T2zb3cblbsTCQ7RQVhc7H+qvKoAu7KiwzECfcyJDxfyg64sTR+gn0w BsjqVTs16V355HpTK3PYUutcY/Pza3TfFvIzROwxbWkxRc+zz70PfZMB8QohWVE5a+4f 0L1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Dgj5lg7aBlw0FduMwbwfje/QFmuDp5IV0mw9ALApOpM=; b=EgNcy8W9DXWCPzW3c/PkqcR18RRXrzp9/tvrLQH3NKv1KBxTrvRFWCqUvwFqjZutDt 8/h7x/DPCKkNoW0aUQFWM3ad525pfu5b5hulYmPwHltSaVOPHs8n8pnj9TWH8IcUbxCf 25CkG27JvQmsRoHYFdgm/dGaoCr6VkXenoxRutbgpl5XhCBeZ2YnoyAw4R/BZCDuNooq Xp69JGoZOVBS0+LQSkmGlVBk+LufX1CA8XWEyenFG7YjyOK1xTpbf0zqpjoWoIO2WuXN yGKkyliAz72OqUR00GkInimqCAjDNU24Ad8Y/Pa4cQYdtmd6PKPZOLja68vKv7gpJlrt mmvA== X-Gm-Message-State: AOAM5300wO+35obhaDJ9MBmHijDlLYnbX7e8cdwf+b+ZfnNorv9NwncJ MfTuSMsS53rZJmi8A3OPJwQ= X-Google-Smtp-Source: ABdhPJyT+QSeGCLkWIVryM/gtQ4A/+uAnPY7ITObszm+6+TCf7imL5stw8RGOpFTHTYP9xgDwEYOFw== X-Received: by 2002:a17:906:4c4a:: with SMTP id d10mr19649760ejw.391.1633374089957; Mon, 04 Oct 2021 12:01:29 -0700 (PDT) Received: from localhost.localdomain (178.115.74.220.wireless.dyn.drei.com. [178.115.74.220]) by smtp.gmail.com with ESMTPSA id v13sm6759357ejo.36.2021.10.04.12.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Oct 2021 12:01:29 -0700 (PDT) From: Johannes Altmanninger To: newren@gmail.com Cc: aclopte@gmail.com, git@vger.kernel.org Subject: [PATCH v2 3/4] Documentation/git-status: document porcelain status T (typechange) Date: Mon, 4 Oct 2021 21:00:49 +0200 Message-Id: <20211004190050.921109-3-aclopte@gmail.com> X-Mailer: git-send-email 2.33.0.rc2.dirty In-Reply-To: <20211004190050.921109-1-aclopte@gmail.com> References: <20211004190050.921109-1-aclopte@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org As reported in [1], T is missing from the description of porcelain status letters in git-status(1) (whereas T *is* documented in git-diff-files(1) and friends). Document T right after M (modified) because the two are very similar. [1] https://github.com/fish-shell/fish-shell/issues/8311 Signed-off-by: Johannes Altmanninger --- Documentation/git-status.txt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 20f496094a..255dc6af9b 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -207,6 +207,7 @@ show tracked paths: * ' ' = unmodified * 'M' = modified +* 'T' = file type changed (regular file, symbolic link or submodule) * 'A' = added * 'D' = deleted * 'R' = renamed @@ -217,14 +218,16 @@ show tracked paths: X Y Meaning ------------------------------------------------- [AMD] not updated -M [ MD] updated in index -A [ MD] added to index +M [ MTD] updated in index +T [ MTD] type changed in index +A [ MTD] added to index D deleted from index -R [ MD] renamed in index -C [ MD] copied in index -[MARC] index and work tree matches -[ MARC] M work tree changed since index -[ MARC] D deleted in work tree +R [ MTD] renamed in index +C [ MTD] copied in index +[MTARC] index and work tree matches +[ MTARC] M work tree changed since index +[ MTARC] T type changed in work tree since index +[ MTARC] D deleted in work tree R renamed in work tree C copied in work tree ------------------------------------------------- From patchwork Mon Oct 4 19:00:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Altmanninger X-Patchwork-Id: 12534545 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83FD6C433F5 for ; Mon, 4 Oct 2021 19:01:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5D06360F6E for ; Mon, 4 Oct 2021 19:01:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237350AbhJDTD0 (ORCPT ); Mon, 4 Oct 2021 15:03:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237016AbhJDTDV (ORCPT ); Mon, 4 Oct 2021 15:03:21 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AC6FC061749 for ; Mon, 4 Oct 2021 12:01:32 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id l7so45262846edq.3 for ; Mon, 04 Oct 2021 12:01:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xSYUzMHMQcczvOB9kgHzkwBckCraSf1Ut58TeWIY0IM=; b=HYfsrrtjHHbDutnNOecWvZU0Ia096u76hODp7y//rP2JE8ZR/psMaZy4wVRTpmY+UM Rlfc4GdP5V9vs4TqiGmdkevye7XrS2IZmq8X80C6xe0UyDG/v+ga/riM2tZA7Hdrom6F 3gG3DcFy2fcbET3I45877swzYdKrbordXac62bDYb8FSiOQwdgDL9mNx8FkzUBh6PDIb 2CVq5jY9P1g+xzvMH1lkRQumBMKhbExMzv5Ah+rlEQKpob5QW4sqePcVHXYdCa2rmCZj qMwnwrp8Z4iB7YhF4foh6QAXwR4QnU0fKWk/ZG7OKR2CjMtoIYlkRWitg2ze9SsGLKyn mwXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xSYUzMHMQcczvOB9kgHzkwBckCraSf1Ut58TeWIY0IM=; b=R5DnuoIlrkMqSwfPP48LDyh/0DOVTfp8ErXDzfZ/K9nmN7L8yLYAgiH7V375TpTeqF giS4Esat2MPMVETeXUZ2ayhOWbKl7IBtTXIDAUWLq5TXOWqHMJRQiCYRtVjIcRfAnC0z Y3z6QfAz63TedxZTY2zX/UpPYeyIuyt4gV7VrAeO7ew0PsH/Ti1wSK9AvFFbfeZ17eVy w1RT3WnFnzDDfBcirzQ8IajQ+nNDrq2uRU5x7HUPie1n0oA8t8Ep0NeJD8cT5of0WVT+ gyeS5fvwnmCd/si/MQ7NY/TWQuJTyhTCYotPbJyW7QRqVfnDTZPHV4KJed3JfuwEcsVU tF1g== X-Gm-Message-State: AOAM531b+BuA8natI9nsYCdSfLNHbvLEpiQ5ZEM/n4ROWr4z74xCEKh1 qJSJm9ohkr/zk6tNS413yFU= X-Google-Smtp-Source: ABdhPJzSgAf7MD3E3mhzoi4w8BXi7HzI6xHS9WppQLAQV/DuL/N+9/Vo+910AKJR615iw2YLyI7XkA== X-Received: by 2002:a17:906:82c8:: with SMTP id a8mr7871793ejy.384.1633374091071; Mon, 04 Oct 2021 12:01:31 -0700 (PDT) Received: from localhost.localdomain (178.115.74.220.wireless.dyn.drei.com. [178.115.74.220]) by smtp.gmail.com with ESMTPSA id v13sm6759357ejo.36.2021.10.04.12.01.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Oct 2021 12:01:30 -0700 (PDT) From: Johannes Altmanninger To: newren@gmail.com Cc: aclopte@gmail.com, git@vger.kernel.org Subject: [PATCH v2 4/4] Documentation/git-status: mention how to detect copies Date: Mon, 4 Oct 2021 21:00:50 +0200 Message-Id: <20211004190050.921109-4-aclopte@gmail.com> X-Mailer: git-send-email 2.33.0.rc2.dirty In-Reply-To: <20211004190050.921109-1-aclopte@gmail.com> References: <20211004190050.921109-1-aclopte@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The man page documents that git-status can find copies, but does not mention how. Whereas git-diff has command line options -C, there is no such option for git-status - it will only detect copies when the "status.renames" config option is "copies" or "copy". Document that in git-status.txt because this has confused me and others[1]. [1]: https://www.reddit.com/r/git/comments/ppc2l9/how_to_get_a_file_with_copied_status/ Signed-off-by: Johannes Altmanninger --- Documentation/git-status.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 255dc6af9b..8f959afa0f 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -211,7 +211,7 @@ show tracked paths: * 'A' = added * 'D' = deleted * 'R' = renamed -* 'C' = copied +* 'C' = copied (if config option status.renames is set to "copies") * 'U' = updated but unmerged ....