File: 63.patch

package info (click to toggle)
golang-github-masterminds-vcs-dev 1.10.0-2
  • links: PTS, VCS
  • area: main
  • in suites: stretch
  • size: 244 kB
  • ctags: 203
  • sloc: makefile: 38
file content (26 lines) | stat: -rw-r--r-- 1,183 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
From 2449b6d05bf28e1ca4158b41f62d14315886ad03 Mon Sep 17 00:00:00 2001
From: David Taylor <tinystatemachine@gmail.com>
Date: Sat, 21 Jan 2017 00:53:40 +0000
Subject: [PATCH] git: remove extra quotes in submodule export

on the cli, one uses the extra single quotes to ensure the whole cmd is passed as a single arg despite
containing spaces, but when passing args in a structured call like this, it isn't needed.

Fixes Masterminds/glide#745
---
 git.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git.go b/git.go
index b3347df..8c3d5f7 100644
--- a/git.go
+++ b/git.go
@@ -385,7 +385,7 @@ func (s *GitRepo) ExportDir(dir string) error {
 		return NewLocalError("Unable to export source", err, string(out))
 	}
 	// and now, the horror of submodules
-	out, err = s.RunFromDir("git", "submodule", "foreach", "--recursive", "'git checkout-index -f -a --prefix=\""+filepath.Join(dir, "$path")+"\"'")
+	out, err = s.RunFromDir("git", "submodule", "foreach", "--recursive", "git checkout-index -f -a --prefix=\""+filepath.Join(dir, "$path")+"/\"")
 	s.log(out)
 	if err != nil {
 		return NewLocalError("Error while exporting submodule sources", err, string(out))