Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

Commit 50f0007

Browse files
committed
Do not modify the manifest during dep ensure -update
1 parent a31e404 commit 50f0007

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

cmd/dep/ensure.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,13 @@ func (cmd *ensureCommand) Run(ctx *dep.Ctx, args []string) error {
149149

150150
sw := dep.SafeWriter{
151151
Root: p.AbsRoot,
152-
Manifest: p.Manifest,
153152
Lock: p.Lock,
154153
NewLock: solution,
155154
SourceManager: sm,
156155
}
156+
if !cmd.update {
157+
sw.Manifest = p.Manifest
158+
}
157159

158160
// check if vendor exists, because if the locks are the same but
159161
// vendor does not exist we should write vendor

cmd/dep/ensure_test.go

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -252,18 +252,10 @@ func TryToDoSomething() error {
252252
h.Cd(h.Path("src/thing"))
253253

254254
h.Run("ensure", "-update", "github.com/carolynvs/go-dep-test")
255-
256-
expectedManifest := `{
257-
"dependencies": {
258-
"github.com/carolynvs/go-dep-test": {
259-
"version": "^0.1.0"
260-
}
261-
}
262-
}
263-
`
255+
264256
manifest := h.ReadManifest()
265-
if manifest != expectedManifest {
266-
t.Fatalf("expected '%s', got '%s'", expectedManifest, manifest)
257+
if manifest != origManifest {
258+
t.Fatalf("The manifest should not be modified during an update. Expected %s, got %s", origManifest, manifest)
267259
}
268260

269261
expectedLock := `{

0 commit comments

Comments
 (0)