Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jan 10, 2007
  1. @spearce

    Disallow working directory commands in a bare repository.

    spearce authored Junio C Hamano committed
    If the user tries to run a porcelainish command which requires
    a working directory in a bare repository they may get unexpected
    results which are difficult to predict and may differ from command
    to command.
    
    Instead we should detect that the current repository is a bare
    repository and refuse to run the command there, as there is no
    working directory associated with it.
    
    [jc: updated Shawn's original somewhat -- bugs are mine.]
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 28, 2006
  1. @spearce

    Allow git-merge to select the default strategy.

    spearce authored Junio C Hamano committed
    Now that git-merge knows how to use the pull.{twohead,octopus}
    configuration options to select the default merge strategy there
    is no reason for git-pull to do the same immediately prior to
    invoking git-merge.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. @spearce

    Ensure `git-pull` fails if `git-merge` fails.

    spearce authored Junio C Hamano committed
    If git-merge exits with a non-zero exit status so should git-pull.
    This way the caller of git-pull knows the task did not complete
    successfully simply by checking the process exit status.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. @spearce

    Use GIT_REFLOG_ACTION environment variable instead.

    spearce authored Junio C Hamano committed
    Junio rightly pointed out that the --reflog-action parameter
    was starting to get out of control, as most porcelain code
    needed to hand it to other porcelain and plumbing alike to
    ensure the reflog contained the top-level user action and
    not the lower-level actions it invoked.
    
    At Junio's suggestion we are introducing the new set_reflog_action
    function to all shell scripts, allowing them to declare early on
    what their default reflog name should be, but this setting only
    takes effect if the caller has not already set the GIT_REFLOG_ACTION
    environment variable.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Jul 11, 2006
  1. @spearce

    Log ref changes made by git-merge and git-pull.

    spearce authored Junio C Hamano committed
    When git-merge updates HEAD as a result of a merge record what
    happened during the merge into the reflog associated with HEAD
    (if any).  The log reports who caused the update (git-merge or
    git-pull, by invoking git-merge), what the remote ref names were
    and the type of merge process used.
    
    The merge information can be useful when reviewing a reflog for
    a branch such as `master` where fast forward and trivial in index
    merges might be common as the user tracks an upstream.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. @spearce

    Log ref changes made by git-fetch and git-pull.

    spearce authored Junio C Hamano committed
    When git-fetch updates a reference record in the associated reflog
    what type of update took place and who caused it (git-fetch or
    git-pull, by invoking git-fetch).
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Something went wrong with that request. Please try again.