Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jun 17, 2013
  1. @artagnon @gitster

    am: handle stray $dotest directory

    artagnon authored gitster committed
    The following bug has been observed:
    
      $ git am  # no input file
      ^C
      $ git am --abort
      Resolve operation not in progress, we are not resuming.
    
    This happens because the following test fails:
    
      test -d "$dotest" && test -f "$dotest/last" && test -f "$dotest/next"
    
    and the codepath for an "am in-progress" is not executed.  It falls back
    to the codepath that treats this as a "fresh execution".  Before
    rr/rebase-autostash, this condition was
    
      test -d "$dotest"
    
    It would incorrectly execute the "normal" am --abort codepath:
    
      git read-tree --reset -u HEAD ORIG_HEAD
      git reset ORIG_HEAD
    
    by incorrectly assuming that an am is "in progress" (i.e. ORIG_HEAD
    etc. was written during the previous execution).
    
    Notice that
    
      $ git am
      ^C
    
    executes nothing of significance, is equivalent to
    
      $ mkdir .git/rebase-apply
    
    Therefore, the correct solution is to treat .git/rebase-apply as a
    "stray directory" and remove it on --abort in the fresh-execution
    codepath.  Also ensure that we're not called with --rebasing from
    git-rebase--am.sh; in that case, it is the responsibility of the caller
    to handle and stray directories.
    
    While at it, tell the user to run "git am --abort" to get rid of the
    stray $dotest directory, if she attempts anything else.
    
    Reported-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 13, 2013
  1. @artagnon @gitster

    am: return control to caller, for housekeeping

    artagnon authored gitster committed
    We only need to do these two tasks
    
        git gc --auto
        rm -fr "$dotest"
    
    ourselves if the script was invoked as a standalone program; when
    invoked with --rebasing (from git-rebase--am.sh), cascade control back
    to the ultimate caller git-rebase.sh to do this for us.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @artagnon @gitster

    am: tighten a conditional that checks for $dotest

    artagnon authored gitster committed
    In preparation for a later patch that creates $dotest/autostash in
    git-rebase.sh before anything else happens, don't assume that the
    presence of a $dotest directory implies the existence of the
    $dotest/next and $dotest/last files.  Look for them explicitly.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 2, 2010
  1. @artagnon @gitster

    git am: Remove stray error message from sed

    artagnon authored gitster committed
    When --continue is invoked without any changes, the following stray
    error message appears- sed: can't read $dotest/final-commit: No such
    file or directory. Remove this by making sure that the file actually
    exists.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @artagnon @gitster

    git am: Display some help text when patch is empty

    artagnon authored gitster committed
    When a patch is found to be empty, prompt the user to use either
    --skip or --abort.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @artagnon @gitster

    git am: Set cmdline globally

    artagnon authored gitster committed
    Set the $cmdline variable globally, and not in stop_here_user_resolve
    so it can be used in other code fragments as well.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.