Remove redundant function isBareGitRepo
This commit is contained in:
@@ -64,15 +64,6 @@ func validBuildpackURL(buildpack string) (string, error) {
|
||||
return buildpack, fmt.Errorf("Invalid buildpack specified: %v", buildpack)
|
||||
}
|
||||
|
||||
func isBareGitRepo(directory string) bool {
|
||||
headFile := filepath.Join(directory, "HEAD")
|
||||
objectsDir := filepath.Join(directory, "objects")
|
||||
if common.FileExists(headFile) && common.DirectoryExists(objectsDir) {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func checkoutBareGitRepo(sourceWorkDir string) (string, error) {
|
||||
tmpdir, err := os.MkdirTemp("", "bare-git-checkout")
|
||||
if err != nil {
|
||||
|
||||
@@ -38,18 +38,16 @@ func CommandDetect(appName string) error {
|
||||
}
|
||||
|
||||
workDir := common.AppRoot(appName)
|
||||
if isBareGitRepo(workDir) {
|
||||
checkedOutDir, err := checkoutBareGitRepo(workDir)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
workDir = checkedOutDir
|
||||
defer func() {
|
||||
if err := os.RemoveAll(checkedOutDir); err != nil {
|
||||
common.LogWarn(fmt.Sprintf("Failed to remove temporary directory %s: %v", checkedOutDir, err))
|
||||
}
|
||||
}()
|
||||
}
|
||||
checkedOutDir, err := checkoutBareGitRepo(workDir)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
workDir = checkedOutDir
|
||||
defer func() {
|
||||
if err := os.RemoveAll(checkedOutDir); err != nil {
|
||||
common.LogWarn(fmt.Sprintf("Failed to remove temporary directory %s: %v", checkedOutDir, err))
|
||||
}
|
||||
}()
|
||||
|
||||
dockerArgs := []string{
|
||||
"run", "--rm",
|
||||
|
||||
Reference in New Issue
Block a user