From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <emacs-orgmode-bounces+larch=yhetil.org@gnu.org>
Received: from mp12.migadu.com ([2001:41d0:8:6d80::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms5.migadu.com with LMTPS
	id kHfTBnGFwmNdNwAAbAwnHQ
	(envelope-from <emacs-orgmode-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sat, 14 Jan 2023 11:35:29 +0100
Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp12.migadu.com with LMTPS
	id GIiVBnGFwmM/3QAAauVa8A
	(envelope-from <emacs-orgmode-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sat, 14 Jan 2023 11:35:29 +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 9BCE423F7F
	for <larch@yhetil.org>; Sat, 14 Jan 2023 11:35:28 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <emacs-orgmode-bounces@gnu.org>)
	id 1pGds6-0006fS-HN; Sat, 14 Jan 2023 05:34:46 -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 <yantar92@posteo.net>)
 id 1pGds5-0006f3-2I
 for emacs-orgmode@gnu.org; Sat, 14 Jan 2023 05:34:45 -0500
Received: from mout01.posteo.de ([185.67.36.65])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <yantar92@posteo.net>)
 id 1pGds3-0004Vb-C8
 for emacs-orgmode@gnu.org; Sat, 14 Jan 2023 05:34:44 -0500
Received: from submission (posteo.de [185.67.36.169]) 
 by mout01.posteo.de (Postfix) with ESMTPS id 278EB240063
 for <emacs-orgmode@gnu.org>; Sat, 14 Jan 2023 11:34:42 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017;
 t=1673692482; bh=x7ekt7Pqmh4K+4ZAiQ/GDYyl5raWosTMLGqSyyBJ5As=;
 h=From:To:Cc:Subject:Date:From;
 b=a8shCU7bdqK3Nn1igJSN82qvQf98Ja2PkiunVxMJgj/40qWKZSdSZW2vX7E2o0vuh
 Hd2GZUq9GtKQiLx3f59JktehIS7Y4CzGEdvJVvlOnDHK4z+tjOHGwcv/OXitkd9eOC
 S+IoLAWgq82H/+V5JxueQHYn1XYCr//592tnRsH9Toh7KHQtw0fYKeEgsP8JfpcYgk
 8O1Aj2dHtruH6UecPK6G29Xh3+C6IY+NVbqS9S3l6B+WdXcLccLXABYJw2o7d1LdKp
 IVqxI25h+sfybfxV7fHhme8LY9dy9fg9xKiPOE4r3wyPh8Dmd2xzmMZg7dnHkCqAf5
 jW+K986Xu0FFQ==
Received: from customer (localhost [127.0.0.1])
 by submission (posteo.de) with ESMTPSA id 4NvF5s3VGXz6tm6;
 Sat, 14 Jan 2023 11:34:41 +0100 (CET)
From: Ihor Radchenko <yantar92@posteo.net>
To: Max Nikulin <manikulin@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: ob-shell intentions and paperwork (was Bash results broken?)
In-Reply-To: <tptmc2$3vs$1@ciao.gmane.io>
References: <m2tu1v8gj8.fsf@me.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> <tpp69m$pt$1@ciao.gmane.io>
 <87zgam6ajb.fsf@localhost>
 <185abb5b818.e62e34bf237775.1769937375646458314@excalamus.com>
 <87pmbi5ugn.fsf@localhost> <tptmc2$3vs$1@ciao.gmane.io>
Date: Sat, 14 Jan 2023 10:35:11 +0000
Message-ID: <871qnx2ylc.fsf@localhost>
MIME-Version: 1.0
Content-Type: text/plain
Received-SPF: pass client-ip=185.67.36.65; envelope-from=yantar92@posteo.net;
 helo=mout01.posteo.de
X-Spam_score_int: -43
X-Spam_score: -4.4
X-Spam_bar: ----
X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham 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." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
 <mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
 <mailto:emacs-orgmode-request@gnu.org?subject=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-Seal: i=1; s=key1; d=yhetil.org; t=1673692529; a=rsa-sha256; cv=none;
	b=CObZkBFM0yIf9PZTkrltuIuLsQWox/zXWi7BImKjDiSutOzw9e15gu9rlVb1VEqXucQb60
	WkWJkv5g9U2uIxTRSrv91hXzgumOyhhPD7XadJ5Bx9wriUlRwT5opxhmeXlORxdaRgxPo+
	B1O6ZDMVbRo52E2dxLqe4+C78/UsvAGWa3oGnnkEpLTzMpCJ2afU12YHjLyOmp+4k2X0xf
	okJ1aG3sQVZfGLT6HDiDZ20q+WtcecWryPpYgwTnt+VVJBJn1L2QpDwH4p6DRrE8jE+X+F
	qwK92DGyKZlPyZtKJAIBhRMTSgBIPWGGCC4ITy8PhlCht8wU2kI1hl6jR3iROQ==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=posteo.net header.s=2017 header.b=a8shCU7b;
	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=pass (policy=none) header.from=posteo.net
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1673692529;
	h=from:from:sender:sender: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:list-id:list-help:list-unsubscribe:
	 list-subscribe:list-post:dkim-signature;
	bh=HXyueYFJmV7CI2oRsAXtya1vluRu9sDgk964kIy/Y10=;
	b=DLXE1M17jVnJVb6jVRELgOfUUMPG5RrzHcpQ+Eex8i+C8ODDmCm23TCDD0l3S9CmOyyl2x
	GmBsL962ucYBWiBWtd6fzHPksF51+dA1rKpkGk6cWrXh+RMgHGkW7HSh3qiqll0BMMA+uv
	NZICNK9Kpt18morP99QpUQTzzG1zu2RZy36adENvOzY8Avr68JkRrIYmzKeTcTLmEmymvy
	GoUv6KnCh4g7HT6VY2a/6BRBZ9qu8jClaNidCnavaHONNQfEJ3n5PcuqmLjV2Eo+U7/wjP
	ZrPCmx7Rz8YSFBKdlk2IU3tT8nBfE/T+thC/3tY2WxmJh0Hy3CSQcuSNVeB0fg==
X-Migadu-Spam-Score: -6.05
X-Spam-Score: -6.05
X-Migadu-Queue-Id: 9BCE423F7F
X-Migadu-Scanner: scn1.migadu.com
Authentication-Results: aspmx1.migadu.com;
	dkim=pass header.d=posteo.net header.s=2017 header.b=a8shCU7b;
	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=pass (policy=none) header.from=posteo.net
X-TUID: 8m8NZl8EMh82

Max Nikulin <manikulin@gmail.com> writes:

> 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.

Should we then report a bug to cgit mailing list?

> 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.

Sure. Using rebase for merging and pulling is generally a good idea.

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>