git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1662297)
t5520: test --[no-]autostash with pull.rebase=true
authorMehul Jain <redacted>
Sat, 2 Apr 2016 17:58:32 +0000 (23:28 +0530)
committerJunio C Hamano <redacted>
Mon, 4 Apr 2016 18:15:02 +0000 (11:15 -0700)
commit450dd1dce1fbf6a6743e74d6aef750068fc5069c
tree0ba7224831ac29269f72255a18934c15d3653316tree | snapshot
parent16622979f8eaf864da5cf932d3d60de7c7d40d7dcommit | diff
t5520: test --[no-]autostash with pull.rebase=true

The "--[no-]autostash" options for git-pull are only valid in
rebase mode (i.e. either --rebase is used or pull.rebase=true).
Existing tests already check the cases when --rebase is used but
fail to check for pull.rebase=true case.

Add two new tests to check that the --[no-]autostash options work
with pull.rebase=true.

Signed-off-by: Mehul Jain <redacted>
Reviewed-by: Eric Sunshine <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t5520-pull.sh diff | blob | history
git clone https://git.99rst.org/PROJECT