Skip to content
Commits on Jun 9, 2011
  1. @gitster

    Git 1.7.6-rc1

    gitster committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'maint'

    gitster committed
    * maint:
      fetch: do not leak a refspec
  3. @meyering @gitster

    fetch: do not leak a refspec

    meyering committed with gitster
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 7, 2011
  1. @gitster

    Merge branch 'jc/magic-pathspec'

    gitster committed
    * jc/magic-pathspec:
      t3703: skip more tests using colons in file names on Windows
  2. @raalkml @gitster

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

    raalkml committed with gitster
    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. @gitster

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

    gitster committed
    * jn/mime-type-with-params:
      gitweb: Fix usability of $prevent_xss
  2. @gitster

    Merge branch 'jn/gitweb-docs'

    gitster committed
    * 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. @gitster

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

    gitster committed
    * 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. @gitster

    Merge branch 'bc/maint-status-z-to-use-porcelain'

    gitster committed
    * 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. @jnareb @gitster

    gitweb: Fix usability of $prevent_xss

    jnareb committed with gitster
    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. @jnareb @gitster

    gitweb: Move "Requirements" up in gitweb/INSTALL

    jnareb committed with gitster
    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. @jnareb @gitster

    gitweb: Describe CSSMIN and JSMIN in gitweb/INSTALL

    jnareb committed with gitster
    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. @jnareb @gitster

    gitweb: Move information about installation from README to INSTALL

    jnareb committed with gitster
    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. @gitster

    Sync with 1.7.5.4

    gitster committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Git 1.7.5.4

    gitster committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'jk/maint-config-alias-fix' into maint

    gitster committed
    * 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. @gitster

    Merge branch 'jc/fmt-req-fix' into maint

    gitster committed
    * jc/fmt-req-fix:
      userformat_find_requirements(): find requirement for the correct format
  5. @gitster

    Merge branch 'jk/maint-docs' into maint

    gitster committed
    * 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. @gitster

    Merge branch 'jn/doc-remote-helpers' into maint

    gitster committed
    * jn/doc-remote-helpers:
      Documentation: do not misinterpret refspecs as bold text
  7. @gitster

    Merge branch 'kk/maint-prefix-in-config-mak' into maint

    gitster committed
    * kk/maint-prefix-in-config-mak:
      config.mak.in: allow "configure --sysconfdir=/else/where"
  8. @meyering @gitster

    diffcore-rename.c: avoid set-but-not-used warning

    meyering committed with gitster
    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. @gitster

    Update draft release notes to 1.7.6

    gitster committed
    I think we are almost there for the feature freeze.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'jk/format-patch-am'

    gitster committed
    * 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. @gitster

    Merge branch 'jn/doc-remote-helpers'

    gitster committed
    * jn/doc-remote-helpers:
      Documentation: do not misinterpret refspecs as bold text
  4. @gitster

    Merge branch 'jk/format-patch-empty-prefix'

    gitster committed
    * jk/format-patch-empty-prefix:
      format-patch: make zero-length subject prefixes prettier
  5. @gitster

    Merge branch 'ab/i18n-envsubst-doc-fix'

    gitster committed
    * ab/i18n-envsubst-doc-fix:
      git-sh-i18n--envsubst: add SYNOPSIS section to the documentation
  6. @gitster

    Merge branch 'jc/log-quiet-fix'

    gitster committed
    * jc/log-quiet-fix:
      log: --quiet should serve as synonym to -s
  7. @gitster

    Merge branch 'kk/maint-prefix-in-config-mak'

    gitster committed
    * kk/maint-prefix-in-config-mak:
      config.mak.in: allow "configure --sysconfdir=/else/where"
  8. @gitster

    Merge branch 'jk/rebase-head-reflog'

    gitster committed
    * jk/rebase-head-reflog:
      rebase: write a reflog entry when finishing
      rebase: create HEAD reflog entry when aborting
  9. @gitster

    Merge branch 'jk/maint-docs'

    gitster committed
    * 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. @gitster

    Merge branch 'jk/read-in-full-stops-on-error'

    gitster committed
    * jk/read-in-full-stops-on-error:
      read_in_full: always report errors
  11. @gitster

    Merge branch 'jk/maint-remote-mirror-safer'

    gitster committed
    * jk/maint-remote-mirror-safer:
      remote: allow "-t" with fetch mirrors
  12. @gitster

    Merge branch 'jl/read-tree-m-dry-run'

    gitster committed
    * 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
  13. @gitster

    Sync with maint

    gitster committed
  14. @gitster

    Start 1.7.5.4 draft release notes

    gitster committed
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.