Merge pull request #55530 from cblecker/git-rsync

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix .git rsync filter for prow **What this PR does / why we need it**: The prow bootstrap job uses the [`--separate-git-dir`](https://git-scm.com/docs/git-init#git-init---separate-git-dirltgitdirgt) flag when cloning the target repo. This leaves a text file named `./.git` containing the path to the git dir instead of the typical `./.git/` directory right in the working tree. This modifies the rsync filter to filter out this file *or* directory, so that jobs that use the build container system aren't tripped up by a text file that points to a directory that doesn't exist in the build container system. **Release note**: ```release-note NONE ```

Merge pull request #55530 from cblecker/git-rsync
bfe581d9 · Kubernetes Submit Queue · GitHub · 95038553 · 555b4215 · bfe581d9
Unverified Commit bfe581d9 authored Nov 12, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

common.sh build/common.sh +1 -1

No files found.
--- a/build/common.sh
+++ b/build/common.sh
@@ -720,7 +720,7 @@ function kube::build::sync_to_container() {
  # necessary.
  kube::build::rsync \
    --delete \
-    --filter='H /.git/' \
+    --filter='H /.git' \
    --filter='- /.make/' \
    --filter='- /_tmp/' \
    --filter='- /_output/' \