From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id CMotCgZdwmOAQAEAbAwnHQ (envelope-from ) for ; Sat, 14 Jan 2023 08:43:02 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id iA4tCgZdwmNGYQEA9RJhRA (envelope-from ) for ; Sat, 14 Jan 2023 08:43:02 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 00C2ADA33 for ; Sat, 14 Jan 2023 08:43:01 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGbB1-0004Oy-2o; Sat, 14 Jan 2023 02:42:07 -0500 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 1pGbAz-0004Op-Mq for emacs-orgmode@gnu.org; Sat, 14 Jan 2023 02:42:05 -0500 Received: from ciao.gmane.io ([116.202.254.214]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGbAy-0000ac-5B for emacs-orgmode@gnu.org; Sat, 14 Jan 2023 02:42:05 -0500 Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1pGbAw-0001Do-A5 for emacs-orgmode@gnu.org; Sat, 14 Jan 2023 08:42:02 +0100 X-Injected-Via-Gmane: http://gmane.org/ To: emacs-orgmode@gnu.org From: Max Nikulin Subject: Re: ob-shell intentions and paperwork (was Bash results broken?) Date: Sat, 14 Jan 2023 14:41:53 +0700 Message-ID: References: <1853354beb4.fce54d8d902653.6359367327256505471@excalamus.com> <18555580d75.d7b471f9370716.1497263973038999899@excalamus.com> <87edsiv54k.fsf@localhost> <18561866f8c.f22a62b3866025.8634474263936272339@excalamus.com> <185645af285.f16730c9981316.8238066002530458068@excalamus.com> <87zgb38x0v.fsf@localhost> <1856fc2c9c4.d213558d30469.8133539665325553154@excalamus.com> <87a631mfoh.fsf@localhost> <185735abcf4.b0102402156950.2510703238208758946@excalamus.com> <875ydnki3a.fsf@localhost> <18577b7fcbe.dfdb6dda342902.3241742984579519702@excalamus.com> <87lemhff2l.fsf@localhost> <87o7rdqlar.fsf@gnu.org> <1859984c802.106237dc2574863.4454761455185125920@excalamus.com> <87zgape18a.fsf@localhost> <185a19ff424.d7f83d9b1104611.2590624521284135337@excalamus.com> <87v8ldatsd.fsf@localhost> <87zgam6ajb.fsf@localhost> <185abb5b818.e62e34bf237775.1769937375646458314@excalamus.com> <87pmbi5ugn.fsf@localhost> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Content-Language: en-US In-Reply-To: <87pmbi5ugn.fsf@localhost> Received-SPF: pass client-ip=116.202.254.214; envelope-from=geo-emacs-orgmode@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: 27 X-Spam_score: 2.7 X-Spam_bar: ++ X-Spam_report: (2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FORGED_MUA_MOZILLA=2.309, FREEMAIL_FORGED_FROMDOMAIN=0.092, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-0.001, NML_ADSP_CUSTOM_MED=0.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1673682182; a=rsa-sha256; cv=none; b=u7Dk1Qq+ZcycsgshvnFTszmCbrQ72bSi4QA5hTSLDrbIzI00c598un8khgHiytQrFf4ESk A2+KU34iohxYYXVZCh7S6W1eKxqI59DBkl0kgmId3BFPq/l+ZlLujZZKQqiIFy58Ax5IXJ wL6RiGdKdFfmMEopA8WQ9evMsWlfwAYkR1Czmt6o/g+QRjzg2DJ7CKu/69Wkf4q3dLFYO8 muLCHLNEAxGqKUdF+q1y+n9+6iNlY5DQfDRlPWAyll69wSphjb1f7VyrZFHxkhcJC4FmS/ CLhuRmw8IKm4joMWJEmeKLzF5CQOXfFjYIl7T1KmYY1nskzW+FgXN14PsSCveA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673682182; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=uUSVDPK+PORyIIPr/m6+FiSlzkBDoCW/IcrdfnaN/L8=; b=XInG9963HAFA+z7lnwvgtRWHTQiX599RIzJgDJKPSe4QDzYn7ATpQGpKAwUdecdN+ml795 DiDyE6wlssVzceXRjzcI4gSfKQTt91liewVeHFLunV7URpp3bfYpW3OfzdG32tV8Wj+c06 78c3RuN2HA0jRNlKU8RHWP28gKuTCfVIERXMwXshKGLixE/QeIS9T64tg9XNbZhorZk24U 4O/rGlSlhOBWI1KZNZqC9XdTW5OQaHF5ko//lkvyBDQdH21uTKGfty8yCg5IMHCarEq/cc mRV0siB7+EVPv7ck9LfCH6UVxHjCD6K9oSwj5ggEYtHsUw2YgmeLrKDDqg0ghw== X-Migadu-Queue-Id: 00C2ADA33 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none) X-Migadu-Spam-Score: -2.81 X-Spam-Score: -2.81 X-TUID: AaL729XZWE6P On 13/01/2023 22:23, Ihor Radchenko wrote: > Matt writes: > >> Would you like me to correct how I've incorporated my changes? > > No. I was referring to the initial situation with a single commit being > displayed. > > I am not sure what Max was trying to point out. Look at the commit message for https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=4f319088ba5f11d4b6adf808f39f11dfa52c08e4 > Merge branch 'ob-shell-cleanup-tests' It suggests that this is a merge commit for a local branch. Notice that the commit has 2 parents: > committer Matthew Trzcinski 2023-01-11 11:16:53 -0500 > parent 07c63df9c7f40b17acb5c517baa0d321098f31da (diff) > parent 9ed2821053cf7b0c2f02fe941a54e1d3a9837aeb (diff) Second one: https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=9ed2821053cf7b0c2f02fe941a54e1d3a9837aeb author Matt Trzcinski 2022-12-30 13:03:59 -0500 committer Matt Trzcinski 2022-12-31 13:56:27 -0500 test-ob-shell.el: Organize tests And changes made by this commit are included into diff shown for the merge commit 4f319088ba by cgit. E.g. gitk for local repository does not show any changes for the merge commit. So Matt did not squashed commits before committing to the main branch and detailed commit messages are preserved. That is why I do not consider cgit render as a strong enough reason for reverting. However I would prefer linear commit history when possible, so I suggest to do the following in similar cases (not verified, may have typos) git fetch # get latest commits git checkout ob-shell-cleanup-tests git rebase origin/main git checkout main git pull git merge --ff-only ob-shell-cleanup-tests (Omit --ff-only if it is real merge because the fix is committed to the bugfix branch.) It should help to avoid confusion and to make git archeology easier.