From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Kai Tetzlaff Newsgroups: gmane.emacs.bugs Subject: bug#54154: Emacs commit ae963e80a79f5a9184daabfc8197f211a39b136d (sieve-manage) Date: Mon, 23 Jan 2023 18:07:12 +0100 Message-ID: <87pmb5qiwv.fsf@tetzco.de> References: <874jsngod2.fsf@tetzco.de> <83tu0nynla.fsf@gnu.org> <873586d7ii.fsf@tetzco.de> <834jsmpqf9.fsf@gnu.org> <87bkmua51z.fsf@tetzco.de> <83v8l2o212.fsf@gnu.org> <878rhut6aq.fsf@tetzco.de> <87ilgxs8vl.fsf@tetzco.de> <878rhts69s.fsf@tetzco.de> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23415"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: larsi@gnus.org, "Herbert J. Skuhra" , 54154@debbugs.gnu.org, Eli Zaretskii To: Andreas Schwab Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jan 23 18:08:22 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pK0Iw-0005qg-BP for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 23 Jan 2023 18:08:22 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pK0Ie-0001er-NA; Mon, 23 Jan 2023 12:08:04 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pK0Ic-0001eL-Lr for bug-gnu-emacs@gnu.org; Mon, 23 Jan 2023 12:08:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pK0Ic-0002ja-98 for bug-gnu-emacs@gnu.org; Mon, 23 Jan 2023 12:08:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pK0Ib-0006v5-Tn for bug-gnu-emacs@gnu.org; Mon, 23 Jan 2023 12:08:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Kai Tetzlaff Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 23 Jan 2023 17:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54154 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 54154-submit@debbugs.gnu.org id=B54154.167449364426552 (code B ref 54154); Mon, 23 Jan 2023 17:08:01 +0000 Original-Received: (at 54154) by debbugs.gnu.org; 23 Jan 2023 17:07:24 +0000 Original-Received: from localhost ([127.0.0.1]:55229 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pK0Hz-0006uC-Is for submit@debbugs.gnu.org; Mon, 23 Jan 2023 12:07:23 -0500 Original-Received: from mx2.tetzco.de ([152.67.86.91]:53459) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pK0Hx-0006ty-O8 for 54154@debbugs.gnu.org; Mon, 23 Jan 2023 12:07:22 -0500 Original-Received: from mail.tetzco.de (unknown [IPv6:2a02:810d:1380:7900::9]) (Authenticated sender: relay@tetzco.de) by mx2.tetzco.de (Postfix) with ESMTPSA id 8E1CBBD078; Mon, 23 Jan 2023 18:07:13 +0100 (CET) Original-Received: from moka (moka.tetzco.de [172.30.42.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kai@tetzco.de) by mail.tetzco.de (Postfix) with ESMTPSA id 4E4CC6C00B2; Mon, 23 Jan 2023 18:27:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tetzco.de; s=20210624; t=1674494831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=f+H4Dp2BceNf89/neONUuZ1PTTHO3HV2c4AkofWXnkE=; b=GdxtEgYSEFjWWXqJdaRlccCAUCLjfeTZt19M/Ztj7lPXeOw+IcTUthzG3l1UzrhVhdNN07 p72y/+VmOA4jigekBfdmEUi3buRZtjGEMdRjo6Xe1yEl2nU3p4WC0eP4tA41st44Si0qT4 aKilNxtLxk7Z2792TUcvA+BsEJx1qJd1d8TjUQexVALHUXN4IpojYoe6R28iHN8o53ppG+ pfTWdstGZjGes3QgeWBQ784/hckwiGvJd86iCqp8xghxS16oTl9URRbBzcnZtYz0OARBtH wCRAEm2yNX2ORh9bkvrgmLYbrIML4letyuFVgq0F8JOHKTGynI5D4rOK7WTFNUNEQmv+e+ aGJzKtUwe1BWqq7NZNqXCwXk/yuR/KolDI0fp62A+PIaxrY4XFAjIXr4xVlS+vGjdMWRci 5EUK3n/UEBZihbhhCf7ExZsRaavT9rx2ZYuEL2nt1EGyYcgVu9vFTApBf8IfOEbY2r3/iO UVtnNLF4IpIx2jfQbmCztWund+/hv45XBjd5YZ9uHGY8tq76exQ2yvAuwBdqBEx In-Reply-To: (Andreas Schwab's message of "Mon, 23 Jan 2023 15:27:49 +0100") X-Rspamd-Server: rakaposhi X-Rspamd-Queue-Id: 4E4CC6C00B2 X-Rspamd-Action: no action X-Spamd-Result: default: False [-6.83 / 30.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM(-3.00)[-1.000]; GENERIC_REPUTATION(-0.73)[-0.72664503195413]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[tetzco.de:s=20210624]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TAGGED_FROM(0.00)[bug]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:254017 Archived-At: Andreas Schwab writes: > On Jan 23 2023, Kai Tetzlaff wrote: > >> And I learned something about git again. `git log --grep ...` apparently >> silently ignores my origin/master ref and greps through all available >> refs. > > It searches through all commit messages that you would see without the > --grep option. And right again. This really stumped me. So after some investigation on my part, here's where my confusion originated. To check git logs, I typically use an alias (l2) which adds the `--graph` option to git log. And `git log --pretty=oneline --graph` then actually results in: ... | * 0d3b6518e39a28774e4e70ed9bb7ef4aa009c0cf (ruby-ts--indent-rules): Indent inside empty parens properly | * 7fb69ce233b8a655af63d4c47b7359c43660acf6 (emacs-29) ; * doc/emacs/modes.texi (Choosing Modes): Add index entries. * | ede5e82418a0b8cfce2bf96b2a3255ca86b65000 ; Merge from origin/emacs-29 |\| | * 12d7670b90f66f1d45a8c69d9acfc25238a65b02 Fix bug in 'sieve-manage--append-to-log' * | e9ceeee1198aa10cac3cd61ff9537b64640455c2 Merge from origin/emacs-29 |\| | * 21be03cccb611ea9e6c73fb04e578c48edf49a25 CC Mode: Prevent two classes of "type" prematurely entering c-found-types * | 117f90865adca03eab84778db0370ddc05ba8ae7 Add new command `kill-matching-buffers-no-ask' (bug#60714) ... Which seems to indicate that commit 12d7670b90f66f1d45a8c69d9acfc25238a65b02 Fix bug in 'sieve-manage--append-to-log' has been merged to master. However, here's the actual merge commit: $ git log --patch -1 ede5e82418a0b8cfce2bf96b2a3255ca86b65000 commit ede5e82418a0b8cfce2bf96b2a3255ca86b65000 Merge: e9ceeee1198 12d7670b90f Author: Stefan Kangas Date: 2023-01-20 11:30:22 +0100 ; Merge from origin/emacs-29 The following commit was skipped: 12d7670b90f Fix bug in 'sieve-manage--append-to-log' That's it. I.e. it is completely empty because the only commit which was actually (supposed to be) merged was then just skipped. I guess that this is needed for git to recognize that the commit was purposely skipped (so that git will not include it in subsequent merges). So, as ever so often, the problem was sitting in front of the monitor. I must admit that I still find this behaviour surprising/unexpected. But good to know! Beware of `git log --graph` ... BR, Kai