Permalink
Commits on Jan 30, 2010
  1. is_submodule_modified(): fix breakage with external GIT_INDEX_FILE

    gitster committed Jan 30, 2010
    Even when the environment was given for the top-level process, checking
    in the submodule work tree should use the index file associated with the
    work tree of the submodule.  Do not export it to the environment.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. RPM packaging: don't include foreign-scm-helper bits yet

    gitster committed Jan 30, 2010
    The files in /usr/lib/python* are only the support infrastructure for
    foreign scm interface yet to be written and/or shipped with git.  Don't
    include them in the binary package (this will also free us from Python
    dependency).
    
    When we ship with foreign scm interface, we will need to package these
    files with it in a separate subpackage, but we are not there yet.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. grep: Fix two memory leaks

    toofishes committed with gitster Jan 30, 2010
    We duplicate the grep_opt structure when using grep threads, but didn't
    later free either the patterns attached to this new structure or the
    structure itself.
    
    Signed-off-by: Dan McGee <dpmcgee@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. rebase: don't invoke the pager for each commit summary

    marcows committed with gitster Jan 30, 2010
    This regression was introduced by commit 0aa958d (rebase: replace
    antiquated sed invocation, 2010-01-24), which changed the invocation of
    "git rev-list | sed" to "git log".
    
    It can be reproduced by something like this:
    $ git rebase -s recursive origin/master
    
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Update draft release notes to 1.7.0

    gitster committed Jan 30, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Merge branch 'maint'

    gitster committed Jan 30, 2010
    * maint:
      fix memcpy of overlapping area
  7. Merge branch 'maint-1.6.5' into maint

    gitster committed Jan 30, 2010
    * maint-1.6.5:
      fix memcpy of overlapping area
  8. Implement pthread_cond_broadcast on Windows

    j6t committed with gitster Jan 29, 2010
    See http://www.cse.wustl.edu/~schmidt/win32-cv-1.html, section "The
    SignalObjectAndWait solution". But note that this implementation does not
    use SignalObjectAndWait (which is needed to achieve fairness, but we do
    not need fairness).
    
    Note that our implementations of pthread_cond_broadcast and
    pthread_cond_signal require that they are invoked with the mutex held that
    is used in the pthread_cond_wait calls.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. If deriving SVN_SSH from GIT_SSH on msys, also add quotes

    sschuberth committed with gitster Jan 23, 2010
    In contrast to GIT_SSH, SVN_SSH requires quotes for paths that contain
    spaces. As GIT_SSH will not work if it contains quotes, it is safe to
    assume it never contains quotes. Also, adding quotes to SVN_SSH for paths
    that do not contain spaces does no harm. So we always add quotes when
    deriving SVN_SSH from GIT_SSH on msys.
    
    This fixes msysGit issue 385, see
    http://code.google.com/p/msysgit/issues/detail?id=385
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 29, 2010
  1. Merge git://git.kernel.org/pub/scm/gitk/gitk

    gitster committed Jan 29, 2010
    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Update German translation
      gitk: Add French translation
      gitk: update Italian translation
      gitk: Update Swedish translation
      gitk: Adjust two equal strings which differed in whitespace
      gitk: Display submodule diffs with appropriate encoding
      gitk: Fix display of newly-created tags
      gitk: Enable gitk to create tags with messages
      gitk: Update Hungarian translation
      gitk: Add Hungarian translation
      gitk: Add "--no-replace-objects" option
  2. add shebang line to git-mergetool--lib.sh

    peff committed with gitster Jan 29, 2010
    Even though this script is expected to be sourced instead of
    executed on its own, the #!/bin/sh line provides simple
    documentation about what format the file is in.
    
    In particular, the lack of such a line was confusing the
    valgrind support of our test scripts, which assumed that any
    executable without a #!-line should be intercepted and run
    through valgrind. So during valgrind-enabled tests, any
    script sourcing this file actually sourced the valgrind
    interception script instead.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. fix off-by-one allocation error

    peff committed with gitster Jan 29, 2010
    Caught by valgrind in t5516. Reading the code shows we
    malloc enough for our string, but not trailing NUL.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. fix memcpy of overlapping area

    peff committed with gitster Jan 29, 2010
    Caught by valgrind in t5500, but it is pretty obvious from
    reading the code that this is shifting elements of an array
    to the left, which needs memmove.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. gitk: Update German translation

    cstim committed with paulusmack Jan 29, 2010
    Signed-off-by: Christian Stimming <stimming@tuhh.de>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  6. gitk: Add French translation

    Emmanuel Trillaud committed with paulusmack Jan 12, 2010
    Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com>
    Signed-off-by: Thomas Moulard <thomas.moulard@gmail.com>
    Signed-off-by: Guy Brand <gb@unistra.fr>
    Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  7. gitk: update Italian translation

    chunga committed with paulusmack Jan 29, 2010
    Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  8. gitk: Update Swedish translation

    nafmo committed with paulusmack Jan 29, 2010
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
Commits on Jan 28, 2010
  1. Merge branch 'maint'

    gitster committed Jan 28, 2010
    * maint:
      bash: don't offer remote transport helpers as subcommands
  2. bash: support 'git notes' and its subcommands

    szeder committed with gitster Jan 28, 2010
    ... and it will offer refs unless after -m or -F, because these two
    options require a non-ref argument.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. bash: don't offer remote transport helpers as subcommands

    szeder committed with gitster Jan 22, 2010
    Since commits a2d725b (Use an external program to implement fetching
    with curl, 2009-08-05) and c9e388b (Make the
    "traditionally-supported" URLs a special case, 2009-09-03) remote
    transport helpers like 'remote-ftp' and 'remote-curl' are offered by the
    completion script as available subcommands.  Not good, since they are
    helpers, therefore should not be offered, so filter them out.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. grep --quiet: finishing touches

    gitster committed Jan 28, 2010
    Name the option "--quiet" not "--quick", document it, and add tests.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. reject @{-1} not at beginning of object name

    peff committed with gitster Jan 28, 2010
    Something like foo@{-1} is nonsensical, as the @{-N} syntax
    is reserved for "the Nth last branch", and is not an actual
    reflog selector. We should not feed such nonsense to
    approxidate at all.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. fix parsing of @{-1}@{u} combination

    peff committed with gitster Jan 28, 2010
    Previously interpret_branch_name would see @{-1} and stop
    parsing, leaving the @{u} as cruft that provoked an error.
    Instead, we should recurse if there is more to parse.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. test combinations of @{} syntax

    peff committed with gitster Jan 28, 2010
    Now that we have several different types of @{} syntax, it
    is a good idea to test them together, which reveals some
    failures.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. rerere: fix too-short initialization

    peff committed with gitster Jan 28, 2010
    This was caused by a typo in the sizeof parameter, and meant
    we looked at uninitialized memory.  Caught by valgrind in
    t2030.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. t0101: use absolute date

    peff committed with gitster Jan 28, 2010
    The original version used relative approxidates, which don't
    reproduce as reliably as absolute ones. Commit 6c647a fixed
    this for one case, but missed the "silly" case.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. Merge branch 'fk/threaded-grep'

    gitster committed Jan 28, 2010
    * fk/threaded-grep:
      Threaded grep
      grep: expose "status-only" feature via -q
  11. Merge branch 'gp/maint-cvsserver'

    gitster committed Jan 28, 2010
    * gp/maint-cvsserver:
      git-cvsserver: allow regex metacharacters in CVSROOT
  12. tests: update tests that used to fail

    gitster committed Jan 28, 2010
    "diff --cc" output t4038 tests was fixed by b810cbb (diff --cc: a lost
    line at the beginning of the file is shown incorrectly, 2009-07-22), which
    was actually the commit that introduced this test..
    
    An error in "git merge -s resolve" t6035 tests was fixed by 730f728
    (unpack-trees.c: look ahead in the index, 2009-09-20).
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 27, 2010
  1. Merge branch 'jc/upstream-reflog'

    gitster committed Jan 27, 2010
    * jc/upstream-reflog:
      Fix log -g this@{upstream}
  2. Merge branch 'jc/maint-reflog-bad-timestamp'

    gitster committed Jan 27, 2010
    * jc/maint-reflog-bad-timestamp:
      t0101: use a fixed timestamp when searching in the reflog
      Update @{bogus.timestamp} fix not to die()
      approxidate_careful() reports errorneous date string
  3. Merge branch 'il/maint-colon-address'

    gitster committed Jan 27, 2010
    * il/maint-colon-address:
      Allow use of []-wrapped addresses in git://
      Support addresses with ':' in git-daemon
  4. Merge branch 'il/maint-xmallocz'

    gitster committed Jan 27, 2010
    * il/maint-xmallocz:
      Fix integer overflow in unpack_compressed_entry()
      Fix integer overflow in unpack_sha1_rest()
      Fix integer overflow in patch_delta()
      Add xmallocz()
  5. Merge branch 'jh/maint-config-file-prefix'

    gitster committed Jan 27, 2010
    * jh/maint-config-file-prefix:
      builtin-config: Fix crash when using "-f <relative path>" from non-root dir
  6. transport_get(): drop unnecessary check for !remote

    gitster committed Jan 27, 2010
    At the beginning of the function we make sure remote is not NULL, and
    the remainder of the funciton already depends on it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>