| commit | 3be18b47e4249a3e3f8ae9968abffc954c7e293a | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Tue, 26 Jul 2016 16:05:43 +0000 (26 18:05 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 Jul 2016 18:13:44 +0000 (26 11:13 -0700) | ||
| tree | 39e44bd60b67333a66ed670ced5d90ed3d234e1f | treesnapshot (tar.gz zip) |
| parent | 8c6d1f9807c67532e7fb545a944b064faff0f70b | commitdiff |
t5520: verify that `pull --rebase` shows the helpful advice when failing
It was noticed by Brendan Forster last October that the builtin `git am`
regressed on that. Our hot fix reverted to spawning the recursive merge
instead of using it as a library function.
As we are about to revert that hot fix, after making the recursive merge a
true library function (i.e. a function that does not die() in case of
"normal" errors), let's add a test that verifies that we do not regress on
the same problem which made the hot fix necessary in the first place.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
It was noticed by Brendan Forster last October that the builtin `git am`
regressed on that. Our hot fix reverted to spawning the recursive merge
instead of using it as a library function.
As we are about to revert that hot fix, after making the recursive merge a
true library function (i.e. a function that does not die() in case of
"normal" errors), let's add a test that verifies that we do not regress on
the same problem which made the hot fix necessary in the first place.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t5520-pull.sh | diffblobblamehistory |