From 3bc177efc94cda1f11baee4b178111be8d0fd0db Mon Sep 17 00:00:00 2001 From: Alexey Igrychev Date: Wed, 22 Jan 2020 16:23:04 +0000 Subject: [PATCH] [stapel] DISABLE_GIT_ARCHIVE_RESET_COMMIT --- pkg/build/stage/git_archive.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/build/stage/git_archive.go b/pkg/build/stage/git_archive.go index 8ee87d0c56..2f470004f6 100644 --- a/pkg/build/stage/git_archive.go +++ b/pkg/build/stage/git_archive.go @@ -2,6 +2,7 @@ package stage import ( "fmt" + "os" "sort" "github.com/flant/werf/pkg/image" @@ -42,12 +43,14 @@ func (s *GitArchiveStage) GetDependencies(_ Conveyor, _, _ image.ImageInterface) for _, gitMapping := range s.gitMappings { args = append(args, gitMapping.GetParamshash()) - commit, err := gitMapping.GitRepo().FindCommitIdByMessage(GitArchiveResetCommitRegex) - if err != nil { - return "", err - } + if os.Getenv("DISABLE_GIT_ARCHIVE_RESET_COMMIT") != "1" { + commit, err := gitMapping.GitRepo().FindCommitIdByMessage(GitArchiveResetCommitRegex) + if err != nil { + return "", err + } - args = append(args, commit) + args = append(args, commit) + } } sort.Strings(args)