projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a03b555) | patch
t5520: make test_pull_autostash() accept expect_parent_num
authorDenton Liu <liu.denton@gmail.com>
Tue, 7 Apr 2020 14:28:08 +0000 (10:28 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Apr 2020 16:28:02 +0000 (09:28 -0700)
commitf8a178580719a93040a49cf25624f1d56d0147f1
tree611961be6b842c0d14e7f28c6392440a0d8a6650tree | snapshot
parenta03b55530ab844974b7058042a015fcfcd9e7a53commit | diff
t5520: make test_pull_autostash() accept expect_parent_num

Before, test_pull_autostash() was hardcoded to run
`test_cmp_rev HEAD^ copy` to test that a rebase happened. However, in a
future patch, we plan on testing merging as well. Make
test_pull_autostash() accept a parent number as an argument so that, in
the future, we can test if a merge happened in addition to a rebase.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t5520-pull.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.