git/git-rebase.sh, branch v2.0.0

Merge branch 'km/avoid-non-function-return-in-rebase'

2014-04-21T17:42:46Z

Work around /bin/sh that does not like "return" at the top-level of a file that is dot-sourced from inside a function definition. * km/avoid-non-function-return-in-rebase: Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD" rebase: avoid non-function use of "return" on FreeBSD

Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"

2014-04-17T17:15:27Z

This reverts commit 99855ddf4bd319cd06a0524e755ab1c1b7d39f3b. The workaround 99855ddf introduced to deal with problematic "return" statements in scripts run by "dot" commands located inside functions only handles one part of the problem. The issue has now been addressed by not using "return" statements in this way in the git-rebase--*.sh scripts. This workaround is therefore no longer necessary, so clean up the code by reverting it. Signed-off-by: Kyle J. McKay Acked-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'bg/rebase-off-of-previous-branch'

2014-03-28T20:51:20Z

* bg/rebase-off-of-previous-branch: rebase: allow "-" short-hand for the previous branch

rebase: allow "-" short-hand for the previous branch

2014-03-19T17:52:51Z

Teach rebase the same shorthand as checkout and merge to name the branch to rebase the current branch on; that is, that "-" means "the branch we were previously on". Requested-by: Tim Chase Signed-off-by: Brian Gesiak Signed-off-by: Junio C Hamano

rebase: add the --gpg-sign option

2014-02-11T22:48:20Z

Signed-off-by: Nicolas Vigier Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

rebase: parse options in stuck-long mode

2014-02-11T22:48:05Z

There is no functional change. The reason for this change is to be able to add a new option taking an optional argument. Signed-off-by: Nicolas Vigier Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

rebase: don't try to match -M option

2014-02-03T20:13:55Z

The -M option does not exist in OPTIONS_SPEC, so there is no use to try to find it. Signed-off-by: Nicolas Vigier Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

rebase: remove useless arguments check

2014-02-03T20:13:44Z

Remove a check on the number of arguments for --onto and -x options. It is not possible for $# to be <= 2 at this point : - if --onto or -x has an argument, git rev-parse --parseopt will provide something like this : set -- --onto 'x' -- when parsing the "--onto" option, $# will be 3 or more if there are other options. - if --onto or -x doesn't have an argument, git rev-parse --parseopt will exit with an error and display usage information. Signed-off-by: Nicolas Vigier Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

git-sh-setup.sh: add variable to use the stuck-long mode

2014-02-03T20:11:10Z

If the variable $OPTIONS_STUCKLONG is not empty, then rev-parse option parsing is done in --stuck-long mode. Signed-off-by: Nicolas Vigier Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

rebase: fix fork-point with zero arguments

2014-01-09T23:05:26Z

When no arguments are specified, $switch_to is empty so we end up passing the empty string to "git merge-base --fork-point", which causes an error. git-rebase carries on at this point, but in fact we have failed to apply the fork-point operation. It turns out that the test in t3400 that was meant to test this didn't actually need the fork-point behaviour, so enhance it to make sure that the fork-point is applied correctly. The modified test fails without the change to git-rebase.sh in this patch. Reported-by: Andreas Krey Signed-off-by: John Keeping Signed-off-by: Junio C Hamano