Merge branch 'tb/t5520-reflog-expire' into dk/stash-apply-index-incore

* tb/t5520-reflog-expire:
  t5520: don't expire reflogs where it matters

t/t5520-pull.sh

@@ -35,6 +35,12 @@ test_pull_autostash_fail () {
 }
 
 test_expect_success setup '
+	# Commit dates are hardcoded to 2005, and the reflog entries will have
+	# a matching timestamp. Maintenance may thus immediately expire
+	# reflogs if it was running.
+	git config set gc.reflogExpire never &&
+	git config set gc.reflogExpireUnreachable never &&
+
 	echo file >file &&
 	git add file &&
 	git commit -a -m original