threads / patch / 38454

patchgit-gui: sort entries in tclIndex

Subject: [PATCH] git-gui: sort entries in tclIndex

## tl;dr

6 messages between Jan 26, 2015 and Oct 5, 2015. Diffs are folded; open one to read it.

replies: 5people: 3as markdown or json

Olaf Hering· Jan 26, 2015, 17:07 UTC · lore

ALL_LIBFILES uses wildcard, which provides the result in directory order. This order depends on the underlying filesystem on the buildhost. To get reproducible builds it is required to sort such list before using them.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 git-gui/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to git-gui/Makefile +1 −1

diff --git a/git-gui/Makefile b/git-gui/Makefile
index cde8b2e..7564a18 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -258,7 +258,7 @@ lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
 	 rm -f $@ ; \
 	 echo '# Autogenerated by git-gui Makefile' >$@ && \
 	 echo >>$@ && \
-	 $(foreach p,$(PRELOAD_FILES) $(ALL_LIBFILES),echo '$(subst lib/,,$p)' >>$@ &&) \
+	 $(foreach p,$(PRELOAD_FILES) $(sort $(ALL_LIBFILES)),echo '$(subst lib/,,$p)' >>$@ &&) \
 	 echo >>$@ ; \
 	fi

Olaf Hering· Feb 10, 2015, 15:18 UTC · re: Olaf Hering · lore

Re: [PATCH] git-gui: sort entries in tclIndex

Ping?

On Mon, Jan 26, Olaf Hering wrote:

Show 23 quoted lines

> ALL_LIBFILES uses wildcard, which provides the result in directory
> order. This order depends on the underlying filesystem on the
> buildhost. To get reproducible builds it is required to sort such list
> before using them.
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> ---
>  git-gui/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/git-gui/Makefile b/git-gui/Makefile
> index cde8b2e..7564a18 100644
> --- a/git-gui/Makefile
> +++ b/git-gui/Makefile
> @@ -258,7 +258,7 @@ lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
>  	 rm -f $@ ; \
>  	 echo '# Autogenerated by git-gui Makefile' >$@ && \
>  	 echo >>$@ && \
> -	 $(foreach p,$(PRELOAD_FILES) $(ALL_LIBFILES),echo '$(subst lib/,,$p)' >>$@ &&) \
> +	 $(foreach p,$(PRELOAD_FILES) $(sort $(ALL_LIBFILES)),echo '$(subst lib/,,$p)' >>$@ &&) \
>  	 echo >>$@ ; \
>  	fi
>

Olaf Hering· Apr 15, 2015, 07:22 UTC · re: Olaf Hering · lore

Re: [PATCH] git-gui: sort entries in tclIndex

Ping?

On Tue, Feb 10, Olaf Hering wrote:

Show 27 quoted lines

> Ping?
> 
> On Mon, Jan 26, Olaf Hering wrote:
> 
> > ALL_LIBFILES uses wildcard, which provides the result in directory
> > order. This order depends on the underlying filesystem on the
> > buildhost. To get reproducible builds it is required to sort such list
> > before using them.
> > 
> > Signed-off-by: Olaf Hering <olaf@aepfle.de>
> > ---
> >  git-gui/Makefile | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/git-gui/Makefile b/git-gui/Makefile
> > index cde8b2e..7564a18 100644
> > --- a/git-gui/Makefile
> > +++ b/git-gui/Makefile
> > @@ -258,7 +258,7 @@ lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
> >  	 rm -f $@ ; \
> >  	 echo '# Autogenerated by git-gui Makefile' >$@ && \
> >  	 echo >>$@ && \
> > -	 $(foreach p,$(PRELOAD_FILES) $(ALL_LIBFILES),echo '$(subst lib/,,$p)' >>$@ &&) \
> > +	 $(foreach p,$(PRELOAD_FILES) $(sort $(ALL_LIBFILES)),echo '$(subst lib/,,$p)' >>$@ &&) \
> >  	 echo >>$@ ; \
> >  	fi
> >

René Scharfe· Apr 25, 2015, 16:27 UTC · re: Olaf Hering · lore

Re: [PATCH] git-gui: sort entries in tclIndex

Looping in Pat (git-gui maintainer).

Am 15.04.2015 um 09:22 schrieb Olaf Hering:

Show 31 quoted lines

> Ping?
>
> On Tue, Feb 10, Olaf Hering wrote:
>
>> Ping?
>>
>> On Mon, Jan 26, Olaf Hering wrote:
>>
>>> ALL_LIBFILES uses wildcard, which provides the result in directory
>>> order. This order depends on the underlying filesystem on the
>>> buildhost. To get reproducible builds it is required to sort such list
>>> before using them.
>>>
>>> Signed-off-by: Olaf Hering <olaf@aepfle.de>
>>> ---
>>>   git-gui/Makefile | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/git-gui/Makefile b/git-gui/Makefile
>>> index cde8b2e..7564a18 100644
>>> --- a/git-gui/Makefile
>>> +++ b/git-gui/Makefile
>>> @@ -258,7 +258,7 @@ lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
>>>   	 rm -f $@ ; \
>>>   	 echo '# Autogenerated by git-gui Makefile' >$@ && \
>>>   	 echo >>$@ && \
>>> -	 $(foreach p,$(PRELOAD_FILES) $(ALL_LIBFILES),echo '$(subst lib/,,$p)' >>$@ &&) \
>>> +	 $(foreach p,$(PRELOAD_FILES) $(sort $(ALL_LIBFILES)),echo '$(subst lib/,,$p)' >>$@ &&) \
>>>   	 echo >>$@ ; \
>>>   	fi
>>>

Pat Thoyts· May 1, 2015, 14:57 UTC · re: René Scharfe · lore

Re: [PATCH] git-gui: sort entries in tclIndex

René Scharfe <l.s.r@web.de> writes:

Show 35 quoted lines

>Looping in Pat (git-gui maintainer).
>
>Am 15.04.2015 um 09:22 schrieb Olaf Hering:
>> Ping?
>>
>> On Tue, Feb 10, Olaf Hering wrote:
>>
>>> Ping?
>>>
>>> On Mon, Jan 26, Olaf Hering wrote:
>>>
>>>> ALL_LIBFILES uses wildcard, which provides the result in directory
>>>> order. This order depends on the underlying filesystem on the
>>>> buildhost. To get reproducible builds it is required to sort such list
>>>> before using them.
>>>>
>>>> Signed-off-by: Olaf Hering <olaf@aepfle.de>
>>>> ---
>>>>   git-gui/Makefile | 2 +-
>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/git-gui/Makefile b/git-gui/Makefile
>>>> index cde8b2e..7564a18 100644
>>>> --- a/git-gui/Makefile
>>>> +++ b/git-gui/Makefile
>>>> @@ -258,7 +258,7 @@ lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
>>>>   	 rm -f $@ ; \
>>>>   	 echo '# Autogenerated by git-gui Makefile' >$@ && \
>>>>   	 echo >>$@ && \
>>>> -	 $(foreach p,$(PRELOAD_FILES) $(ALL_LIBFILES),echo '$(subst lib/,,$p)' >>$@ &&) \
>>>> +	 $(foreach p,$(PRELOAD_FILES) $(sort $(ALL_LIBFILES)),echo '$(subst lib/,,$p)' >>$@ &&) \
>>>>   	 echo >>$@ ; \
>>>>   	fi
>>>>
>

Applied. Thank you.

-- 
Pat Thoyts                            http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97  10 CE 11 E6 04 E0 B9 DD

Olaf Hering· Oct 5, 2015, 07:43 UTC · re: Pat Thoyts · lore

Re: [PATCH] git-gui: sort entries in tclIndex

To which branch was this applied? Its still broken in git-2.6.0.

Olaf

On Fri, May 01, Pat Thoyts wrote:

Show 39 quoted lines

> René Scharfe <l.s.r@web.de> writes:
> 
> >Looping in Pat (git-gui maintainer).
> >
> >Am 15.04.2015 um 09:22 schrieb Olaf Hering:
> >> Ping?
> >>
> >> On Tue, Feb 10, Olaf Hering wrote:
> >>
> >>> Ping?
> >>>
> >>> On Mon, Jan 26, Olaf Hering wrote:
> >>>
> >>>> ALL_LIBFILES uses wildcard, which provides the result in directory
> >>>> order. This order depends on the underlying filesystem on the
> >>>> buildhost. To get reproducible builds it is required to sort such list
> >>>> before using them.
> >>>>
> >>>> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> >>>> ---
> >>>>   git-gui/Makefile | 2 +-
> >>>>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>>>
> >>>> diff --git a/git-gui/Makefile b/git-gui/Makefile
> >>>> index cde8b2e..7564a18 100644
> >>>> --- a/git-gui/Makefile
> >>>> +++ b/git-gui/Makefile
> >>>> @@ -258,7 +258,7 @@ lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
> >>>>   	 rm -f $@ ; \
> >>>>   	 echo '# Autogenerated by git-gui Makefile' >$@ && \
> >>>>   	 echo >>$@ && \
> >>>> -	 $(foreach p,$(PRELOAD_FILES) $(ALL_LIBFILES),echo '$(subst lib/,,$p)' >>$@ &&) \
> >>>> +	 $(foreach p,$(PRELOAD_FILES) $(sort $(ALL_LIBFILES)),echo '$(subst lib/,,$p)' >>$@ &&) \
> >>>>   	 echo >>$@ ; \
> >>>>   	fi
> >>>>
> >
> 
> Applied. Thank you.