From 4038a5ec91ef3d12e65d53da9d4b026c86a883bd Mon Sep 17 00:00:00 2001
From: Bin Du <northtyphoon@gmail.com>
Date: Mon, 20 Aug 2018 08:17:05 -0700
Subject: [PATCH] [ACR] Ignore files in vcs (eg, .git) direcotry (#7087)

---
 src/command_modules/azure-cli-acr/HISTORY.rst               | 4 ++++
 .../azure-cli-acr/azure/cli/command_modules/acr/build.py    | 6 ++++--
 src/command_modules/azure-cli-acr/setup.py                  | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/command_modules/azure-cli-acr/HISTORY.rst b/src/command_modules/azure-cli-acr/HISTORY.rst
index 40616d69b7a..f2afc9fc92b 100644
--- a/src/command_modules/azure-cli-acr/HISTORY.rst
+++ b/src/command_modules/azure-cli-acr/HISTORY.rst
@@ -3,6 +3,10 @@
 Release History
 ===============
 
+2.1.4
++++++
+* Exclude version control files (eg, .git, .gitignore) from uploaded tar by default in build command.
+
 2.1.3
 +++++
 * Add content-trust policy commands.
diff --git a/src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/build.py b/src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/build.py
index 91d7eeab8ce..d6e8f67b19c 100644
--- a/src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/build.py
+++ b/src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/build.py
@@ -401,11 +401,13 @@ def _pack_source_code(source_location, tar_file_path, docker_file_path):
     def _ignore_check(tarinfo, parent_ignored, parent_matching_rule_index):
         # ignore common vcs dir or file
         if tarinfo.name in common_vcs_ignore_list:
-            logger.debug(".dockerignore: ignore vcs file '%s'", tarinfo.name)
+            logger.warning("Excluding '%s' based on default ignore rules", tarinfo.name)
             return True, parent_matching_rule_index
 
         if ignore_list is None:
-            return False, parent_matching_rule_index
+            # if .dockerignore doesn't exists, inherit from parent
+            # eg, it will ignore the files under .git folder.
+            return parent_ignored, parent_matching_rule_index
 
         # always include docker file
         # file path comparision is case-sensitive
diff --git a/src/command_modules/azure-cli-acr/setup.py b/src/command_modules/azure-cli-acr/setup.py
index f849105d5d5..8675abfd5ab 100644
--- a/src/command_modules/azure-cli-acr/setup.py
+++ b/src/command_modules/azure-cli-acr/setup.py
@@ -14,7 +14,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.1.3"
+VERSION = "2.1.4"
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
     'Intended Audience :: Developers',