diff mbox

support/download: support git older then 1.8.x

Message ID 1469653038-64643-1-git-send-email-matthew.weber@rockwellcollins.com
State Rejected
Headers show

Commit Message

Matt Weber July 27, 2016, 8:57 p.m. UTC
A recent commit[1] in the git downloader uses the "--no-patch" option,
which appeared on git 1.8.4. Systems with older git versions show an
error and fall back to the wget downloader, which isn't suitable for
all the cases.

This commit uses a "git log" variant and works on older systems.

[1]
https://github.com/buildroot/buildroot/commit/3abd5ba4243489b821d44e407528020cd8a138f8#diff-75410bcfefacf16bcd60a2a6ac77c433R73

Signed-off-by: Enrique Ocana Gonzalez <eocanha@igalia.com>
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
---
 support/download/git | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Yann E. MORIN July 27, 2016, 9:47 p.m. UTC | #1
Matt, All,

Nit-pick: since you applied Enrique's patch, you should probably have
used him as author.

On 2016-07-27 15:57 -0500, Matt Weber spake thusly:
> A recent commit[1] in the git downloader uses the "--no-patch" option,
> which appeared on git 1.8.4. Systems with older git versions show an
> error and fall back to the wget downloader, which isn't suitable for
> all the cases.
> 
> This commit uses a "git log" variant and works on older systems.
> 
> [1]
> https://github.com/buildroot/buildroot/commit/3abd5ba4243489b821d44e407528020cd8a138f8#diff-75410bcfefacf16bcd60a2a6ac77c433R73
> 
> Signed-off-by: Enrique Ocana Gonzalez <eocanha@igalia.com>

Beside, you can't go adding a SoB-line for someone else. A SoB-line is
kinda legaly-binding:

    http://developercertificate.org/

Enrique, if you agree that your SoB-line is warranted, we can go the
fast route: just reply to the original mail with your own SoB-line, and
all will be good in the best of the worlds! ;-)

> Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
> ---
>  support/download/git | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/support/download/git b/support/download/git
> index 663006b..416cd1b 100755
> --- a/support/download/git
> +++ b/support/download/git
> @@ -76,7 +76,7 @@ _git checkout -q "'${cset}'"
>  
>  # Get date of commit to generate a reproducible archive.
>  # %cD is RFC2822, so it's fully qualified, with TZ and all.
> -date="$( _git show --no-patch --pretty=format:%cD )"
> +date="$( _git log -1 --pretty=format:%cD )"

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

>  # There might be submodules, so fetch them.
>  if [ ${recurse} -eq 1 ]; then
> -- 
> 1.9.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Enrique Ocaña González July 28, 2016, 8:48 a.m. UTC | #2
El miércoles, 27 de julio de 2016 23:47:55 (CEST) Yann E. MORIN escribió:

> Enrique, if you agree that your SoB-line is warranted, we can go the
> fast route: just reply to the original mail with your own SoB-line, and
> all will be good in the best of the worlds! ;-)

I tried to send the patch to the list yesterday (before Matt's submission) but 
the email got bounced because I wasn't subscribed to the list. I've subscribed 
today and resent the patch which got originally bounced.

Cheers.
Matt Weber July 28, 2016, 11:47 a.m. UTC | #3
On Jul 28, 2016 3:49 AM, "Enrique Ocaña González" <eocanha@igalia.com>
wrote:
>
> El miércoles, 27 de julio de 2016 23:47:55 (CEST) Yann E. MORIN escribió:
>
> > Enrique, if you agree that your SoB-line is warranted, we can go the
> > fast route: just reply to the original mail with your own SoB-line, and
> > all will be good in the best of the worlds! ;-)
>
> I tried to send the patch to the list yesterday (before Matt's
submission) but
> the email got bounced because I wasn't subscribed to the list. I've
subscribed
> today and resent the patch which got originally bounced.

Sounds Good, I'll mark mine as rejected and review yours.

>
> Cheers.
>
> --
> Enrique Ocaña González
diff mbox

Patch

diff --git a/support/download/git b/support/download/git
index 663006b..416cd1b 100755
--- a/support/download/git
+++ b/support/download/git
@@ -76,7 +76,7 @@  _git checkout -q "'${cset}'"
 
 # Get date of commit to generate a reproducible archive.
 # %cD is RFC2822, so it's fully qualified, with TZ and all.
-date="$( _git show --no-patch --pretty=format:%cD )"
+date="$( _git log -1 --pretty=format:%cD )"
 
 # There might be submodules, so fetch them.
 if [ ${recurse} -eq 1 ]; then