git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCHv5 1/6] Gitweb: add ignore and clean rules for minified files
@ 2010-04-01  5:35 Mark Rada
  2010-04-01  8:24 ` Jakub Narebski
  0 siblings, 1 reply; 3+ messages in thread
From: Mark Rada @ 2010-04-01  5:35 UTC (permalink / raw)
  To: git; +Cc: Junio C Hamano, Jakub Narebski

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCHv5 1/6] Gitweb: add ignore and clean rules for minified files
  2010-04-01  5:35 [PATCHv5 1/6] Gitweb: add ignore and clean rules for minified files Mark Rada
@ 2010-04-01  8:24 ` Jakub Narebski
  2010-04-01 21:26   ` Junio C Hamano
  0 siblings, 1 reply; 3+ messages in thread
From: Jakub Narebski @ 2010-04-01  8:24 UTC (permalink / raw)
  To: Mark Rada; +Cc: git, Junio C Hamano

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> 

> 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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCHv5 1/6] Gitweb: add ignore and clean rules for minified files
  2010-04-01  8:24 ` Jakub Narebski
@ 2010-04-01 21:26   ` Junio C Hamano
  0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2010-04-01 21:26 UTC (permalink / raw)
  To: Jakub Narebski, Eric Wong; +Cc: Mark Rada, git

Jakub Narebski <jnareb@gmail.com> writes:

>>  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.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-04-01 21:26 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-01  5:35 [PATCHv5 1/6] Gitweb: add ignore and clean rules for minified files Mark Rada
2010-04-01  8:24 ` Jakub Narebski
2010-04-01 21:26   ` Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).