Permalink
Commits on Jun 22, 2011
  1. Git 1.7.6-rc3

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

    gitster committed Jun 22, 2011
    * maint:
      Documentation: git diff --check respects core.whitespace
  3. Documentation: git diff --check respects core.whitespace

    Christof Krüger committed with gitster Jun 22, 2011
    Fix documentation on "git diff --check" by adopting the description from
    "git apply --whitespace".
    
    Signed-off-by: Christof Krüger <git@christof-krueger.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 21, 2011
  1. Merge branch 'maint'

    gitster committed Jun 21, 2011
    * maint:
      gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled
  2. gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled

    jnareb committed with gitster Jun 21, 2011
    Both 'pickaxe' (searching changes) and 'grep' (searching files)
    require basic 'search' feature to be enabled to work.  Enabling
    e.g. only 'pickaxe' won't work.
    
    Add a comment about this.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 20, 2011
  1. Merge branch 'mk/grep-pcre'

    gitster committed Jun 20, 2011
    * mk/grep-pcre:
      t7810: avoid unportable use of "echo"
  2. t7810: avoid unportable use of "echo"

    gitster committed Jun 20, 2011
    Michael J Gruber noticed that under /bin/dash this test failed
    (as is expected -- \n in the string can be interpreted by the
    command), while it passed with bash.  We probably could work it
    around by using backquote in front of it, but it is safer and
    more readable to avoid "echo" altogether in a case like this.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. plug a few coverity-spotted leaks

    meyering committed with gitster Jun 20, 2011
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 19, 2011
  1. Merge branch 'di/no-no-existant'

    gitster committed Jun 19, 2011
    * di/no-no-existant:
      Fix typo: existant->existent
  2. Merge branch 'maint'

    gitster committed Jun 19, 2011
    * maint:
      builtin/gc.c: add missing newline in message
  3. builtin/gc.c: add missing newline in message

    andreas-schwab committed with gitster Jun 19, 2011
    Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 17, 2011
  1. tests: link shell libraries into valgrind directory

    peff committed with gitster Jun 17, 2011
    When we run tests under valgrind, we symlink anything
    executable that starts with git-* or test-* into a special
    valgrind bin directory, and then make that our
    GIT_EXEC_PATH.
    
    However, shell libraries like git-sh-setup do not have the
    executable bit marked, and did not get symlinked.  This
    means that any test looking for shell libraries in our
    exec-path would fail to find them, even though that is a
    fine thing to do when testing against a regular git build
    (or in a git install, for that matter).
    
    t2300 demonstrated this problem. The fix is to symlink these
    shell libraries directly into the valgrind directory.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. t/Makefile: pass test opts to valgrind target properly

    peff committed with gitster Jun 17, 2011
    The valgrind target just reinvokes make with GIT_TEST_OPTS
    set to "--valgrind". However, it does this using an
    environment variable, which means GIT_TEST_OPTS in your
    config.mak would override it, and "make valgrind" would
    simply run the test suite without valgrind on.
    
    Instead, we should pass GIT_TEST_OPTS on the command-line,
    overriding what's in config.mak, and take care to append to
    whatever the user has there already.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'ab/i18n-scripts-basic'

    gitster committed Jun 17, 2011
    * ab/i18n-scripts-basic:
      sh-i18n--envsubst.c: do not #include getopt.h
  4. sh-i18n--envsubst.c: do not #include getopt.h

    drafnel committed with gitster Jun 17, 2011
    The getopt.h header file is not used.  It's inclusion is left over from the
    original version of this source.  Additionally, getopt.h does not exist on
    all platforms (SunOS 5.7) and will cause a compilation failure.  So, let's
    remove it.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 16, 2011
  1. Fix typo: existant->existent

    divanorama committed with gitster Jun 16, 2011
    refs.c had a error message "Trying to write ref with nonexistant object".
    And no tests relied on the wrong spelling.
    Also typo was present in some test scripts internals, these tests still pass.
    
    Signed-off-by: Dmitry Ivankov <divanorama@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. 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