threads / discuss / 23278

[PATCHv5 1/6] Gitweb: add ignore and clean rules for minified files

Subject: [PATCHv5 1/6] Gitweb: add ignore and clean rules for minified files

## tl;dr

3 messages between Apr 1, 2010 and Apr 1, 2010.

replies: 2people: 3as markdown or json

Mark Rada· Apr 1, 2010, 05:35 UTC · lore
Signed-off-by: Mark Rada <marada@uwaterloo.ca>
---
	No changes since the previous version.
 .gitignore |    1 +
 Makefile   |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7b3acb7..4c24152 100644
--- a/.gitignore
+++ b/.gitignore
@@ -156,6 +156,7 @@
 /git-core-*/?*
 /gitk-git/gitk-wish
 /gitweb/gitweb.cgi
+/gitweb/gitweb.min.*
 /test-chmtime
 /test-ctype
 /test-date
diff --git a/Makefile b/Makefile
index 6d73a8c..5384d33 100644
--- a/Makefile
+++ b/Makefile
@@ -2089,7 +2089,7 @@ clean:
 	$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
 	$(MAKE) -C Documentation/ clean
 ifndef NO_PERL
-	$(RM) gitweb/gitweb.cgi
+	$(RM) gitweb/gitweb.{cgi,min.*}
 	$(MAKE) -C perl clean
 endif
 ifndef NO_PYTHON

-- 
1.7.0.3.436.g45b2d
Jakub Narebski· Apr 1, 2010, 08:24 UTC · re: Mark Rada · lore

Re: [PATCHv5 1/6] Gitweb: add ignore and clean rules for minified files

On Thu, 1 April 2010, Mark Rada wrote:
> Signed-off-by: Mark Rada <marada@uwaterloo.ca>
For what it's worth:
Acked-by: Jakub Narebski <jnareb@gmail.com>
Show 12 quoted lines
> diff --git a/Makefile b/Makefile
> index 6d73a8c..5384d33 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2089,7 +2089,7 @@ clean:
>  	$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
>  	$(MAKE) -C Documentation/ clean
>  ifndef NO_PERL
> -	$(RM) gitweb/gitweb.cgi
> +	$(RM) gitweb/gitweb.{cgi,min.*}
>  	$(MAKE) -C perl clean
>  endif

Minor nit: this would be first line that uses {a,b} shell glob construct. Why not write it as:

  -	$(RM) gitweb/gitweb.cgi
  +	$(RM) gitweb/gitweb.cgi gitweb/gitweb.min.*
-- 
Jakub Narebski
Poland
Junio C Hamano· Apr 1, 2010, 21:26 UTC · re: Jakub Narebski · lore

Re: [PATCHv5 1/6] Gitweb: add ignore and clean rules for minified files

Jakub Narebski <jnareb@gmail.com> writes:
Show 11 quoted lines
>>  ifndef NO_PERL
>> -	$(RM) gitweb/gitweb.cgi
>> +	$(RM) gitweb/gitweb.{cgi,min.*}
>>  	$(MAKE) -C perl clean
>>  endif
>
> Minor nit: this would be first line that uses {a,b} shell glob 
> construct.  Why not write it as:
>
>   -	$(RM) gitweb/gitweb.cgi
>   +	$(RM) gitweb/gitweb.cgi gitweb/gitweb.min.*

Very good point and it is not a "minor nit"; I cannot apply the patch without your fix.

My understanding is that you Ack 1 (with this fix), 2 (with another paragraph in the log message), and 5. Eric Acked 4 and 6 needs to be reworked. I wonder if anybody has comments on 3; I didn't look very closely at it, but it looked sane to me.

With that understanding, I'll queue the whole thing to 'pu', so that they can be reworked and replaced before hitting 'next'.

Thanks, all.

← back to recent threads