tree-diff: convert diff_root_tree_sha1() to just call diff_tree_sha1 with old=NULL
[gitweb.git] / t / t3001-ls-files-others-exclude.sh
index b3814cdb42f380f234f3fb423cabc5c634f1c854..b2798feef7316e74584058f594e97af01cb5065e 100755 (executable)
@@ -103,7 +103,7 @@ test_expect_success \
      test_cmp expect output'
 
 test_expect_success 'restore gitignore' '
-       git checkout $allignores &&
+       git checkout --ignore-skip-worktree-bits $allignores &&
        rm .git/index
 '
 
@@ -115,7 +115,7 @@ EOF
 
 git config core.excludesFile excludes-file
 
-git status | grep "^#  " > output
+git -c status.displayCommentPrefix=true status | grep "^#      " > output
 
 cat > expect << EOF
 #      .gitignore