Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Mar 11, 2007
  1. git-branch, git-checkout: autosetup for remote branch tracking

    Paolo Bonzini authored Junio C Hamano committed
    In order to track and build on top of a branch 'topic' you track from
    your upstream repository, you often would end up doing this sequence:
    
      git checkout -b mytopic origin/topic
      git config --add branch.mytopic.remote origin
      git config --add branch.mytopic.merge refs/heads/topic
    
    This would first fork your own 'mytopic' branch from the 'topic'
    branch you track from the 'origin' repository; then it would set up two
    configuration variables so that 'git pull' without parameters does the
    right thing while you are on your own 'mytopic' branch.
    
    This commit adds a --track option to git-branch, so that "git
    branch --track mytopic origin/topic" performs the latter two actions
    when creating your 'mytopic' branch.
    
    If the configuration variable branch.autosetupmerge is set to true, you
    do not have to pass the --track option explicitly; further patches in
    this series allow setting the variable with a "git remote add" option.
    The configuration variable is off by default, and there is a --no-track
    option to countermand it even if the variable is set.
    
    Signed-off-by: Paolo Bonzini  <bonzini@gnu.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jan 8, 2007
  1. @awhitcroft

    short i/o: clean up the naming for the write_{in,or}_xxx family

    awhitcroft authored Junio C Hamano committed
    We recently introduced a write_in_full() which would either write
    the specified object or emit an error message and fail.  In order
    to fix the read side we now want to introduce a read_in_full()
    but without an error emit.  This patch cleans up the naming
    of this family of calls:
    
    1) convert the existing write_or_whine() to write_or_whine_pipe()
       to better indicate its pipe specific nature,
    2) convert the existing write_in_full() calls to write_or_whine()
       to better indicate its nature,
    3) introduce a write_in_full() providing a write or fail semantic,
       and
    4) convert write_or_whine() and write_or_whine_pipe() to use
       write_in_full().
    
    Signed-off-by: Andy Whitcroft <apw@shadowen.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 14, 2006
  1. @chriscool

    Fix tracing when GIT_TRACE is set to an empty string.

    chriscool authored Junio C Hamano committed
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Sep 13, 2006
  1. @chriscool

    Fix space in string " false" problem in "trace.c".

    chriscool authored Junio C Hamano committed
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Sep 2, 2006
  1. @chriscool

    Trace into a file or an open fd and refactor tracing code.

    chriscool authored Junio C Hamano committed
    If GIT_TRACE is set to an absolute path (starting with a
    '/' character), we interpret this as a file path and we
    trace into it.
    
    Also if GIT_TRACE is set to an integer value greater than
    1 and lower than 10, we interpret this as an open fd value
    and we trace into it.
    
    Note that this behavior is not compatible with the
    previous one.
    
    We also trace whole messages using one write(2) call to
    make sure messages from processes do net get mixed up in
    the middle.
    
    This patch makes it possible to get trace information when
    running "make test".
    
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Something went wrong with that request. Please try again.