Permalink
Commits on Jun 16, 2011
  1. Git 1.7.6-rc2

    gitster committed Jun 16, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 9, 2011
  1. gitweb: do not misparse nonnumeric content tag files that contain a d…

    jrn committed with gitster Jun 9, 2011
    …igit
    
    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/<label> under
    a project's .git dir contains a number (representing the strength of
    association to <label>) 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 <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Git 1.7.6-rc1

    gitster committed Jun 9, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'maint'

    gitster committed Jun 9, 2011
    * maint:
      fetch: do not leak a refspec
  4. fetch: do not leak a refspec

    meyering committed with gitster Jun 8, 2011
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 7, 2011
  1. Merge branch 'jc/magic-pathspec'

    gitster committed Jun 7, 2011
    * jc/magic-pathspec:
      t3703: skip more tests using colons in file names on Windows
  2. t3703: skip more tests using colons in file names on Windows

    raalkml committed with gitster Jun 7, 2011
    Use the same test and prerequisite as introduced in similar
    fix in 650af7a.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 6, 2011
  1. Merge branch 'jn/mime-type-with-params'

    gitster committed Jun 6, 2011
    * jn/mime-type-with-params:
      gitweb: Fix usability of $prevent_xss
  2. Merge branch 'jn/gitweb-docs'

    gitster committed Jun 6, 2011
    * 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
  3. Merge branch 'jk/diff-not-so-quick'

    gitster committed Jun 6, 2011
    * jk/diff-not-so-quick:
      diff: futureproof "stop feeding the backend early" logic
      diff_tree: disable QUICK optimization with diff filter
    
    Conflicts:
    	diff.c
  4. Merge branch 'bc/maint-status-z-to-use-porcelain'

    gitster committed Jun 6, 2011
    * 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
Commits on Jun 5, 2011
  1. gitweb: Fix usability of $prevent_xss

    jnareb committed with gitster Jun 4, 2011
    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#sec14.17
      http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7
    
    This fixes that, and it for example treats following as safe MIME
    media type:
    
      text/plain; charset=utf-8
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 3, 2011
  1. gitweb: Move "Requirements" up in gitweb/INSTALL

    jnareb committed with gitster Jun 3, 2011
    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>
Commits on Jun 2, 2011
  1. gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL

    jnareb committed with gitster Jun 2, 2011
    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>
  2. gitweb: Move information about installation from README to INSTALL

    jnareb committed with gitster Jun 2, 2011
    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>
Commits on Jun 1, 2011
  1. Sync with 1.7.5.4

    gitster committed Jun 1, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Git 1.7.5.4

    gitster committed Jun 1, 2011
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'jk/maint-config-alias-fix' into maint

    gitster committed Jun 1, 2011
    * 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
  4. Merge branch 'jc/fmt-req-fix' into maint

    gitster committed Jun 1, 2011
    * jc/fmt-req-fix:
      userformat_find_requirements(): find requirement for the correct format
  5. Merge branch 'jk/maint-docs' into maint

    gitster committed Jun 1, 2011
    * 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
  6. Merge branch 'jn/doc-remote-helpers' into maint

    gitster committed Jun 1, 2011
    * jn/doc-remote-helpers:
      Documentation: do not misinterpret refspecs as bold text
  7. Merge branch 'kk/maint-prefix-in-config-mak' into maint

    gitster committed Jun 1, 2011
    * kk/maint-prefix-in-config-mak:
      config.mak.in: allow "configure --sysconfdir=/else/where"
  8. diffcore-rename.c: avoid set-but-not-used warning

    meyering committed with gitster Apr 29, 2011
    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>
Commits on May 31, 2011
  1. Update draft release notes to 1.7.6

    gitster committed May 31, 2011
    I think we are almost there for the feature freeze.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jk/format-patch-am'

    gitster committed May 31, 2011
    * 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
  3. Merge branch 'jn/doc-remote-helpers'

    gitster committed May 31, 2011
    * jn/doc-remote-helpers:
      Documentation: do not misinterpret refspecs as bold text
  4. Merge branch 'jk/format-patch-empty-prefix'

    gitster committed May 31, 2011
    * jk/format-patch-empty-prefix:
      format-patch: make zero-length subject prefixes prettier
  5. Merge branch 'ab/i18n-envsubst-doc-fix'

    gitster committed May 31, 2011
    * ab/i18n-envsubst-doc-fix:
      git-sh-i18n--envsubst: add SYNOPSIS section to the documentation
  6. Merge branch 'jc/log-quiet-fix'

    gitster committed May 31, 2011
    * jc/log-quiet-fix:
      log: --quiet should serve as synonym to -s
  7. Merge branch 'kk/maint-prefix-in-config-mak'

    gitster committed May 31, 2011
    * kk/maint-prefix-in-config-mak:
      config.mak.in: allow "configure --sysconfdir=/else/where"
  8. Merge branch 'jk/rebase-head-reflog'

    gitster committed May 31, 2011
    * jk/rebase-head-reflog:
      rebase: write a reflog entry when finishing
      rebase: create HEAD reflog entry when aborting
  9. Merge branch 'jk/maint-docs'

    gitster committed May 31, 2011
    * 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
  10. Merge branch 'jk/read-in-full-stops-on-error'

    gitster committed May 31, 2011
    * jk/read-in-full-stops-on-error:
      read_in_full: always report errors
  11. Merge branch 'jk/maint-remote-mirror-safer'

    gitster committed May 31, 2011
    * jk/maint-remote-mirror-safer:
      remote: allow "-t" with fetch mirrors
  12. Merge branch 'jl/read-tree-m-dry-run'

    gitster committed May 31, 2011
    * jl/read-tree-m-dry-run:
      Teach read-tree the -n|--dry-run option
      unpack-trees: add the dry_run flag to unpack_trees_options