From patchwork Wed Aug 5 22:08:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 11702585 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 27BFD1392 for ; Wed, 5 Aug 2020 22:08:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 128CD22CA1 for ; Wed, 5 Aug 2020 22:08:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="G8DsnpnD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726398AbgHEWIy (ORCPT ); Wed, 5 Aug 2020 18:08:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726204AbgHEWIv (ORCPT ); Wed, 5 Aug 2020 18:08:51 -0400 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FBA1C061756 for ; Wed, 5 Aug 2020 15:08:50 -0700 (PDT) Received: by mail-lj1-x243.google.com with SMTP id z14so11879615ljm.1 for ; Wed, 05 Aug 2020 15:08:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u3LsXQ9b+cfP0m/U6/17TmTy1eO1QlDuLXuobi/FId0=; b=G8DsnpnD+3DiESiqD8GuFg6qQXeBxawQ/nVM49L7qvOvAA0KBsX9M1VHTJoQ7PvCpF Pu1lSlIvdEdVNjYQJqNTSw0bZhxKE9ckC5b94lu9jQRyUqsqWwmRyGCs65iFrHZne0yb gNrWc89zBv9izZrffv54pI6uMNC8hk85ij/G5tYtRlWFkAo79dntuA9IaZRfAsYofGvc BWStZWp67Nx5ohtZttRUyC6tpihd0LNhdVqSnn5K2hUgwbmc8oPeOUf6brHEHi0A3JGQ IhMffI8g7JONh0o4V9kdFRneJfTRm/12bN12vnE8g+sXHHldaxSc4ZzgrWuNYdmE7xEN Ci3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u3LsXQ9b+cfP0m/U6/17TmTy1eO1QlDuLXuobi/FId0=; b=R4GGsItgKvn6obmHgzMYdT0NdVlFq+8x9RsjMVG/1Wcvzw1fbOm3mhO/XVReLjsAAG v76AvJ6dOj0gs90LFDm8uCflcxw8s3hYjHTzCnNlCGyUppMu38zaB2kqnQI0RqdIvIGz 6MTuB9/i6vvH5kfkiV5NF/2DOmsmK87Z4RhKzsjYIjDj2AYyKP5BTmr+TAUGKWfTKJ9q 8s7Sxy9NS0lInKL+RbwjBQp9p7gVgxhw2EO09SYoCH8TENhPJEKpyVX1K9Gt6m4bO9Dm NKHIK9CJY+U4MtUEYCr+4X36nAnCOr8bD2TK73ogbc11KdD4wLB3Ht2+R4ZMuo9ka7Nv eZKw== X-Gm-Message-State: AOAM531W0m1M7QcYefemULQRHOAcx74cC0/FUyoq18YOgnTmnN0Ppqix DrhjROuu4fh9NDpKUz9QC1mdZroM X-Google-Smtp-Source: ABdhPJy0DspIgktWU8aeXlZmyrBq3aGm8/XFM0ODq7Lu3S4avCCNxXqUjyDUy6W52N07lrK9YRLR9Q== X-Received: by 2002:a2e:9882:: with SMTP id b2mr2322731ljj.93.1596665329022; Wed, 05 Aug 2020 15:08:49 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id g18sm1544183ljk.27.2020.08.05.15.08.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2020 15:08:48 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , git@vger.kernel.org, Sergey Organov Subject: [PATCH 1/3] revision: change "--diff-merges" option to require parameter Date: Thu, 6 Aug 2020 01:08:30 +0300 Message-Id: <20200805220832.3800-2-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200805220832.3800-1-sorganov@gmail.com> References: <20200805220832.3800-1-sorganov@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org --diff-merges=off is the only accepted form for now, a synonym for --no-diff-merges. This patch is a preparation for adding more values, as well as supporting --diff-merges=, where is single parent number to output diff against. Signed-off-by: Sergey Organov --- revision.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/revision.c b/revision.c index 669bc856694f..417659cfcb10 100644 --- a/revision.c +++ b/revision.c @@ -2323,8 +2323,15 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg revs->diff = 1; revs->diffopt.flags.recursive = 1; revs->diffopt.flags.tree_in_recursive = 1; - } else if (!strcmp(arg, "-m") || !strcmp(arg, "--diff-merges")) { + } else if (!strcmp(arg, "-m")) { revs->ignore_merges = 0; + } else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) { + if (!strcmp(optarg, "off")) { + revs->ignore_merges = 1; + } else { + die(_("unknown value for --diff-merges: %s"), optarg); + } + return argcount; } else if (!strcmp(arg, "--no-diff-merges")) { revs->ignore_merges = 1; } else if (!strcmp(arg, "-c")) { From patchwork Wed Aug 5 22:08:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 11702583 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 73FF514E3 for ; Wed, 5 Aug 2020 22:08:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 567CF2250E for ; Wed, 5 Aug 2020 22:08:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Lm6GnNBz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726418AbgHEWIz (ORCPT ); Wed, 5 Aug 2020 18:08:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726230AbgHEWIw (ORCPT ); Wed, 5 Aug 2020 18:08:52 -0400 Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81971C061757 for ; Wed, 5 Aug 2020 15:08:51 -0700 (PDT) Received: by mail-lj1-x244.google.com with SMTP id w25so14022386ljo.12 for ; Wed, 05 Aug 2020 15:08:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PfpWEMYvvZyYjzcOdTyEFdaPNlmRw5fq+TPEm2LYO2w=; b=Lm6GnNBzZTCud4y8tBfWcvLVIPPnIvOdLx+zxYB8rg8GqpmMrJfhbmUDsAtO2VcTF4 be8QpYdJRBysC3Sv1hTVcnHAU2JGJCgFjlvppU3Z+8xnkTJO83D8dKDNngPDmwZPD/YW jukbs5tGk+Xd/NuOpnK5V4uEqi3DlaGrzFIO1HmFZAFuKzW858oepLibcyaclEck937E AZ7h9Qsv6A/LH5W9h2axwwq3IPQWugAdp2nSTnhWXQoHlOsmm22u6zT8eBTKNdYEQyDH ooDZa4w3JlMGX2z4owUkfMWE0AMHDV91eeGa9pxm0KQ97A9p8/qUb6zBlSmmthFj1i8S eP0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PfpWEMYvvZyYjzcOdTyEFdaPNlmRw5fq+TPEm2LYO2w=; b=djXq2vzRKLoT9OaY12T3WNpI6jo5Ei8Oko1oav+L3SF7Q9XT0wPi9hPtQZfkehNC7q clSyl9XJhTvvXm3oWpnwhw6nDW0xpOEPP5UJcYGnKjo3gdG1d0pojuXYx+3X0nalM3M3 LbyyNc/20r3I46FuAJCsXqoTMDkdZcaH0fRDz7SrxPIMPA9G/aucTO3mASLXdLrl3qu2 Xs2e1e4KiFJorYnd0IBDR1Ay3XV7XFYo+KXfsIMBfQMdj2nyeiAKUafPbVZtOkVouT6G ozze+Usdnrj/lrCAL6cK9ERh1j/JBLNDZq8JKf7dCXu1eV9S/u0p9gF57TfGxHZW1olh B6ZA== X-Gm-Message-State: AOAM533hGLnCbUnXZHcBLu9Y/xJxtYXH6zEBuSi7ggDlzHzN1tsquXnC Ly5qndxWBjyj2Xl5TBvaXk0= X-Google-Smtp-Source: ABdhPJx/0aGaHqTmUoBjWJT7qGpV2RSoKx1l4rP0rYS9E/J8dKgT7caZuOe2k3CqYryLl4UZnXYKMQ== X-Received: by 2002:a2e:9e5a:: with SMTP id g26mr2570818ljk.207.1596665330049; Wed, 05 Aug 2020 15:08:50 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id g18sm1544183ljk.27.2020.08.05.15.08.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2020 15:08:49 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , git@vger.kernel.org, Sergey Organov Subject: [PATCH 2/3] doc/git-log: describe --diff-merges=off Date: Thu, 6 Aug 2020 01:08:31 +0300 Message-Id: <20200805220832.3800-3-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200805220832.3800-1-sorganov@gmail.com> References: <20200805220832.3800-1-sorganov@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Sergey Organov --- Documentation/git-log.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 9ccba65469d7..f3727c786453 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -145,7 +145,6 @@ combined-diff option or with `--no-diff-merges`). rename or copy detection have been requested). -m:: ---diff-merges:: This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against @@ -153,6 +152,11 @@ combined-diff option or with `--no-diff-merges`). in that case, the output represents the changes the merge brought _into_ the then-current branch. +--diff-merges=off:: +--no-diff-merges:: + Disable output of diffs for merge commits (default). Useful to + override `-m`, `-c`, or `--cc`. + :git-log: 1 include::diff-options.txt[] From patchwork Wed Aug 5 22:08:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Organov X-Patchwork-Id: 11702589 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C93CE14E3 for ; Wed, 5 Aug 2020 22:08:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B764322CAE for ; Wed, 5 Aug 2020 22:08:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gUsibCGB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726429AbgHEWI6 (ORCPT ); Wed, 5 Aug 2020 18:08:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726256AbgHEWIy (ORCPT ); Wed, 5 Aug 2020 18:08:54 -0400 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36B50C06179E for ; Wed, 5 Aug 2020 15:08:53 -0700 (PDT) Received: by mail-lj1-x233.google.com with SMTP id i10so14703629ljn.2 for ; Wed, 05 Aug 2020 15:08:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Yj5I0SsdzHIpWzh2f4MnCrC9xXyRxl6HWxWJ1joniVE=; b=gUsibCGB8/A76dDJLJpVsFJYjAbNR6MOlSKlDaM1ozJuHojwJvNlb742Vc/AuzwcDY ywkQAJW2dfNmNMOOa7iEvBHs6kSHYIkHQUXE+rdVei27HtJ5W962+MrBzRZEMgN2Gw5a QamNB5WEWrUz6CbCImMXWdUFFE7M8QAMYuq6iY3vltg2XO33owCL1ibMwKc81kAttrp1 mxYiWM9ym0BgtjUsJDB9rkHArA6Dbv7YR8vvwTJ9+ZfbPBPXtEh6pSOgvjOokHVZ96Z/ nxZdoloRYfTV1oGkgQwiEHx864Pih9UBRyhpaI+2J2bfiqH7Ihl4xZ0rpdrhoGGjDB5M lhtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Yj5I0SsdzHIpWzh2f4MnCrC9xXyRxl6HWxWJ1joniVE=; b=QOBJXVUwd5E4bPDInJkh89cYxQ+cMaOYzZLWkZhNddbrZPu+FoCPfStiTWMpOqzt8v eatcqovabQTjXYKfmsScImJPpANeTGUPWeS/+FuLdOszdB1kHvbcLU14QT8gHvc1yjGg NupwVfdfHZNyYEIBzU+CT9eiujuhl79kOLblXb0PQCCrvXENy9qeyxOnPI8WwB++Rp5i zR+tY8/e5bnCL1Ccqj5tIIYk9ONGPpdZg2SfRIlPbX8FkRPGqWOM54OnlOljRUknpub3 iTxW4BTced2EXipO5f/j/WXjU2V3udfHO66ehnFcyw7ranrMYjNXPsVxB1vYAu4jL3eD Ld7g== X-Gm-Message-State: AOAM533wUVczBSu8fen4GzFZJwvXqXGCvp9QX8aYq6HPKOJH3A6ib+fg HWyMfs+IS3Nyj9Qwv9jFhor395US X-Google-Smtp-Source: ABdhPJyZERWUfnYkdJkanGev6JDwgAMIsgn1/5NM5GLvkILlFCfda9965/7I3ha6/OVmyymtfyHPxA== X-Received: by 2002:a2e:b5a5:: with SMTP id f5mr2560943ljn.114.1596665331034; Wed, 05 Aug 2020 15:08:51 -0700 (PDT) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id g18sm1544183ljk.27.2020.08.05.15.08.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2020 15:08:50 -0700 (PDT) From: Sergey Organov To: Junio C Hamano Cc: Jeff King , git@vger.kernel.org, Sergey Organov Subject: [PATCH 3/3] t/t4013: add test for --diff-merges=off Date: Thu, 6 Aug 2020 01:08:32 +0300 Message-Id: <20200805220832.3800-4-sorganov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200805220832.3800-1-sorganov@gmail.com> References: <20200805220832.3800-1-sorganov@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Sergey Organov --- t/t4013-diff-various.sh | 1 + ...--diff-merges=off_-p_--first-parent_master | 78 +++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 40e222c94520..86fb11cecc61 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -298,6 +298,7 @@ log --root -c --patch-with-stat --summary master # improved by Timo's patch log --root --cc --patch-with-stat --summary master log --no-diff-merges -p --first-parent master +log --diff-merges=off -p --first-parent master log -p --first-parent master log -m -p --first-parent master log -m -p master diff --git a/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master b/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master new file mode 100644 index 000000000000..c878f13c9519 --- /dev/null +++ b/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master @@ -0,0 +1,78 @@ +$ git log --diff-merges=off -p --first-parent master +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 +Merge: 9a6d494 c7a2ab9 +Author: A U Thor +Date: Mon Jun 26 00:04:00 2006 +0000 + + Merge branch 'side' into master + +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 +Author: A U Thor +Date: Mon Jun 26 00:02:00 2006 +0000 + + Third + +diff --git a/dir/sub b/dir/sub +index 8422d40..cead32e 100644 +--- a/dir/sub ++++ b/dir/sub +@@ -2,3 +2,5 @@ A + B + C + D ++E ++F +diff --git a/file1 b/file1 +new file mode 100644 +index 0000000..b1e6722 +--- /dev/null ++++ b/file1 +@@ -0,0 +1,3 @@ ++A ++B ++C + +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 +Author: A U Thor +Date: Mon Jun 26 00:01:00 2006 +0000 + + Second + + This is the second commit. + +diff --git a/dir/sub b/dir/sub +index 35d242b..8422d40 100644 +--- a/dir/sub ++++ b/dir/sub +@@ -1,2 +1,4 @@ + A + B ++C ++D +diff --git a/file0 b/file0 +index 01e79c3..b414108 100644 +--- a/file0 ++++ b/file0 +@@ -1,3 +1,6 @@ + 1 + 2 + 3 ++4 ++5 ++6 +diff --git a/file2 b/file2 +deleted file mode 100644 +index 01e79c3..0000000 +--- a/file2 ++++ /dev/null +@@ -1,3 +0,0 @@ +-1 +-2 +-3 + +commit 444ac553ac7612cc88969031b02b3767fb8a353a +Author: A U Thor +Date: Mon Jun 26 00:00:00 2006 +0000 + + Initial +$