Should all of the tests before "setup for avoiding reapplying old
patches" fail or be skipped, the repo "dst" will not have fetched the
updated refs from origin. To be resilient against such failures, run
"git fetch origin".
Signed-off-by: Paul Tan <pyokagan@xxxxxxxxx>
---
Notes:
* This is a new patch in the patch series.
t/t5520-pull.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 9107991..d97a575 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -461,6 +461,7 @@ test_expect_success 'git pull --rebase detects upstreamed changes' '
test_expect_success 'setup for avoiding reapplying old patches' '
(cd dst &&
test_might_fail git rebase --abort &&
+ git fetch origin &&
git reset --hard origin/master
) &&
git clone --bare src src-replace.git &&
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html