delta/git.git/git-rebase--am.sh, branch jk/robustify-parse-commit

am: return control to caller, for housekeeping

2013-05-13T06:20:07+00:00

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 
Signed-off-by: Junio C Hamano

rebase-am: explicitly disable cover-letter

2013-04-15T03:01:07+00:00

If the user has a cover-letter configuration set to anything other
than 'false', 'git format-patch' may generate a cover letter, which
has no place in "format-patch | am" pipeline.

The internal invocation of format-patch must explicitly override the
configuration from the command line, just like --src-prefix and other
options already do.

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

rebase: Handle cases where format-patch fails

2012-10-11T18:54:49+00:00

'format-patch' could fail due to reasons such as out of memory. Such
failures are not detected or handled, which causes rebase to incorrectly
think that it completed successfully and continue with cleanup. i.e.
calling move_to_original_branch

Instead of using a pipe, we separate 'format-patch' and 'am' by using an
intermediate file. This gurantees that we can invoke 'am' with the
complete input, or not invoking 'am' at all if 'format-patch' failed.

Also remove the use of '&&' at the end of the if-block, and rearrange
the 'write_basic_state' and 'move_to_original_branch' to make the logic
flow a bit better and easier to read.

Signed-off-by: Andrew Wong 
Signed-off-by: Junio C Hamano

rebase: don't source git-sh-setup twice

2012-06-26T20:17:50+00:00

The git-sh-setup script is already sourced in git-rebase.sh before
calling into git-rebase--(am|interactive|merge).sh. There are no other
callers of these scripts. It is therefore unnecessary to source
git-sh-setup again in them.

Signed-off-by: Junio C Hamano

git-rebase: add keep_empty flag

2012-04-24T22:24:14+00:00

Add a command line switch to git-rebase to allow a user the ability to specify
that they want to keep any commits in a series that are empty.

When git-rebase's type is am, then this option will automatically keep any
commit that has a tree object identical to its parent.

This patch changes the default behavior of interactive rebases as well.  With
this patch, git-rebase -i will produce a revision set passed to
git-revision-editor, in which empty commits are commented out.  Empty commits
may be kept manually by uncommenting them.  If the new --keep-empty option is
used in an interactive rebase the empty commits will automatically all be
uncommented in the editor.

Signed-off-by: Neil Horman 
Signed-off-by: Junio C Hamano

git-rebase--am: remove unnecessary --3way option

2011-02-10T22:08:10+00:00

Since 22db240 (git-am: propagate --3way options as well, 2008-12-04),
the --3way has been propageted across failure, so it is since
pointless to pass it to git-am when resuming.

Signed-off-by: Martin von Zweigbergk 
Signed-off-by: Junio C Hamano

rebase: extract code for writing basic state

2011-02-10T22:08:09+00:00

Extract the code for writing the state to rebase-apply/ or
rebase-merge/ when a rebase is initiated. This will make it easier to
later make both interactive and non-interactive rebase remember the
options used.

Note that non-interactive rebase stores the sha1 of the original head
in a file called orig-head, while interactive rebase stores it in a
file called head. Change this by writing to orig-head in both
cases. When reading, try to read from orig-head. If that fails, read
from head instead. This protects users who upgraded git while they had
an ongoing interactive rebase, while still making it possible to
remove the code that reads from head at some point in the future.

Helped-by: Thomas Rast 
Signed-off-by: Martin von Zweigbergk 
Signed-off-by: Junio C Hamano

rebase: extract am code to new source file

2011-02-10T22:08:09+00:00

Extract the code for am-based rebase to git-rebase--am.sh.

Suggested-by: Johannes Sixt 
Signed-off-by: Martin von Zweigbergk 
Signed-off-by: Junio C Hamano