git, branch v1.7.6-rc2

Git 1.7.6-rc2

2011-06-16T16:21:36Z

Signed-off-by: Junio C Hamano

gitweb: do not misparse nonnumeric content tag files that contain a digit

2011-06-09T16:22:44Z

v1.7.6-rc0~27^2~4 (gitweb: Change the way "content tags" ('ctags') are handled, 2011-04-29) tried to make gitweb's tag cloud feature more intuitive for webmasters by checking whether the ctags/ under a project's .git dir contains a number (representing the strength of association to ) before treating it as one. With that change, after putting '$feature{'ctags'}{'default'} = [1];' in your $GITWEB_CONFIG, you could do echo Linux >.git/ctags/linux and gitweb would treat that as a request to tag the current repository with the Linux tag, instead of the previous behavior of writing an error page embedded in the projects list that triggers error messages from Chromium and Firefox about malformed XML. Unfortunately the pattern (\d+) used to match numbers is too loose, and the "XML declaration allowed only at the start of the document" error can still be experienced if you write "Linux-2.6" in place of "Linux" in the example above. Fix it by tightening the pattern to ^\d+$. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Git 1.7.6-rc1

2011-06-09T01:29:48Z

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2011-06-09T01:13:39Z

* maint: fetch: do not leak a refspec

fetch: do not leak a refspec

2011-06-09T00:21:08Z

Signed-off-by: Jim Meyering Signed-off-by: Junio C Hamano

Merge branch 'jc/magic-pathspec'

2011-06-07T15:32:42Z

* jc/magic-pathspec: t3703: skip more tests using colons in file names on Windows

t3703: skip more tests using colons in file names on Windows

2011-06-07T15:32:14Z

Use the same test and prerequisite as introduced in similar fix in 650af7ae8bdf92bd92df2. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano

Merge branch 'jn/mime-type-with-params'

2011-06-06T18:40:22Z

* jn/mime-type-with-params: gitweb: Fix usability of $prevent_xss

Merge branch 'jn/gitweb-docs'

2011-06-06T18:40:18Z

* jn/gitweb-docs: gitweb: Move "Requirements" up in gitweb/INSTALL gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL gitweb: Move information about installation from README to INSTALL

Merge branch 'jk/diff-not-so-quick'

2011-06-06T18:40:14Z

* jk/diff-not-so-quick: diff: futureproof "stop feeding the backend early" logic diff_tree: disable QUICK optimization with diff filter Conflicts: diff.c