| commit | 1301ad8edeb9a8301fbc4c1e4fbf1b7ad098add9 | |
| author | Peter Grayson <pete@jpgrayson.net> | |
| Tue, 26 Oct 2021 19:58:24 +0000 (26 15:58 -0400) | ||
| committer | Peter Grayson <pete@jpgrayson.net> | |
| Tue, 26 Oct 2021 20:23:25 +0000 (26 16:23 -0400) | ||
| tree | 0b1a93f2b17960d353ad6509b1a10d503d6ef7a9 | treesnapshot (tar.gz zip) |
| parent | 790cce23b351ca074fdfbc00e15cdbbf9843b71c | commitdiff |
Update tests for updated git pull semantics
As of approximately Git 2.27, using `git pull` without any of the
pull.rebase or pull.ff config options or the --rebase=false command line
option will cause the pull to abort with a warning message. The test
suite is updated to set pull.rebase=false, which was the default
behavior, in various contexts that require it.
Also, pull semantics have also changed such that the pull strategy
used in t2110-pull-stack.sh is invalidated. Those tests are modified to
use a more robust fetch and reset strategy.
Signed-off-by: Peter Grayson <pete@jpgrayson.net>
As of approximately Git 2.27, using `git pull` without any of the
pull.rebase or pull.ff config options or the --rebase=false command line
option will cause the pull to abort with a warning message. The test
suite is updated to set pull.rebase=false, which was the default
behavior, in various contexts that require it.
Also, pull semantics have also changed such that the pull strategy
used in t2110-pull-stack.sh is invalidated. Those tests are modified to
use a more robust fetch and reset strategy.
Signed-off-by: Peter Grayson <pete@jpgrayson.net>
| t/t1301-repair.sh | diffblobblamehistory | |
| t/t2101-pull-policy-pull.sh | diffblobblamehistory | |
| t/t2110-pull-stack.sh | diffblobblamehistory |