Re: ob-shell intentions and paperwork (was Bash results broken?)

[Max Nikulin]

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.