diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2019-08-25 05:12:00 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-08-26 12:34:56 -0700 |
| commit | 793ac7e309437e2225825370a9c7a0f1ccb39480 (patch) | |
| tree | c28cd593591316bab0701bcf852b03957e6eb49d /xdiff-interface.c | |
| parent | t3431: add rebase --fork-point tests (diff) | |
| download | tgif-793ac7e309437e2225825370a9c7a0f1ccb39480.tar.xz | |
t3432: test rebase fast-forward behavior
When rebase is run on a branch that can be fast-forwarded, this should
automatically be done. Create test to ensure this behavior happens.
There are some cases that currently don't pass. The first case is where
a feature and master have diverged, running
"git rebase master... master" causes a full rebase to happen even though
a fast-forward should happen.
The second case is when we are doing "git rebase --fork-point" and a
fork-point commit is found. Once again, a full rebase happens even
though a fast-forward should happen.
Mark these cases as failure so we can fix it later.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions