Re: Proposal to deploy GitLab on

On Wed, May 17, 2017 at 02:21:55PM +0000, Zbigniew Jędrzejewski-Szmek wrote:
On Wed, May 17, 2017 at 01:49:21PM +0200, Sébastien Wilmet wrote:
By attaching a patch to a bugtracker ticket, we loose the information of
the parent commit: where the commit has been initially created in the
git history.
If the patch is created by git format-patch, it contains the hash of
the parent, so git knows the original parent.

I've already had the problem that git-bz apply fails (there was a
conflict), while git was able to resolve automatically the conflict when
rebasing the branch.
'git am -3' is the same as a rebase.

Thanks for correcting me. Indeed a patch created with `git format-patch`
includes the hashes of the parent objects. When using git-bz it hides a
little the use of git am, so I was not aware of all the possiblities of
git am. It's possible to configure the am.threeWay setting in git, by
default it's false.

But it doesn't seem easy (or even possible) with git am to create a
branch at the original place in the git history where the patches were
created. The parent *commit* is not known, only the parent objects. I
think it can be useful to know where the contributor has created the
commits. With a pull request workflow like in GitHub and GitLab, when we
fetch the branch we know the parent commit.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]