Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.7.6-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.6-rc1
Junio C Hamano
Merge branch 'maint' * maint: fetch: do not leak a refspec
Jim Meyering
fetch: do not leak a refspec Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jc/magic-pathspec' * jc/magic-pathspec: t3703: skip more tests using colons in file names on Windows
Alex Riesen
t3703: skip more tests using colons in file names on Windows Use the same test and prerequisite as introduced in similar fix in 650af7ae8bdf92bd92df2. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jn/mime-type-with-params' * jn/mime-type-with-params: gitweb: Fix usability of $prevent_xss
Junio C Hamano
Merge branch 'jn/gitweb-docs' * 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
Junio C Hamano
Merge branch 'jk/diff-not-so-quick' * jk/diff-not-so-quick: diff: futureproof "stop feeding the backend early" logic diff_tree: disable QUICK optimization with diff filter Conflicts: diff.c
Junio C Hamano
Merge branch 'bc/maint-status-z-to-use-porcelain' * bc/maint-status-z-to-use-porcelain: builtin/commit.c: set status_format _after_ option parsing t7508: demonstrate status's failure to use --porcelain format with -z Conflicts: builtin/commit.c
Jakub Narębski
gitweb: Fix usability of $prevent_xss With XSS prevention on (enabled using $prevent_xss), blobs ('blob_plain') of all types except a few known safe ones are served with "Content-Disposition: attachment". However the check was too strict; it didn't take into account optional parameter attributes, media-type = type "/" subtype *( ";" parameter ) as described in RFC 2616 http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html…
Jakub Narębski
gitweb: Move "Requirements" up in gitweb/INSTALL This way you can examine prerequisites at first glance, before detailed instructions on installing gitweb. Straightforward text movement. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jakub Narębski
gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL The build-time configuration variables JSMIN and CSSMIN were mentioned only in Makefile; add their description to gitweb/INSTALL. This required moving description of GITWEB_JS up, near GITWEB_CSS and just introduced CSMIN and JSMIN. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jakub Narębski
gitweb: Move information about installation from README to INSTALL Almost straightformard moving of "How to configure gitweb for your local system" section from gitweb/README to gitweb/INSTALL, as it is about build time configuration. Updated references to it. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Sync with 1.7.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.6-rc0
Junio C Hamano
Git 1.7.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.5.4
Junio C Hamano
Merge branch 'jk/maint-config-alias-fix' into maint * jk/maint-config-alias-fix: handle_options(): do not miscount how many arguments were used config: always parse GIT_CONFIG_PARAMETERS during git_config git_config: don't peek at global config_parameters config: make environment parsing routines static
Junio C Hamano
Merge branch 'jc/fmt-req-fix' into maint * jc/fmt-req-fix: userformat_find_requirements(): find requirement for the correct format
Junio C Hamano
Merge branch 'jk/maint-docs' into maint * jk/maint-docs: docs: fix some antique example output docs: make sure literal "->" isn't converted to arrow docs: update status --porcelain format docs: minor grammar fixes to git-status
Junio C Hamano
Merge branch 'jn/doc-remote-helpers' into maint * jn/doc-remote-helpers: Documentation: do not misinterpret refspecs as bold text
Junio C Hamano
Merge branch 'kk/maint-prefix-in-config-mak' into maint * kk/maint-prefix-in-config-mak: config.mak.in: allow "configure --sysconfdir=/else/where"
Jim Meyering
diffcore-rename.c: avoid set-but-not-used warning Since 9d8a5a5 (diffcore-rename: refactor "too many candidates" logic, 2011-01-06), diffcore_rename() initializes num_src but does not use it anymore. "-Wunused-but-set-variable" in gcc-4.6 complains about this. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Update draft release notes to 1.7.6 I think we are almost there for the feature freeze. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jk/format-patch-am' * jk/format-patch-am: format-patch: preserve subject newlines with -k clean up calling conventions for pretty.c functions pretty: add pp_commit_easy function for simple callers mailinfo: always clean up rfc822 header folding t: test subject handling in format-patch / am pipeline Conflicts: builtin/branch.c builtin/log.c commit.h
Junio C Hamano
Merge branch 'jn/doc-remote-helpers' * jn/doc-remote-helpers: Documentation: do not misinterpret refspecs as bold text
Junio C Hamano
Merge branch 'jk/format-patch-empty-prefix' * jk/format-patch-empty-prefix: format-patch: make zero-length subject prefixes prettier
Junio C Hamano
Merge branch 'ab/i18n-envsubst-doc-fix' * ab/i18n-envsubst-doc-fix: git-sh-i18n--envsubst: add SYNOPSIS section to the documentation
Junio C Hamano
Merge branch 'jc/log-quiet-fix' * jc/log-quiet-fix: log: --quiet should serve as synonym to -s
Junio C Hamano
Merge branch 'kk/maint-prefix-in-config-mak' * kk/maint-prefix-in-config-mak: config.mak.in: allow "configure --sysconfdir=/else/where"
Junio C Hamano
Merge branch 'jk/rebase-head-reflog' * jk/rebase-head-reflog: rebase: write a reflog entry when finishing rebase: create HEAD reflog entry when aborting
Junio C Hamano
Merge branch 'jk/maint-docs' * jk/maint-docs: docs: fix some antique example output docs: make sure literal "->" isn't converted to arrow docs: update status --porcelain format docs: minor grammar fixes to git-status
  1. Prev
  2. Next