Permalink
Commits on Mar 7, 2012
  1. Git 1.7.10-rc0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 7, 2012
  2. Merge branch 'jc/pickaxe-ignore-case'

    By Junio C Hamano (2) and Ramsay Jones (1)
    * jc/pickaxe-ignore-case:
      ctype.c: Fix a sparse warning
      pickaxe: allow -i to search in patch case-insensitively
      grep: use static trans-case table
    gitster committed Mar 7, 2012
Commits on Mar 6, 2012
  1. Merge branch 'jh/threadable-symlink-check'

    By Jared Hance
    * jh/threadable-symlink-check:
      Add threaded versions of functions in symlinks.c.
    gitster committed Mar 6, 2012
  2. Merge branch 'jc/maint-diff-patch-header'

    By Junio C Hamano
    * jc/maint-diff-patch-header:
      diff -p: squelch "diff --git" header for stat-dirty paths
      t4011: illustrate "diff-index -p" on stat-dirty paths
      t4011: modernise style
    gitster committed Mar 6, 2012
  3. Merge branch 'th/mergetools-deltawalker'

    By Tim Henigan
    * th/mergetools-deltawalker:
      mergetools: add a plug-in to support DeltaWalker
    gitster committed Mar 6, 2012
  4. Merge branch 'cn/pull-rebase-message'

    By Carlos Martín Nieto
    * cn/pull-rebase-message:
      Make git-{pull,rebase} message without tracking information friendlier
    gitster committed Mar 6, 2012
  5. Merge branch 'sl/modern-t0000'

    By Stefano Lattarini
    * sl/modern-t0000:
      t0000: modernise style
    gitster committed Mar 6, 2012
  6. Merge branch 'nl/http-proxy-auth'

    By Nelson Benitez Leon
    * nl/http-proxy-auth:
      http: support proxies that require authentication
    gitster committed Mar 6, 2012
  7. Merge branch 'tr/maint-bundle-boundary'

    By Thomas Rast
    * tr/maint-bundle-boundary:
      bundle: keep around names passed to add_pending_object()
      t5510: ensure we stay in the toplevel test dir
      t5510: refactor bundle->pack conversion
    gitster committed Mar 6, 2012
  8. Merge branch 'zj/diff-stat-dyncol'

    By Zbigniew Jędrzejewski-Szmek (8) and Junio C Hamano (1)
    * zj/diff-stat-dyncol:
      : This breaks tests. Perhaps it is not worth using the decimal-width stuff
      : for this series, at least initially.
      diff --stat: add config option to limit graph width
      diff --stat: enable limiting of the graph part
      diff --stat: add a test for output with COLUMNS=40
      diff --stat: use a maximum of 5/8 for the filename part
      merge --stat: use the full terminal width
      log --stat: use the full terminal width
      show --stat: use the full terminal width
      diff --stat: use the full terminal width
      diff --stat: tests for long filenames and big change counts
    gitster committed Mar 6, 2012
  9. Merge branch 'maint'

    By Thomas Rast
    * maint:
      t5704: fix nonportable sed/grep usages
      Document the --histogram diff option
    gitster committed Mar 6, 2012
  10. t5704: fix nonportable sed/grep usages

    OS X's sed and grep would complain with (respectively)
    
      sed: 1: "/^-/{p;q}": extra characters at the end of q command
      grep: Regular expression too big
    
    For sed, use an explicit ; to terminate the q command.
    
    For grep, spell the "40 hex digits" explicitly in the regex, which
    should be safe as other tests already use this and we haven't got
    breakage reports on OS X about them.
    
    Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Thomas Rast committed with gitster Mar 6, 2012
  11. Merge branch 'maint-1.7.8' into maint

    By Thomas Rast
    * maint-1.7.8:
      Document the --histogram diff option
    gitster committed Mar 6, 2012
  12. Merge branch 'maint-1.7.7' into maint-1.7.8

    By Thomas Rast
    * maint-1.7.7:
      Document the --histogram diff option
    gitster committed Mar 6, 2012
  13. Document the --histogram diff option

    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Mar 6, 2012
  14. perf: compare diff algorithms

    8c912ee (teach --histogram to diff, 2011-07-12) claimed histogram diff
    was faster than both Myers and patience.
    
    We have since incorporated a performance testing framework, so add a
    test that compares the various diff tasks performed in a real 'log -p'
    workload.  This does indeed show that histogram diff slightly beats
    Myers, while patience is much slower than the others.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Mar 6, 2012
Commits on Mar 5, 2012
  1. Sync with 1.7.9.3

    gitster committed Mar 5, 2012
  2. Git 1.7.9.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 5, 2012
  3. 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
  4. 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
  5. fsck doc: a minor typofix

    Reword the misspelled "squelch" noticed by Hermann Gaustere to say
    "omit", which would sit better anyway.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 5, 2012
  6. 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
  7. mergetools: add a plug-in to support DeltaWalker

    DeltaWalker is a non-free tool popular among some users.  Add a
    plug-in to support it from difftool and mergetool.
    
    Note that the $(pwd)/ in front of $MERGED should not be necessary.
    However without it, DeltaWalker crashes with a JRE exception.
    
    Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
    Helped-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    thenigan committed with gitster Mar 5, 2012
  8. Update draft release notes to 1.7.10

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Mar 5, 2012
  9. Merge branch 'jk/symbolic-ref-short'

    * jk/symbolic-ref-short:
      symbolic-ref --short: abbreviate the output unambiguously
    gitster committed Mar 5, 2012
  10. Merge branch 'jn/gitweb-hilite-regions'

    * jn/gitweb-hilite-regions:
      gitweb: Highlight matched part of shortened project description
      gitweb: Highlight matched part of project description when searching projects
      gitweb: Highlight matched part of project name when searching projects
      gitweb: Introduce esc_html_match_hl and esc_html_hl_regions
    gitster committed Mar 5, 2012
  11. Merge branch 'jc/am-3-nonstandard-popt'

    * jc/am-3-nonstandard-popt:
      test: "am -3" can accept non-standard -p<num>
      am -3: allow nonstandard -p<num> option
    gitster committed Mar 5, 2012
  12. Make git-{pull,rebase} message without tracking information friendlier

    The current message is too long and at too low a level for anybody
    to understand it if they don't know about the configuration format
    already.
    
    The text about setting up a remote is superfluous and doesn't help
    understand or recover from the error that has happened.  Show the
    usage more prominently and explain how to set up the tracking
    information. If there is only one remote, that name is used instead
    of the generic <remote>.
    
    Also simplify the message we print on detached HEAD to remove
    unnecessary information which is better left for the documentation.
    
    Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    carlosmn committed with gitster Mar 4, 2012
  13. Merge branch 'maint'

    * maint:
      Update draft release notes to 1.7.9.3 for the last time
      http.proxy: also mention https_proxy and all_proxy
      t0300: work around bug in dash 0.5.6
      t5512 (ls-remote): modernize style
      tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh
    gitster committed Mar 5, 2012
  14. 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
  15. 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
  16. 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
  17. 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
  18. 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
  19. Merge branch 'jb/filter-ignore-sigpipe' into maint

    * jb/filter-ignore-sigpipe:
      Ignore SIGPIPE when running a filter driver
    gitster committed Mar 5, 2012