Re: Proposal to deploy GitLab on gnome.org

2017-09-25 Thread Zbigniew Jędrzejewski-Szmek
On Mon, Sep 25, 2017 at 09:03:00PM +0200, Tobias Mueller wrote:
> Hi.
> 
> On Mi, 2017-05-17 at 14:21 +, 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 couldn't find the hash of the parent commit in my git format-patch
> exported patch, e.g. https://bug778584.bugzilla-attachments.gnome.org/a
> ttachment.cgi?id=345698.
> Do I need to do anything special in order to export the parent also?
> The man page for git-format-patch does not show anything useful for
> "parent".

Any patch formatted by git format will things like this:

diff --git a/file.c b/file.c
index e14a869321..0a8628c26a 100644
--- a/file.c
+++ b/file.c
@@ -847,7 +847,6 @@ int function_name(

Where e14a869321 is the old version of the file, and 0a8628c26a is the
new one. This allows git to see the evolution of the file from e14a869321
to the one in HEAD. (I shouldn't have said "hash of the parent", since
it's the "hash of the version of the file that a hunk of the patch was
based on".)

Zbyszek
___
desktop-devel-list mailing list
desktop-devel-list@gnome.org
https://mail.gnome.org/mailman/listinfo/desktop-devel-list

Re: Proposal to deploy GitLab on gnome.org

2017-09-25 Thread Sébastien Wilmet
On Mon, Sep 25, 2017 at 09:03:00PM +0200, Tobias Mueller wrote:
> On Mi, 2017-05-17 at 14:21 +, 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 couldn't find the hash of the parent commit in my git format-patch
> exported patch, e.g. https://bug778584.bugzilla-attachments.gnome.org/a
> ttachment.cgi?id=345698.
> Do I need to do anything special in order to export the parent also?
> The man page for git-format-patch does not show anything useful for
> "parent".

It contains the hashes of the parent *objects*: typically it refers to
the last time that the file was modified.

But a patch often depends on more recent changes made in *other* files,
for example when calling a function of another class that was recently
implemented or changed.

So there is a loss of information when creating a patch with git
format-patch, at least with the default parameters.

--
Sébastien
___
desktop-devel-list mailing list
desktop-devel-list@gnome.org
https://mail.gnome.org/mailman/listinfo/desktop-devel-list

Re: Proposal to deploy GitLab on gnome.org

2017-09-25 Thread Tobias Mueller
Hi.

On Mi, 2017-05-17 at 14:21 +, 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 couldn't find the hash of the parent commit in my git format-patch
exported patch, e.g. https://bug778584.bugzilla-attachments.gnome.org/a
ttachment.cgi?id=345698.
Do I need to do anything special in order to export the parent also?
The man page for git-format-patch does not show anything useful for
"parent".

Cheers,
  Tobi
___
desktop-devel-list mailing list
desktop-devel-list@gnome.org
https://mail.gnome.org/mailman/listinfo/desktop-devel-list