Permalink
Commits on Mar 5, 2012
  1. Git 1.7.9.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 5, 2012
  2. Merge branch 'jc/doc-merge-options' into maint

    * jc/doc-merge-options:
      Documentation/merge-options.txt: group "ff" related options together
    gitster committed Mar 5, 2012
  3. Merge branch 'cn/maint-rev-list-doc' into maint

    * cn/maint-rev-list-doc:
      Documentation: use {asterisk} in rev-list-options.txt when needed
    gitster committed Mar 5, 2012
  4. fast-import: zero all of 'struct tag' to silence valgrind

    When running t9300, valgrind (correctly) complains about an
    uninitialized value in write_crash_report:
    
      ==2971== Use of uninitialised value of size 8
      ==2971==    at 0x4164F4: sha1_to_hex (hex.c:70)
      ==2971==    by 0x4073E4: die_nicely (fast-import.c:468)
      ==2971==    by 0x43284C: die (usage.c:86)
      ==2971==    by 0x40420D: main (fast-import.c:2731)
      ==2971==  Uninitialised value was created by a heap allocation
      ==2971==    at 0x4C29B3D: malloc (vg_replace_malloc.c:263)
      ==2971==    by 0x433645: xmalloc (wrapper.c:35)
      ==2971==    by 0x405DF5: pool_alloc (fast-import.c:619)
      ==2971==    by 0x407755: pool_calloc.constprop.14 (fast-import.c:634)
      ==2971==    by 0x403F33: main (fast-import.c:3324)
    
    Fix this by zeroing all of the 'struct tag'.  We would only need to
    zero out the 'sha1' field, but this way seems more future-proof.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Mar 5, 2012
  5. Update draft release notes to 1.7.9.3 for the last time

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 5, 2012
  6. Merge branch 'cn/maint-branch-with-bad' into maint

    * cn/maint-branch-with-bad:
      branch: don't assume the merge filter ref exists
    
    Conflicts:
    	t/t3200-branch.sh
    gitster committed Mar 5, 2012
  7. Merge branch 'jn/maint-gitweb-invalid-regexp' into maint

    * jn/maint-gitweb-invalid-regexp:
      gitweb: Handle invalid regexp in regexp search
    gitster committed Mar 5, 2012
  8. Merge branch 'nd/maint-verify-objects' into maint

    * nd/maint-verify-objects:
      rev-list: fix --verify-objects --quiet becoming --objects
      rev-list: remove BISECT_SHOW_TRIED flag
    gitster committed Mar 5, 2012
  9. Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maint

    * jk/maint-avoid-streaming-filtered-contents:
      do not stream large files to pack when filters are in use
      teach dry-run convert_to_git not to require a src buffer
      teach convert_to_git a "dry run" mode
    gitster committed Mar 5, 2012
  10. Merge branch 'jb/filter-ignore-sigpipe' into maint

    * jb/filter-ignore-sigpipe:
      Ignore SIGPIPE when running a filter driver
    gitster committed Mar 5, 2012
  11. Merge branch 'sp/smart-http-failure-to-push' into maint

    * sp/smart-http-failure-to-push:
      : Mask SIGPIPE on the command channel going to a transport helper
      disconnect from remote helpers more gently
    
    Conflicts:
    	transport-helper.c
    gitster committed Mar 5, 2012
  12. Merge branch 'tr/maint-bundle-long-subject' into maint

    * tr/maint-bundle-long-subject:
      t5704: match tests to modern style
      strbuf: improve strbuf_get*line documentation
      bundle: use a strbuf to scan the log for boundary commits
      bundle: put strbuf_readline_fd in strbuf.c with adjustments
    gitster committed Mar 5, 2012
  13. http.proxy: also mention https_proxy and all_proxy

    The current wording of the http.proxy documentation suggests that
    http_proxy is somehow equivalent to http.proxy. However, while
    http.proxy (by the means of curl's CURLOPT_PROXY option) overrides the
    proxy for both HTTP and HTTPS protocols, the http_proxy environment
    variable is used only for HTTP. But since the docs mention only
    http_proxy, a user might expect it to apply to all HTTP-like protocols.
    
    Avoid any such misunderstanding by explicitly mentioning https_proxy and
    all_proxy as well.
    
    Also replace linkgit:curl[1] with a literal 'curl(1)', because the
    former gets translated to a dead link in the HTML pages.
    
    Signed-off-by: Clemens Buchacher <drizzd@aon.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drizzd committed with gitster Mar 4, 2012
Commits on Mar 3, 2012
  1. t0300: work around bug in dash 0.5.6

    The construct 'while IFS== read' makes dash 0.5.6 execute
    read without changing IFS, which results in test breakages
    all over the place in t0300.  Neither dash 0.5.5.1 and older
    nor dash 0.5.7 and newer are affected: The problem was
    introduded resp. fixed by the commits
    
      55c46b7 ([BUILTIN] Honor tab as IFS whitespace when
               splitting fields in readcmd, 2009-08-11)
    
      1d806ac ([VAR] Do not poplocalvars prematurely on regular
               utilities, 2010-05-27)
    
    in http://git.kernel.org/?p=utils/dash/dash.git
    
    Putting 'IFS==' before that line makes all versions of dash
    work.
    
    This looks like a dash bug, not a misinterpretation of the
    standard. However, it's worth working around for two
    reasons. One, this version of dash was released in Fedora
    14-16, so the bug is found in the wild. And two, at least
    one other shell, Solaris /bin/sh, choked on this by
    persisting IFS after the read invocation. That is not a
    shell we usually care about, and I think this use of IFS is
    acceptable by POSIX (which allows other behavior near
    "special builtins", but "read" is not one of those). But it
    seems that this may be a subtle, not-well-tested case for
    some shells. Given that the workaround is so simple, it's
    worth just being defensive.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Mar 3, 2012
  2. t5512 (ls-remote): modernize style

    Prepare expected output inside test_expect_success that uses it.
    Also remove excess blank lines.
    
    Signed-off-by: Tom Grennan <tmgrennan@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    tgrennan committed with gitster Mar 3, 2012
Commits on Mar 2, 2012
  1. tests: fix spurious error when run directly with Solaris /usr/xpg4/bi…

    …n/sh
    
    If any test script is run directly with Solaris 10 /usr/xpg4/bin/sh or
    /bin/ksh, it fails spuriously with a message like:
    
      t0000-basic.sh[31]: unset: bad argument count
    
    This happens because those shells bail out when encountering a call to
    "unset" with no arguments, and such unset call could take place in
    'test-lib.sh'.  Fix that issue, and add a proper comment to ensure we
    don't regress in this respect.
    
    Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    slattarini committed with gitster Mar 2, 2012
  2. Documentation: do not assume that n > 1 in <rev>~$n

    We explained <rev>~<n> as <n>th generation grand-parent, but a reader got
    confused by the "grand-" part when <n> is 1.
    
    Reword it with "ancestor"; with the "generation" and "following only the
    first parents" around there, what we try to describe should be clear
    enough now.
    
    Noticed-by: Luke Diamand <luke@diamand.org>
    Helped-by: Thomas Rast <trast@inf.ethz.ch>
    Helped-by: Andreas Ericsson <ae@op5.se>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 29, 2012
Commits on Mar 1, 2012
  1. Documentation fixes in git-config

    Variable names must start with an alphabetic character, regexp config key
    matching has its limits, sentence grammar.
    
    Signed-off-by: Libor Pechacek <lpechacek@suse.cz>
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    lpechacek committed with gitster Mar 1, 2012
Commits on Feb 28, 2012
  1. Documentation: use {asterisk} in rev-list-options.txt when needed

    Text between two '*' is emphasized in AsciiDoc and makes explanations in
    rev-list-options.txt on glob-related options very confusing, as the
    rendered text would be missing two asterisks and the text between them
    would be emphasized instead.
    
    Use '{asterisk}' where needed to make them show up as asterisks in the
    rendered text.
    
    Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    carlosmn committed with gitster Feb 28, 2012
  2. gitweb: Handle invalid regexp in regexp search

    When using regexp search ('sr' parameter / $search_use_regexp variable
    is true), check first that regexp is valid.
    
    Without this patch we would get an error from Perl during search (if
    searching is performed by gitweb), or highlighting matches substring
    (if applicable), if user provided invalid regexp... which means broken
    HTML, with error page (including HTTP headers) generated after gitweb
    already produced some output.
    
    Add test that illustrates such error: for example for regexp "*\.git"
    we would get the following error:
    
      Quantifier follows nothing in regex; marked by <-- HERE in m/* <-- HERE \.git/
      at /var/www/cgi-bin/gitweb.cgi line 3084.
    
    Reported-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jnareb committed with gitster Feb 28, 2012
  3. rev-list: fix --verify-objects --quiet becoming --objects

    When --quiet is specified, finish_object() is called instead of
    show_object(). The latter is in charge of --verify-objects and
    will be skipped  if --quiet is specified.
    
    Move the code up to finish_object(). Also pass the quiet flag along
    and make it always call show_* functions to avoid similar problems in
    future.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    pclouds committed with gitster Feb 28, 2012
  4. rev-list: remove BISECT_SHOW_TRIED flag

    Since c99f069 (bisect--helper: remove "--next-vars" option as it is
    now useless - 2009-04-21), this flag has always been off. Remove the
    flag and all related code.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    pclouds committed with gitster Feb 28, 2012
Commits on Feb 27, 2012
  1. Update draft release notes to 1.7.9.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 27, 2012
  2. Merge branch 'pj/remote-set-branches-usage-fix' into maint

    * pj/remote-set-branches-usage-fix:
      remote: fix set-branches usage and documentation
    
    Conflicts:
    	builtin/remote.c
    gitster committed Feb 27, 2012
  3. Merge branch 'jn/gitweb-unborn-head' into maint

    * jn/gitweb-unborn-head:
      gitweb: Fix "heads" view when there is no current branch
    gitster committed Feb 27, 2012
  4. Merge branch 'jn/ancient-meld-support' into maint

    * jn/ancient-meld-support:
      mergetools/meld: Use --help output to detect --output support
    gitster committed Feb 27, 2012
  5. Merge branch 'tr/merge-edit-guidance' into maint

    * tr/merge-edit-guidance:
      merge: add instructions to the commit message when editing
    gitster committed Feb 27, 2012
  6. CodingGuidelines: do not use 'which' in shell scripts

    During the code review of a recent patch, it was noted that shell scripts
    must not use 'which $cmd' to check the availability of the command $cmd.
    The output of the command is not machine parseable and its exit code is
    not reliable across platforms.
    
    It is better to use 'type' to accomplish this task.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    thenigan committed with gitster Feb 24, 2012
  7. CodingGuidelines: Add a note about spaces after redirection

    During code review of some patches, it was noted that redirection operators
    should have space before, but no space after them.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    thenigan committed with gitster Feb 24, 2012
  8. branch: don't assume the merge filter ref exists

    print_ref_list looks up the merge_filter_ref and assumes that a valid
    pointer is returned. When the object doesn't exist, it tries to
    dereference a NULL pointer. This can be the case when git branch
    --merged is given an argument that isn't a valid commit name.
    
    Check whether the lookup returns a NULL pointer and die with an error
    if it does. Add a test, while we're at it.
    
    Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    carlosmn committed with gitster Feb 27, 2012
  9. post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly

    Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mhagger committed with gitster Feb 27, 2012
  10. post-receive-email: remove unused variable

    prep_for_email neither is passed a fourth argument nor uses it.
    
    Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mhagger committed with gitster Feb 27, 2012
  11. Document accumulated fixes since 1.7.9.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Feb 27, 2012
  12. Merge branch 'jc/add-refresh-unmerged' into maint

    * jc/add-refresh-unmerged:
      refresh_index: do not show unmerged path that is outside pathspec
    gitster committed Feb 27, 2012
  13. Merge branch 'js/configure-libintl' into maint

    * js/configure-libintl:
      configure: don't use -lintl when there is no gettext support
    gitster committed Feb 27, 2012