Revert of Skip apply_gerrit rebase when there is a rebase failure

Revert of Skip apply_gerrit rebase when there is a rebase failure (patchset #2 id:20001 of https://codereview.chromium.org/2328313002/ )

Reason for revert:
The "git rebase --abort" should only happen when there is a failure during rebase not when it succeeds.

Original issue's description:
> Skip apply_gerrit rebase when there is a rebase failure.
> 
> Not doing so causes a failure in the 'git checkout $base_rev' step as visible here: https://build.chromium.org/p/client.skia.fyi/builders/Infra-PerCommit-Trybot/builds/4995
> This causes the checkout to remain in the "rebase in progress" state.
> 
> 
> BUG=chromium:645955
> BUG=skia:5749
> 
> Committed: https://chromium.googlesource.com/chromium/tools/depot_tools/+/9736fe8938e67337bb45dccf79ae8699b9625fa6

TBR=agable@chromium.org,andybons@chromium.org,tandrii@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:645955
Committed: https://chromium.googlesource.com/chromium/tools/depot_tools/+/b94038585684b350b2d50c43e39e8fec7b22f3c6

[rmistry, 2016-09-12 18:45:29]

The CQ bit was checked by rmistry@google.com

[rmistry, 2016-09-12 18:45:29]

Created Revert of Skip apply_gerrit rebase when there is a rebase failure

[commit-bot: I haz the power, 2016-09-12 18:45:37]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-12 18:45:38]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-12 18:45:39]

No L-G-T-M from a valid reviewer yet. 
CQ run can only be started by full committers or once the patch has
received an L-G-T-M from a full committer.
Even if an L-G-T-M may have been provided, it was from a non-committer,
_not_ a full super star committer.
Committers are members of the group "project-infra-committers".
Note that this has nothing to do with OWNERS files.

[rmistry1, 2016-09-12 18:46:22]

rmistry@chromium.org changed reviewers:
+ rmistry@chromium.org

[rmistry1, 2016-09-12 18:46:22]

The CQ bit was checked by rmistry@chromium.org

[rmistry1, 2016-09-12 18:46:23]

lgtm

[commit-bot: I haz the power, 2016-09-12 18:46:26]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-12 18:46:33]

Description was changed from

==========
Revert of Skip apply_gerrit rebase when there is a rebase failure (patchset #2
id:20001 of https://codereview.chromium.org/2328313002/ )

Reason for revert:
The "git rebase --abort" should only happen when there is a failure during
rebase not when it succeeds.

Original issue's description:
> Skip apply_gerrit rebase when there is a rebase failure.
> 
> Not doing so causes a failure in the 'git checkout $base_rev' step as visible
here:
https://build.chromium.org/p/client.skia.fyi/builders/Infra-PerCommit-Trybot/...
> This causes the checkout to remain in the "rebase in progress" state.
> 
> 
> BUG=chromium:645955
> BUG=skia:5749
> 
> Committed:
https://chromium.googlesource.com/chromium/tools/depot_tools/+/9736fe8938e673...

TBR=agable@chromium.org,andybons@chromium.org,tandrii@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:645955
==========

to

==========
Revert of Skip apply_gerrit rebase when there is a rebase failure (patchset #2
id:20001 of https://codereview.chromium.org/2328313002/ )

Reason for revert:
The "git rebase --abort" should only happen when there is a failure during
rebase not when it succeeds.

Original issue's description:
> Skip apply_gerrit rebase when there is a rebase failure.
> 
> Not doing so causes a failure in the 'git checkout $base_rev' step as visible
here:
https://build.chromium.org/p/client.skia.fyi/builders/Infra-PerCommit-Trybot/...
> This causes the checkout to remain in the "rebase in progress" state.
> 
> 
> BUG=chromium:645955
> BUG=skia:5749
> 
> Committed:
https://chromium.googlesource.com/chromium/tools/depot_tools/+/9736fe8938e673...

TBR=agable@chromium.org,andybons@chromium.org,tandrii@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:645955

Committed:
https://chromium.googlesource.com/chromium/tools/depot_tools/+/b94038585684b3...
==========

[commit-bot: I haz the power, 2016-09-12 18:46:34]

Committed patchset #1 (id:1) as
https://chromium.googlesource.com/chromium/tools/depot_tools/+/b94038585684b3...