Permalink
Commits on Oct 17, 2009
  1. GIT 1.6.5.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 17, 2009
  2. Merge branch 'maint-1.6.4' into maint

    * maint-1.6.4:
      grep: do not segfault when -f is used
    gitster committed Oct 17, 2009
  3. grep: do not segfault when -f is used

    "git grep" would segfault if its -f option was used because it would
    try to use an uninitialized strbuf, so initialize the strbuf.
    
    Thanks to Johannes Sixt <j.sixt@viscovery.net> for the help with the
    test cases.
    
    Signed-off-by: Matt Kraai <kraai@ftbfs.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    kraai committed with gitster Oct 16, 2009
Commits on Oct 14, 2009
  1. sha1_file: Fix infinite loop when pack is corrupted

    Some types of corruption to a pack may confuse the deflate stream
    which stores an object.  In Andy's reported case a 36 byte region
    of the pack was overwritten, leading to what appeared to be a valid
    deflate stream that was trying to produce a result larger than our
    allocated output buffer could accept.
    
    Z_BUF_ERROR is returned from inflate() if either the input buffer
    needs more input bytes, or the output buffer has run out of space.
    Previously we only considered the former case, as it meant we needed
    to move the stream's input buffer to the next window in the pack.
    
    We now abort the loop if inflate() returns Z_BUF_ERROR without
    consuming the entire input buffer it was given, or has filled
    the entire output buffer but has not yet returned Z_STREAM_END.
    Either state is a clear indicator that this loop is not working
    as expected, and should not continue.
    
    This problem cannot occur with loose objects as we open the entire
    loose object as a single buffer and treat Z_BUF_ERROR as an error.
    
    Reported-by: Andy Isaacson <adi@hexapodia.org>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Acked-by: Nicolas Pitre <nico@fluxnic.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    spearce committed with gitster Oct 14, 2009
  2. change throughput display units with fast links

    Switch to MiB/s when the connection is fast enough (i.e. on a LAN).
    
    Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    npitre committed with gitster Oct 14, 2009
  3. clone: Supply the right commit hash to post-checkout when -b is used

    When we use -b <branch>, we may checkout something else than what the
    remote's HEAD references, but we still used remote_head to supply the
    new ref value to the post-checkout hook, which is wrong.
    
    So instead of using remote_head to find the value to be passed to the
    post-checkout hook, we have to use our_head_points_at, which is always
    correctly setup, even if -b is not used.
    
    This also fixes a segfault when "clone -b <branch>" is used with a
    remote repo that doesn't have a valid HEAD, as in such a case
    remote_head is NULL, but we still tried to access it.
    
    Reported-by: Devin Cofer <ranguvar@archlinux.us>
    Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dotdash committed with gitster Oct 13, 2009
  4. remote-curl: add missing initialization of argv0_path

    All programs, in particular also the stand-alone programs (non-builtins)
    must call git_extract_argv0_path(argv[0]) in order to help builds that
    derive the installation prefix at runtime, such as the MinGW build.
    Without this call, the program segfaults (or raises an assertion
    failure).
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Tested-by: Michael Wookey <michaelwookey@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    j6t committed with gitster Oct 13, 2009
Commits on Oct 13, 2009
  1. Merge branch 'maint-1.6.4' into maint

    * maint-1.6.4:
      git-stash documentation: mention default options for 'list'
    gitster committed Oct 13, 2009
Commits on Oct 12, 2009
  1. git-stash documentation: mention default options for 'list'

    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Miklos Vajna committed with gitster Oct 12, 2009
Commits on Oct 10, 2009
  1. GIT 1.6.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 10, 2009
  2. git-svn: hide find_parent_branch output in double quiet mode

    Hide find_parent_branch logging when -qq is specified.
    This eliminates more unnecessary output when run from cron, e.g.:
    
    Found possible branch point:
    http://undernet-ircu.svn.sourceforge.net/svnroot/undernet-ircu/ircu2/trunk =>
    http://undernet-ircu.svn.sourceforge.net/svnroot/undernet-ircu/ircu2/branches/authz,
    1919
    Found branch parent: (authz) ea061d76aea985dc0208d36fa5e0b2249b698557
    Following parent with do_switch
    Successfully followed parent
    
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    nomis committed with gitster Oct 9, 2009
  3. Documentation: clone: clarify discussion of initial branch

    When saying the initial branch is equal to the currently active
    remote branch, it is probably intended that the branch heads
    point to the same commit.  Maybe it would be more useful to a
    new user to emphasize that the tree contents and history are the
    same.
    
    More important, probably, is that this new branch is set up so
    that "git pull" merges changes from the corresponding remote
    branch.  The next paragraph addresses that directly.  What the
    reader needs to know to begin with is that (1) the initial branch
    is your own; if you do not pull, it won't get updated, and that
    (2) the initial branch starts out at the same commit as the
    upstream.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 9, 2009
Commits on Oct 9, 2009
  1. Merge branch 'rs/maint-archive-prefix'

    * rs/maint-archive-prefix:
      Git archive and trailing "/" in prefix
    gitster committed Oct 9, 2009
  2. Merge branch 'fc/mutt-alias'

    * fc/mutt-alias:
      send-email: fix mutt regex for grouped aliases
    gitster committed Oct 9, 2009
  3. Merge branch 'ef/msvc-noreturn'

    * ef/msvc-noreturn:
      add NORETURN_PTR for function pointers
      increase portability of NORETURN declarations
    gitster committed Oct 9, 2009
  4. Merge branch 'jk/reflog-date'

    * jk/reflog-date:
      improve reflog date/number heuristic
    gitster committed Oct 9, 2009
  5. Merge branch 'ch/am-header'

    * ch/am-header:
      git-am: force egrep to use correct characters set
      git-am: fixed patch_format detection according to RFC2822
    gitster committed Oct 9, 2009
  6. bash: add support for 'git replace'

    Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bjorng committed with gitster Oct 9, 2009
  7. completion: fix alias listings with newlines

    Aliases with newlines have been a problem since commit 56fc25f (Bash
    completion support for remotes in .git/config., 2006-11-05). The chance
    of the problem occurring has been slim at best, until commit 518ef8f
    (completion: Replace config --list with --get-regexp, 2009-09-11)
    removed the case statement introduced by commit 56fc25f. Before removing
    the case statement, most aliases with newlines would work unless they
    were specially crafted as follows
    
    [alias]
    	foo = "log -1 --pretty='format:%s\nalias.error=broken'"
    
    After removing the case statement, a more benign alias like
    
    [alias]
    	whowhat = "log -1 --pretty='format:%an <%ae>\n%s'"
    	wont-complete = ...
    
    would cause the completion to break badly.
    
    For now, revert the removal of the case statement until someone comes up
    with a better way to get keys from git-config.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bebarino committed with gitster Oct 9, 2009
  8. completion: fix completion of git <TAB><TAB>

    After commit 511a3fc (wrap git's main usage string., 2009-09-12), the
    bash completion for git commands includes COMMAND and [ARGS] when it
    shouldn't. Fix this by grepping more strictly for a line with git
    commands. It's doubtful whether git will ever have commands starting
    with anything besides numbers and letters so this should be fine. At
    least by being stricter we'll know when we break the completion earlier.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bebarino committed with gitster Oct 9, 2009
  9. import-tars: Add missing closing bracket

    This fixes an obvious syntax error that snuck in commit 7e78795:
    
      syntax error at /home/ingmar/bin//git-import-tars line 143, near "/^$/ { "
      syntax error at /home/ingmar/bin//git-import-tars line 145, near "} else"
      syntax error at /home/ingmar/bin//git-import-tars line 152, near "}"
    
    Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>
    Acked-and-Tested-by: Peter Krefting <peter@softwolves.pp.se>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ingmarv committed with gitster Oct 9, 2009
  10. racy-git.txt: explain nsec problem in more detail

    Idealists may want USE_NSEC to be the default on Linux some day.
    Point to a patch to better explain the requirements on
    filesystem code for that to happen.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 9, 2009
  11. Documentation: clarify "working tree" definition

    It is not necessarily obvious to a git novice what it means for a
    filesystem tree to be equal to the HEAD.  Spell it out.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 9, 2009
  12. Documentation: clarify branch creation

    The documentation seems to assume that the starting point for a new
    branch is the tip of an existing (ordinary) branch, but that is not
    the most common case.  More often, "git branch" is used to begin
    a branch from a remote-tracking branch, a tag, or an interesting
    commit (e.g. origin/pu^2).  Clarify the language so it can apply
    to these cases.  Thanks to Sean Estabrooks for the wording.
    
    Also add a pointer to the user's manual for the bewildered.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 9, 2009
  13. Documentation: branch: update --merged description

    Update the documentation for --merged and --no-merged to explain
    the meaning of the optional parameter introduced in commit 049716b
    (branch --merged/--no-merged: allow specifying arbitrary commit,
    2008-07-08).
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 9, 2009
  14. Documentation: clarify mergeoptions description

    Sounds better this way, at least to my ears.  ("The syntax and
    supported options of git merge" is a plural noun.  "the same"
    instead of "equal" sounds less technical and seems to convey
    the meaning better here.)
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 9, 2009
  15. Documentation: git fmt-merge-msg does not have to be a script

    The fmt-merge-message builtin can be invoked as "git fmt-merge-msg" rather
    than through the hard link in GIT_EXEC_PATH.  Although this is unlikely to
    confuse most script writers, it should not hurt to make the documentation
    a little clearer anyway.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 9, 2009
  16. Describe DOCBOOK_XSL_172, ASCIIDOC_NO_ROFF options in Makefile

    There is excellent documentation for these options in
    Documentation/Makefile, but some users may never find it.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Oct 9, 2009
  17. pull: improve advice for unconfigured error case

    There are several reasons a git-pull invocation might not
    have anything marked for merge:
    
      1. We're not on a branch, so there is no branch
         configuration.
    
      2. We're on a branch, but there is no configuration for
         this branch.
    
      3. We fetched from the configured remote, but the
         configured branch to merge didn't get fetched (either
         it doesn't exist, or wasn't part of the fetch refspec).
    
      4. We fetched from the non-default remote, but didn't
         specify a branch to merge. We can't use the configured
         one because it applies to the default remote.
    
      5. We fetched from a specified remote, and a refspec was
         given, but it ended up not fetching anything (this is
         actually hard to do; if the refspec points to a remote
         branch and it doesn't exist, then fetch will fail and
         we never make it to this code path. But if you provide
         a wildcard refspec like
    
           refs/bogus/*:refs/remotes/origin/*
    
         then you can see this failure).
    
    We have handled (1) and (2) for some time. Recently, commit
    a6dbf88 added code to handle case (3).
    
    This patch handles cases (4) and (5), which previously just
    fell under other cases, producing a confusing message.
    
    While we're at it, let's rewrap the text for case (3), which
    looks terribly ugly as it is.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Oct 5, 2009
  18. Merge git://git.bogomips.org/git-svn

    * git://git.bogomips.org/git-svn:
      git-svn: Avoid spurious errors when rewriteRoot is used.
    gitster committed Oct 9, 2009
  19. git-svn: Avoid spurious errors when rewriteRoot is used.

    After doing a rebase, git-svn checks that the SVN URL
    is what it expects. However, it does not account for
    rewriteRoot, which is a legitimate way for the URL
    to change. This produces a lot of spurious errors.
    
    [ew: fixed line wrapping]
    
    Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    angavrilov committed with Eric Wong Oct 9, 2009
  20. Merge branch 'ms/msvc'

    * ms/msvc:
      Fix the exit code of MSVC build scripts on cygwin
      Fix MSVC build on cygwin
    gitster committed Oct 9, 2009
  21. Merge branch 'maint'

    * maint:
      ls-files: die instead of fprintf/exit in -i error
    gitster committed Oct 9, 2009
  22. Makefile: add a note about the NO_MMAP setting on IRIX and IRIX64

    When git is compiled with the MIPSpro 7.4.4m compiler, and NO_PTHREADS is
    set, and NO_MMAP is _not_ set, then git segfaults when trying to access the
    first entry in a reflog.  If NO_PTHREADS is not set (which implies that the
    pthread library is linked in), or NO_MMAP _is_ set, then the segfault is
    not encountered.  The conservative choice has been made to set NO_MMAP in
    the Makefile to avoid this flaw.  The GNU C compiler does not produce this
    behavior.
    
    The segfault happens in refs.c:read_ref_at().  The mmap succeeds, and the
    loop is executed properly until rec is rewound into the first line (reflog
    entry) of the file.  The segfault is caught by test 28 of
    t1400-update-ref.sh which fails when 'git rev-parse --verify "master@{May 25
    2005}"' is called.
    
    So, add a comment in the Makefile to describe why NO_MMAP is set and as a
    hint to those who may be interested in unsetting it.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drafnel committed with gitster Oct 9, 2009