Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v1.7.2.3

Sep 03, 2010

  1. Junio C Hamano

    Git 1.7.2.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored September 03, 2010
  2. builtin/merge_recursive.c: Add an usage string and make use of it.

    This improves the usage output by adding builtin_merge_recursive_usage string
    that follows the same pattern used by the other builtin commands.
    
    The previous output for git merger-recursive was:
    usage: merge-recursive <base>... -- <head> <remote> ...
    
    Now the output is:
    usage: git merge-recursive <base>... -- <head> <remote> ...
    
    Since cmd_merge_recursive is used to handle four different commands we need
    the %s in the usage string, so the following example:
    
    $ git merge-subtree -h
    
    Will output:
    usage: git merge-subtree <base>... -- <head> <remote> ...
    
    Signed-off-by: Thiago Farina <tfransosi@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 30, 2010 gitster committed September 03, 2010

Sep 01, 2010

  1. Junio C Hamano

    Prepare for 1.7.2.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored September 01, 2010
  2. Junio C Hamano

    Merge branch 'gp/pack-refs-remove-empty-dirs' into maint

    * gp/pack-refs-remove-empty-dirs:
      pack-refs: remove newly empty directories
    authored September 01, 2010
  3. Junio C Hamano

    Merge branch 'sg/rerere-gc-old-still-used' into maint

    * sg/rerere-gc-old-still-used:
      rerere: fix overeager gc
      mingw_utime(): handle NULL times parameter
    authored September 01, 2010
  4. Junio C Hamano

    Merge branch 'np/maint-huge-delta-generation' into maint

    * np/maint-huge-delta-generation:
      fix >4GiB source delta assertion failure
    authored September 01, 2010
  5. Junio C Hamano

    Merge branch 'dj/fetch-tagopt' into maint

    * dj/fetch-tagopt:
      fetch: allow command line --tags to override config
    authored September 01, 2010
  6. Junio C Hamano

    Merge branch 'da/fix-submodule-sync-superproject-config' into maint

    * da/fix-submodule-sync-superproject-config:
      submodule sync: Update "submodule.<name>.url"
    authored September 01, 2010
  7. Junio C Hamano

    Merge branch 'en/rebase-against-rebase-fix' into maint

    * en/rebase-against-rebase-fix:
      pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
      t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
    authored September 01, 2010

Aug 30, 2010

  1. Junio C Hamano

    Merge branch 'maint-1.7.1' into maint

    * maint-1.7.1:
      t0003: add missing && at end of lines
    authored August 29, 2010
  2. Matthieu Moy

    t0003: add missing && at end of lines

    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 28, 2010 gitster committed August 29, 2010

Aug 26, 2010

  1. Jay Soffian

    for-each-ref: fix objectname:short bug

    When objectname:short was introduced, it forgot to copy the result of
    find_unique_abbrev. Because the result of find_unique_abbrev is a
    pointer to static buffer, this resulted in the same value being
    substituted in for each ref.
    
    Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 26, 2010 gitster committed August 26, 2010

Aug 25, 2010

  1. newren

    tree-walk: Correct bitrotted comment about tree_entry()

    There was a code comment that referred to the "above two functions" but
    over time the functions immediately preceding the comment have changed.
    Just mention the relevant functions by name.
    
    Signed-off-by: Elijah Newren <newren@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 24, 2010 gitster committed August 25, 2010
  2. Linus Torvalds

    Fix 'git log' early pager startup error case

    We start the pager too early for several git commands, which results in
    the errors sometimes going to the pager rather than show up as errors.
    
    This is often hidden by the fact that we pass in '-X' to less by default,
    which causes 'less' to exit for small output, but if you do
    
      export LESS=-S
    
    you can then clearly see the problem by doing
    
      git log --prretty
    
    which shows the error message ("fatal: unrecognized argument: --prretty")
    being sent to the pager.
    
    This happens for pretty much all git commands that use USE_PAGER, and then
    check arguments separately. But "git diff" does it too early too (even
    though it does an explicit setup_pager() call)
    
    This only fixes it for the trivial "git log" family case.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 24, 2010 gitster committed August 25, 2010

Aug 24, 2010

  1. jrn

    parse-options: clarify PARSE_OPT_NOARG description

    Here "takes no argument" means "does not take an argument".  The
    latter phrasing might make it clearer that PARSE_OPT_NOARG does not
    make an option with an argument that can optionally be left off.
    
    Noticed-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 22, 2010 gitster committed August 24, 2010
  2. jrn

    t3302 (notes): Port to Solaris

    The time_notes script, which uses POSIX shell features, is
    currently sometimes run with a non-POSIX /bin/sh.
    
    Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 24, 2010 gitster committed August 24, 2010

Aug 22, 2010

  1. Typos in code comments, an error message, documentation

    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 22, 2010 gitster committed August 22, 2010
  2. npitre

    fix >4GiB source delta assertion failure

    When people try insane things such as delta-compressing 4GiB files, they
    get this assertion:
    
    diff-delta.c:285: create_delta_index: Assertion `packed_entry - (struct index_entry *)mem == entries' failed.
    
    This happens because:
    
    1) the 'entries' variable is an unsigned int
    
    2) it is assigned with entries = (bufsize - 1) / RABIN_WINDOW
       (that itself is not a problem unless bufsize > 4G * RABIN_WINDOW)
    
    3) the buffer is indexed from top to bottom starting at
       "data = buffer + entries * RABIN_WINDOW" and the multiplication
       here does indeed overflows, making the resulting top of the buffer
       much lower than expected.
    
    This makes the number of actually produced index entries smaller than
    what was computed initially, hence the assertion.
    
    Furthermore, the current delta encoding format cannot represent offsets
    into a reference buffer with more than 32 bits anyway.  So let's just
    limit the number of entries to what the delta format can encode.
    
    Reported-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
    Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 21, 2010 gitster committed August 21, 2010
  3. Jens Lehmann

    t7403: add missing &&'s

    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 18, 2010 gitster committed August 21, 2010
  4. Mark Rada

    Tell ignore file about generate files in /gitweb/static

    Signed-off-by: Mark Rada <marada@uwaterloo.ca>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 21, 2010 gitster committed August 21, 2010

Aug 20, 2010

  1. Junio C Hamano

    Merge branch 'jc/maint-follow-rename-fix' into maint

    * jc/maint-follow-rename-fix:
      log: test for regression introduced in v1.7.2-rc0~103^2~2
      diff --follow: do call diffcore_std() as necessary
      diff --follow: do not waste cycles while recursing
    authored August 20, 2010
  2. Junio C Hamano

    Merge branch 'jn/maint-plug-leak' into maint

    * jn/maint-plug-leak:
      write-tree: Avoid leak when index refers to an invalid object
      read-tree: stop leaking tree objects
      core: Stop leaking ondisk_cache_entrys
    authored August 20, 2010
  3. Junio C Hamano

    Merge branch 'jn/fix-abbrev' into maint

    * jn/fix-abbrev:
      examples/commit: use --abbrev for commit summary
      checkout, commit: remove confusing assignments to rev.abbrev
      archive: abbreviate substituted commit ids again
    authored August 20, 2010
  4. Junio C Hamano

    Merge branch 'vs/doc-spell' into maint

    * vs/doc-spell:
      Documentation: spelling fixes
    authored August 20, 2010
  5. Junio C Hamano

    Merge branch 'jn/rebase-rename-am' into maint

    * jn/rebase-rename-am:
      rebase: protect against diff.renames configuration
      t3400 (rebase): whitespace cleanup
      Teach "apply --index-info" to handle rename patches
      t4150 (am): futureproof against failing tests
      t4150 (am): style fix
    authored August 20, 2010
  6. Junio C Hamano

    Merge branch 'jn/doc-pull' into maint

    * jn/doc-pull:
      Documentation: flesh out “git pull” description
    authored August 20, 2010
  7. Junio C Hamano

    Merge branch 'bc/use-more-hardlinks-in-install' into maint

    * bc/use-more-hardlinks-in-install:
      Makefile: make hard/symbolic links for non-builtins too
      Makefile: link builtins residing in bin directory to main git binary too
    authored August 20, 2010
  8. Junio C Hamano

    Merge branch 'tr/rfc-reset-doc' into maint

    * tr/rfc-reset-doc:
      Documentation/reset: move "undo permanently" example behind "make topic"
      Documentation/reset: reorder examples to match description
      Documentation/reset: promote 'examples' one section up
      Documentation/reset: separate options by mode
      Documentation/git-reset: reorder modes for soft-mixed-hard progression
    authored August 20, 2010
  9. Matthieu Moy

    xmalloc: include size in the failure message

    Out-of-memory errors can either be actual lack of memory, or bugs (like
    code trying to call xmalloc(-1) by mistake). A little more information
    may help tracking bugs reported by users.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 20, 2010 gitster committed August 20, 2010

Aug 19, 2010

  1. Junio C Hamano

    Git 1.7.2.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 19, 2010
  2. Junio C Hamano

    Merge branch 'tr/xsize-bits' into maint

    * tr/xsize-bits:
      xsize_t: check whether we lose bits
    authored August 19, 2010
  3. Junio C Hamano

    Merge branch 'jc/sha1-name-find-fix' into maint

    * jc/sha1-name-find-fix:
      sha1_name.c: fix parsing of ":/token" syntax
    
    Conflicts:
    	sha1_name.c
    authored August 19, 2010

Aug 18, 2010

  1. Junio C Hamano

    Merge branch 'sp/fix-smart-http-deadlock-on-error' into maint

    * sp/fix-smart-http-deadlock-on-error:
      smart-http: Don't deadlock on server failure
    authored August 18, 2010
  2. David Aguilar

    submodule sync: Update "submodule.<name>.url"

    When "git submodule sync" synchronizes the repository URLs
    it only updates submodules' .git/config.  However, the old
    URLs still exist in the super-project's .git/config.
    
    Update the super-project's configuration so that commands
    such as "git submodule update" use the URLs from .gitmodules.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 18, 2010 gitster committed August 18, 2010

Aug 16, 2010

  1. Ævar Arnfjörð Bjarmason

    log: test for regression introduced in v1.7.2-rc0~103^2~2

    Add a regression test for the git log -M --follow $diff_option bug
    introduced in v1.7.2-rc0~103^2~2, $diff_option being diff related
    options like -p, --stat, --name-only etc.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored August 15, 2010 gitster committed August 15, 2010
Something went wrong with that request. Please try again.