summaryrefslogtreecommitdiff
path: root/grep.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-07-26 16:05:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-26 18:13:44 (GMT)
commit3be18b47e4249a3e3f8ae9968abffc954c7e293a (patch)
tree39e44bd60b67333a66ed670ced5d90ed3d234e1f /grep.c
parent8c6d1f9807c67532e7fb545a944b064faff0f70b (diff)
downloadgit-3be18b47e4249a3e3f8ae9968abffc954c7e293a.zip
git-3be18b47e4249a3e3f8ae9968abffc954c7e293a.tar.gz
git-3be18b47e4249a3e3f8ae9968abffc954c7e293a.tar.bz2
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>
Diffstat (limited to 'grep.c')
0 files changed, 0 insertions, 0 deletions