diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-03-03 09:11:54 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-03-04 13:31:04 +0900 |
| commit | c2d96293602bf6e8ffa1002cff8cb6faa3854815 (patch) | |
| tree | d0393b6cb89cdaf192cd697ffa435e02c8a6c04e /mergetools/meld | |
| parent | built-in rebase: use the correct reflog when switching branches (diff) | |
| download | tgif-c2d96293602bf6e8ffa1002cff8cb6faa3854815.tar.xz | |
built-in rebase: demonstrate that ORIG_HEAD is not set correctly
The ORIG_HEAD pseudo ref is supposed to refer to the original,
pre-rebase state after a successful rebase. Let's add a regression test
to prove that this regressed: With GIT_TEST_REBASE_USE_BUILTIN=false,
this test case passes, with GIT_TEST_REBASE_USE_BUILTIN=true (or unset),
it fails.
Reported by Nazri Ramliy.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/meld')
0 files changed, 0 insertions, 0 deletions