[PATCH 1/2] transport: Free leaking head in transport_print_push_status

[PATCH 1/2] transport: Free leaking head in transport_print_push_status

[Stefan Beller]

From: Stefan Beller <sbeller@google.com>

Found by scan.coverity.com (ID: 1248110)

Signed-off-by: Stefan Beller <sbeller@google.com>
---
 transport.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/transport.c b/transport.c
index 055d2a2..fbab6ee 100644
--- a/transport.c
+++ b/transport.c
@@ -774,6 +774,7 @@ void transport_print_push_status(const char *dest, struct ref *refs,
 			*reject_reasons |= REJECT_NEEDS_FORCE;
 		}
 	}
+	free(head);
 }
 
 void transport_verify_remote_names(int nr_heads, const char **heads)
-- 
2.1.2.332.g8071e93

[PATCH 2/2] .mailmap: Add Stefan Bellers corporate mail address

[Stefan Beller]

From: Stefan Beller <sbeller@google.com>

Note that despite the private address being first, Google owns the
copyright on this patch as any other patch I'll be sending signed off
by the sbeller@google.com address.

Signed-off-by: Stefan Beller <sbeller@google.com>
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 8aefb5a..bb6f52e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -205,6 +205,7 @@ Shawn O. Pearce <spearce@spearce.org>
 Simon Hausmann <hausmann@kde.org> <simon@lst.de>
 Simon Hausmann <hausmann@kde.org> <shausman@trolltech.com>
 Stefan Beller <stefanbeller@gmail.com> <stefanbeller@googlemail.com>
+Stefan Beller <stefanbeller@gmail.com> <sbeller@google.com>
 Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@atlas-elektronik.com>
 Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@googlemail.com>
 Stefan Sperling <stsp@elego.de> <stsp@stsp.name>
-- 
2.1.2.332.g8071e93

Re: [PATCH 2/2] .mailmap: Add Stefan Bellers corporate mail address

[Junio C Hamano]

Stefan Beller <stefanbeller@gmail.com> writes:

> From: Stefan Beller <sbeller@google.com>
>
> Note that despite the private address being first, Google owns the
> copyright on this patch as any other patch I'll be sending signed off
> by the sbeller@google.com address.

While Googlers are encouraged to interact with external open source
projects using their corp address when working as new contributors,
Googlers are also encouraged to keep using the same pre-corp address
when working with projects they have been part of for continuity.

After all, even if you send patches from your @gmail.com address
while being employed by Google, the patches are copyright Google,
not yours, and DCO (a) "I have the right to submit" covers your
submissions just fine (i.e. it does not say "I own the copyright"),
as long as you are cleared to contribute your patches to us by
Google's open source office (which I happen to know that you have
already done).

The mailmap is primarily to correct past mistakes and document the
new addresses of those who lost the old address to maintain their
reachability.  It is not about planning to send patches from two
different addresses chosen by the phase of the moon or something.

I do not terribly mind, but is this patch really necessary?

>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/.mailmap b/.mailmap
> index 8aefb5a..bb6f52e 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -205,6 +205,7 @@ Shawn O. Pearce <spearce@spearce.org>
>  Simon Hausmann <hausmann@kde.org> <simon@lst.de>
>  Simon Hausmann <hausmann@kde.org> <shausman@trolltech.com>
>  Stefan Beller <stefanbeller@gmail.com> <stefanbeller@googlemail.com>
> +Stefan Beller <stefanbeller@gmail.com> <sbeller@google.com>
>  Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@atlas-elektronik.com>
>  Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@googlemail.com>
>  Stefan Sperling <stsp@elego.de> <stsp@stsp.name>

Re: [PATCH 2/2] .mailmap: Add Stefan Bellers corporate mail address

[Junio C Hamano]

Stefan Beller <sbeller@google.com> writes:

> If you want me to continue using my gmail address, please check the
> authorship
> from the previous patch ([PATCH 1/2] transport: Free leaking head in
> transport_print_push_status)
> and remove the "From: Stefan Beller <sbeller@google.com>" line,
> so we don't end up needing this patch.

As I said, I do not care too deeply either way.  If you feel that
switching to a different e-mail address to sign off your patches
from now on until your employment is terminated has merit to the
project, that's fine by me.

Thanks.