projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
39ccb1f
)
18700: Discard local yarn.lock modifications when checking out wb2.
author
Tom Clegg <tom@curii.com>
Tue, 29 Mar 2022 13:58:17 +0000
(09:58 -0400)
committer
Tom Clegg <tom@curii.com>
Tue, 29 Mar 2022 13:58:17 +0000
(09:58 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
lib/install/deps.go
patch
|
blob
|
history
diff --git
a/lib/install/deps.go
b/lib/install/deps.go
index b38db9919253a92e193bc48e1090326c77b29362..069ffd0a2bdd9d4647b12f144d4d0772a0e606f8 100644
(file)
--- a/
lib/install/deps.go
+++ b/
lib/install/deps.go
@@
-497,6
+497,7
@@
else
cd arvados-workbench2
if ! git checkout $V; then
git fetch
cd arvados-workbench2
if ! git checkout $V; then
git fetch
+ git checkout yarn.lock
git checkout $V
fi
fi
git checkout $V
fi
fi