Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore

diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index f13a194243271cfd6f5c352cadb8f4695c78ad66..f4e6450d6a88ae0abd158e52634c47a23872ad2c 100755 (executable)
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -31,7 +31,7 @@ test_cmp_rev () {
 }
 
 test_expect_success setup '
-       git config advice.detachedhead false
+       git config advice.detachedhead false &&
        echo unrelated >unrelated &&
        git add unrelated &&
        test_commit initial foo a &&
@@ -67,7 +67,7 @@ test_expect_success 'cherry-pick mid-cherry-pick-sequence' '
 
 test_expect_success 'cherry-pick persists opts correctly' '
        pristine_detach initial &&
-       test_expect_code 128 git cherry-pick -s -m 1 --strategy=recursive -X patience -X ours base..anotherpick &&
+       test_expect_code 128 git cherry-pick -s -m 1 --strategy=recursive -X patience -X ours initial..anotherpick &&
        test_path_is_dir .git/sequencer &&
        test_path_is_file .git/sequencer/head &&
        test_path_is_file .git/sequencer/todo &&