From patchwork Sun Jan 24 10:54:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ZheNing Hu X-Patchwork-Id: 12042233 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87953C433E6 for ; Sun, 24 Jan 2021 10:55:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5513B22CA1 for ; Sun, 24 Jan 2021 10:55:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726732AbhAXKzV (ORCPT ); Sun, 24 Jan 2021 05:55:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726571AbhAXKzM (ORCPT ); Sun, 24 Jan 2021 05:55:12 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1905FC061574 for ; Sun, 24 Jan 2021 02:54:31 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id g10so9382204wrx.1 for ; Sun, 24 Jan 2021 02:54:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=bLslohkwHWtcE7ThFzu7S1dggo95CxS7F8DkFmWda2k=; b=A0pqH/SWKNmdThoWl2CyUolxfXsy38gcVhvZqjiHdcV/SaerAAD/pOx3LRlXEOxSIF P2fhiIjeWdup7+j33W1GRYRLddSn/K9oy4KK2U+hlsQ47sn2FcGtetsL4sUHes6BklpA YoRvNVTUF2iQHOBx0/H1ErP96bPj1QKO/I3Qx5cxBiOiOXR8/bvrcKFP8bRU0n04zt07 XIQ7VZ2zIPn7RkR7kkkZ1qu98eClTgCd1nbjSci885wVfTIa4yHh7LWpDKnBC4Ro/D+T unkFWPJ2B8543VArH1bgBj8eF67cvI1UCDViqfC/JTu2Ao5rBgG/AurvNbjxDo+MhoZc R2bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=bLslohkwHWtcE7ThFzu7S1dggo95CxS7F8DkFmWda2k=; b=XI/FYoGbIIE6hz7T+P2ES1YSDoi85WqaTJPATzlPYvBvG9aUdQonfvKYiXB8u1E7fs sUebleA6Qbzzz3bY1n3EIg5amdZHoc28CzRVEijvufp8wO+RB/CZ7qtRQ4tJfLbXg2Pg +cIHiH525UGCJxlzBUnkGqqncxWgKsBqdlZAk+wwH0xYYtbCjmK9DuRlSAMJKQhRPyML qiuQI/f8knGr2s9v6Qa55IZLj+s1SfsNeMwVczqPGFvu/Ge0Lj7ay+eNE11a82pVZygQ 1Vs6nFbDM16+iVxR991s/aEPpcSWUiGd56I6A8xWQm4psE62Vk7YS3gc4zNcNYNcqRNy 5/HQ== X-Gm-Message-State: AOAM532FMatzhQreeDGaataOGz32DRS5+BHH7ufkkuVE9RNdTmS8EyAE xEicSSZd84b6KBF+pleezNWCp5bKr+o= X-Google-Smtp-Source: ABdhPJzbrng6/5NlyspsS6IjhmSBe7RQOXSFrImt9KAB+tTy3v3X4fCVjmmr0Qg/VOLukQNm/8iEIA== X-Received: by 2002:a05:6000:8a:: with SMTP id m10mr2455490wrx.139.1611485669506; Sun, 24 Jan 2021 02:54:29 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id l20sm20109461wrh.82.2021.01.24.02.54.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 02:54:29 -0800 (PST) Message-Id: <8b02367a359e62d7721b9078ac8393a467d83724.1611485667.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 24 Jan 2021 10:54:25 +0000 Subject: [PATCH v7 1/3] ls_files.c: bugfix for --deleted and --modified Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , =?utf-8?b?6IOh5ZOy5a6B?= , Junio C Hamano , Johannes Schindelin , =?utf-8?b?6Zi/5b6354OI?= , ZheNing Hu Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: ZheNing Hu From: ZheNing Hu This situation may occur in the original code: lstat() failed but we use `&st` to feed ie_modified() later. Therefore, we can directly execute show_ce without the judgment of ie_modified() when lstat() has failed. Signed-off-by: ZheNing Hu [jc: fixed misindented code] Signed-off-by: Junio C Hamano --- builtin/ls-files.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index c8eae899b82..1e264bd1329 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -335,7 +335,7 @@ static void show_files(struct repository *repo, struct dir_struct *dir) for (i = 0; i < repo->index->cache_nr; i++) { const struct cache_entry *ce = repo->index->cache[i]; struct stat st; - int err; + int stat_err; construct_fullname(&fullname, repo, ce); @@ -346,11 +346,14 @@ static void show_files(struct repository *repo, struct dir_struct *dir) continue; if (ce_skip_worktree(ce)) continue; - err = lstat(fullname.buf, &st); - if (show_deleted && err) + stat_err = lstat(fullname.buf, &st); + if (stat_err && (errno != ENOENT && errno != ENOTDIR)) + error_errno("cannot lstat '%s'", fullname.buf); + if (stat_err && show_deleted) show_ce(repo, dir, ce, fullname.buf, tag_removed); - if (show_modified && ie_modified(repo->index, ce, &st, 0)) - show_ce(repo, dir, ce, fullname.buf, tag_modified); + if (show_modified && + (stat_err || ie_modified(repo->index, ce, &st, 0))) + show_ce(repo, dir, ce, fullname.buf, tag_modified); } } From patchwork Sun Jan 24 10:54:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ZheNing Hu X-Patchwork-Id: 12042237 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5B08C433E0 for ; Sun, 24 Jan 2021 10:55:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E4E322CAF for ; Sun, 24 Jan 2021 10:55:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726741AbhAXKzY (ORCPT ); Sun, 24 Jan 2021 05:55:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726579AbhAXKzM (ORCPT ); Sun, 24 Jan 2021 05:55:12 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9669C06174A for ; Sun, 24 Jan 2021 02:54:31 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id c12so9357120wrc.7 for ; Sun, 24 Jan 2021 02:54:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=GP5PnqLYwbr09MZepCskm2EciyWOk0VFQMALvYuJKt8=; b=gnPR/vS1vHx2b52L9q+G1mBat4xMchMkeS0PNXUFw8LCDqTzpmikXI0D53uJBsNa/R RW3jSMqspvvNTlKCOVHLK2h4m+KMctXnLynAx7QTKIuUIegrDCQaSwlaU16W5Sepfg90 of3yAZhEEENLxWvMK+ghJtkDdkQwwqSGOdmIvejDMi/17wKZ9vHMLZpp8rjN/i8xJH7o Swnut1alZJ3IR3aSkyS6bYTsfpxEepfWbZxhXMtprxmxSl7Ayyme7hrrBO+A58v2r8eb AV21bTpukIFLOjoQbj6oUHI302vhs3Ucsdvz8yHva+qt2MvGDAlqiptinaXv40FrZzGv HZtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=GP5PnqLYwbr09MZepCskm2EciyWOk0VFQMALvYuJKt8=; b=BIcgCHhSiPt2El1DfrCtedWc/H9xrigZ35MLbYNJn+U5IurHoiUdTp/r3SWJjKOURl zr9tS0q4Iv2qUD2puiRfUP21SwAcOteEhp7mK/8JuczzLFmMU1vFg+bRZIzpC1Y6i6Tp IluLTH6b5cpHlMywnn0lL9/T4h71tzi+EEcLDphT+1R7sEnVmeyCWTszmKRDLmBsQea2 S31PsHWweQ5EdIXO72+mrTYdnvPN41K+caPyNWDIuhsHMGLg6jELWdLXnq1HW7aiWcab N6vfZtsxSPvXtpeZE/OHW5PGde5YDGnwt/Y4uhNtxg83LO1n0nF62wZhc1AJcgppLlkW WUZA== X-Gm-Message-State: AOAM530TpPPEPM+3mNmlWzuWdrhPsEQ8/1itNCioHaW7KMWJvELm5dB8 PcYLp515FtLtvjO+G6+YEg//UqciXv4= X-Google-Smtp-Source: ABdhPJwF4DDuWStwclZ9h/40IIs2Vf/48jTSpBEvYOl21MHNmb6Ps1YXDdPuWocgeQLSNNWf8AcEDg== X-Received: by 2002:adf:c106:: with SMTP id r6mr12046166wre.175.1611485670460; Sun, 24 Jan 2021 02:54:30 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g9sm17985263wmh.3.2021.01.24.02.54.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 02:54:29 -0800 (PST) Message-Id: In-Reply-To: References: Date: Sun, 24 Jan 2021 10:54:26 +0000 Subject: [PATCH v7 2/3] ls_files.c: consolidate two for loops into one Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , =?utf-8?b?6IOh5ZOy5a6B?= , Junio C Hamano , Johannes Schindelin , =?utf-8?b?6Zi/5b6354OI?= , ZheNing Hu Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: ZheNing Hu From: ZheNing Hu This will make it easier to show only one entry per filename in the next step. Signed-off-by: ZheNing Hu [jc: corrected the log message] Signed-off-by: Junio C Hamano --- builtin/ls-files.c | 70 ++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 40 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 1e264bd1329..966c0ab0296 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -312,49 +312,39 @@ static void show_files(struct repository *repo, struct dir_struct *dir) if (show_killed) show_killed_files(repo->index, dir); } - if (show_cached || show_stage) { - for (i = 0; i < repo->index->cache_nr; i++) { - const struct cache_entry *ce = repo->index->cache[i]; - - construct_fullname(&fullname, repo, ce); - - if ((dir->flags & DIR_SHOW_IGNORED) && - !ce_excluded(dir, repo->index, fullname.buf, ce)) - continue; - if (show_unmerged && !ce_stage(ce)) - continue; - if (ce->ce_flags & CE_UPDATE) - continue; - show_ce(repo, dir, ce, fullname.buf, - ce_stage(ce) ? tag_unmerged : - (ce_skip_worktree(ce) ? tag_skip_worktree : - tag_cached)); - } - } - if (show_deleted || show_modified) { - for (i = 0; i < repo->index->cache_nr; i++) { - const struct cache_entry *ce = repo->index->cache[i]; - struct stat st; - int stat_err; + if (! (show_cached || show_stage || show_deleted || show_modified)) + return; + for (i = 0; i < repo->index->cache_nr; i++) { + const struct cache_entry *ce = repo->index->cache[i]; + struct stat st; + int stat_err; - construct_fullname(&fullname, repo, ce); + construct_fullname(&fullname, repo, ce); - if ((dir->flags & DIR_SHOW_IGNORED) && - !ce_excluded(dir, repo->index, fullname.buf, ce)) - continue; - if (ce->ce_flags & CE_UPDATE) - continue; - if (ce_skip_worktree(ce)) - continue; - stat_err = lstat(fullname.buf, &st); - if (stat_err && (errno != ENOENT && errno != ENOTDIR)) - error_errno("cannot lstat '%s'", fullname.buf); - if (stat_err && show_deleted) - show_ce(repo, dir, ce, fullname.buf, tag_removed); - if (show_modified && - (stat_err || ie_modified(repo->index, ce, &st, 0))) - show_ce(repo, dir, ce, fullname.buf, tag_modified); + if ((dir->flags & DIR_SHOW_IGNORED) && + !ce_excluded(dir, repo->index, fullname.buf, ce)) + continue; + if (ce->ce_flags & CE_UPDATE) + continue; + if (show_cached || show_stage) { + if (!show_unmerged || ce_stage(ce)) + show_ce(repo, dir, ce, fullname.buf, + ce_stage(ce) ? tag_unmerged : + (ce_skip_worktree(ce) ? tag_skip_worktree : + tag_cached)); } + if (!show_deleted && !show_modified) + continue; + if (ce_skip_worktree(ce)) + continue; + stat_err = lstat(fullname.buf, &st); + if (stat_err && (errno != ENOENT && errno != ENOTDIR)) + error_errno("cannot lstat '%s'", fullname.buf); + if (stat_err && show_deleted) + show_ce(repo, dir, ce, fullname.buf, tag_removed); + if (show_modified && + (stat_err || ie_modified(repo->index, ce, &st, 0))) + show_ce(repo, dir, ce, fullname.buf, tag_modified); } strbuf_release(&fullname); From patchwork Sun Jan 24 10:54:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ZheNing Hu X-Patchwork-Id: 12042239 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BDC6C43381 for ; Sun, 24 Jan 2021 10:55:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EC72D22C9F for ; Sun, 24 Jan 2021 10:55:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726747AbhAXKzf (ORCPT ); Sun, 24 Jan 2021 05:55:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726614AbhAXKzN (ORCPT ); Sun, 24 Jan 2021 05:55:13 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A73A7C061756 for ; Sun, 24 Jan 2021 02:54:32 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id v15so9353471wrx.4 for ; Sun, 24 Jan 2021 02:54:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=M/0mF3GJ/1thOc+OSAkq3zbwHYXXe4X21U17XOHJvdE=; b=myrLsMKOk9oSMs2qGYvfpf4rxiOoeY5yxeIdpzjFzg+41kEsVsEf938cdnFLSKUiBV OWoxwl0JEHLzsliUnU/3vGJNZINahGemli813m8crF+fLyJi5b5P4ml3wZEGE5X0O6PR qzNM55395HJkNLOoCDlm3qGnROF7bI5preR/azVZ8f8kWEJH3u9EqeWcUFQ1q6RnkepS le+KReY0kM5qaavGI8+HxErAmJJBHukLBO5pJ6mN+qG2eZztLGx2IznFur8+bvMYzd89 6KMXOyN8UW14nMQAGkNyIbmr/yupPiT+/3oa3jqO078LxkdL7SFQVGRf7+obDI31ntEb /l9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=M/0mF3GJ/1thOc+OSAkq3zbwHYXXe4X21U17XOHJvdE=; b=UJfZX/bCmgvX3pFBE6C5s+RKH/kwgvWv38lyJRbP3U4qiksnDp+HSzgBrB7wEvbvQT SEIjPclkiJoF03HS8uyNLn804qZyPlAD+rBRUlKRnfDvtsN8aJ20YUwbPDOrEm2dqA14 BxcHXeoDhoN37IUeyqNx4GkKDLeK3+OFeFL/MFGL+v6mXOYbBtTcReKakucw5QKHz+JF nJh2kojHu9ZIC1Yi6GgGCyzGPXsCHJ+XNiMGu248f93rrtj5kZBb6c0Y5Xhnlu1Zlq+n ecHiCT3i8igtpbCBH5cyVnIYQ2dh9ukUeK/+QS6Gs0uw4P/dFvVExShf0SLsqqvQn59f m9zA== X-Gm-Message-State: AOAM532wodlRhNumUt28Ye2vavnvin22kwFmdVBZPGeb1NupbmOQqmKR LE6w+9D/HXFrAQZHRmoTvh90JDi+x7Q= X-Google-Smtp-Source: ABdhPJzA7ikFDeZymsYHXwoSVvjo0ZW61r2fEb8PSFjr6hbzOZrHxq0h+6nLUneLdIqSkRyJ4uogWg== X-Received: by 2002:a05:6000:1374:: with SMTP id q20mr1795887wrz.44.1611485671248; Sun, 24 Jan 2021 02:54:31 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id b7sm18579343wru.33.2021.01.24.02.54.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 02:54:30 -0800 (PST) Message-Id: <384f77a4c188456854bd86335e9bdc8018097a5f.1611485667.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 24 Jan 2021 10:54:27 +0000 Subject: [PATCH v7 3/3] ls-files.c: add --deduplicate option Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Sunshine , =?utf-8?b?6IOh5ZOy5a6B?= , Junio C Hamano , Johannes Schindelin , =?utf-8?b?6Zi/5b6354OI?= , ZheNing Hu Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: ZheNing Hu From: ZheNing Hu During a merge conflict, the name of a file may appear multiple times in "git ls-files" output, once for each stage. If you use both `--delete` and `--modify` at the same time, the output may mention a deleted file twice. When none of the '-t', '-u', or '-s' options is in use, these duplicate entries do not add much value to the output. Introduce a new '--deduplicate' option to suppress them. Signed-off-by: ZheNing Hu [jc: extended doc and rewritten commit log] Signed-off-by: Junio C Hamano --- Documentation/git-ls-files.txt | 8 +++++ builtin/ls-files.c | 30 +++++++++++++--- t/t3012-ls-files-dedup.sh | 66 ++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 4 deletions(-) create mode 100755 t/t3012-ls-files-dedup.sh diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index cbcf5263dd0..60449a69b69 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -13,6 +13,7 @@ SYNOPSIS (--[cached|deleted|others|ignored|stage|unmerged|killed|modified])* (-[c|d|o|i|s|u|k|m])* [--eol] + [--deduplicate] [-x |--exclude=] [-X |--exclude-from=] [--exclude-per-directory=] @@ -81,6 +82,13 @@ OPTIONS \0 line termination on output and do not quote filenames. See OUTPUT below for more information. +--deduplicate:: + When only filenames are shown, suppress duplicates that may + come from having multiple stages during a merge, or giving + `--deleted` and `--modified` option at the same time. + When any of the `-t`, `--unmerged`, or `--stage` option is + in use, this option has no effect. + -x :: --exclude=:: Skip untracked files matching pattern. diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 966c0ab0296..fb9cf50d764 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -35,6 +35,7 @@ static int line_terminator = '\n'; static int debug_mode; static int show_eol; static int recurse_submodules; +static int skipping_duplicates; static const char *prefix; static int max_prefix_len; @@ -326,12 +327,14 @@ static void show_files(struct repository *repo, struct dir_struct *dir) continue; if (ce->ce_flags & CE_UPDATE) continue; - if (show_cached || show_stage) { - if (!show_unmerged || ce_stage(ce)) + if ((show_cached || show_stage) && + (!show_unmerged || ce_stage(ce))) { show_ce(repo, dir, ce, fullname.buf, ce_stage(ce) ? tag_unmerged : (ce_skip_worktree(ce) ? tag_skip_worktree : tag_cached)); + if (skipping_duplicates) + goto skip_to_next_name; } if (!show_deleted && !show_modified) continue; @@ -340,11 +343,27 @@ static void show_files(struct repository *repo, struct dir_struct *dir) stat_err = lstat(fullname.buf, &st); if (stat_err && (errno != ENOENT && errno != ENOTDIR)) error_errno("cannot lstat '%s'", fullname.buf); - if (stat_err && show_deleted) + if (stat_err && show_deleted) { show_ce(repo, dir, ce, fullname.buf, tag_removed); + if (skipping_duplicates) + goto skip_to_next_name; + } if (show_modified && - (stat_err || ie_modified(repo->index, ce, &st, 0))) + (stat_err || ie_modified(repo->index, ce, &st, 0))) { show_ce(repo, dir, ce, fullname.buf, tag_modified); + if (skipping_duplicates) + goto skip_to_next_name; + } + continue; +skip_to_next_name: + { + int j; + struct cache_entry **cache = repo->index->cache; + for (j = i + 1; j < repo->index->cache_nr; j++) + if (strcmp(ce->name, cache[j]->name)) + break; + i = j - 1; /* compensate for outer for loop */ + } } strbuf_release(&fullname); @@ -571,6 +590,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) N_("pretend that paths removed since are still present")), OPT__ABBREV(&abbrev), OPT_BOOL(0, "debug", &debug_mode, N_("show debugging data")), + OPT_BOOL(0,"deduplicate",&skipping_duplicates,N_("suppress duplicate entries")), OPT_END() }; @@ -610,6 +630,8 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) * you also show the stage information. */ show_stage = 1; + if (show_tag || show_stage) + skipping_duplicates = 0; if (dir.exclude_per_dir) exc_given = 1; diff --git a/t/t3012-ls-files-dedup.sh b/t/t3012-ls-files-dedup.sh new file mode 100755 index 00000000000..2682b1f43a6 --- /dev/null +++ b/t/t3012-ls-files-dedup.sh @@ -0,0 +1,66 @@ +#!/bin/sh + +test_description='git ls-files --deduplicate test' + +. ./test-lib.sh + +test_expect_success 'setup' ' + >a.txt && + >b.txt && + >delete.txt && + git add a.txt b.txt delete.txt && + git commit -m base && + echo a >a.txt && + echo b >b.txt && + echo delete >delete.txt && + git add a.txt b.txt delete.txt && + git commit -m tip && + git tag tip && + git reset --hard HEAD^ && + echo change >a.txt && + git commit -a -m side && + git tag side +' + +test_expect_success 'git ls-files --deduplicate to show unique unmerged path' ' + test_must_fail git merge tip && + git ls-files --deduplicate >actual && + cat >expect <<-\EOF && + a.txt + b.txt + delete.txt + EOF + test_cmp expect actual && + git merge --abort +' + +test_expect_success 'git ls-files -d -m --deduplicate with different display options' ' + git reset --hard side && + test_must_fail git merge tip && + rm delete.txt && + git ls-files -d -m --deduplicate >actual && + cat >expect <<-\EOF && + a.txt + delete.txt + EOF + test_cmp expect actual && + git ls-files -d -m -t --deduplicate >actual && + cat >expect <<-\EOF && + C a.txt + C a.txt + C a.txt + R delete.txt + C delete.txt + EOF + test_cmp expect actual && + git ls-files -d -m -c --deduplicate >actual && + cat >expect <<-\EOF && + a.txt + b.txt + delete.txt + EOF + test_cmp expect actual && + git merge --abort +' + +test_done