Ignore package-lock.json when running git diff-index

64json · 64json · commit b539553e91da · 2018-12-14T06:09:49.000-05:00
diff --git a/bin/pull b/bin/pull
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 git fetch &&
-! git diff-index --quiet origin/master &&
+! git diff-index --quiet origin/master -- ':!package-lock.json' &&
 git reset --hard origin/master &&
 npm install &&
 npm run build
diff --git a/src/backend/controllers/tracers.js b/src/backend/controllers/tracers.js
@@ -28,7 +28,7 @@ const trace = lang => (req, res, next) => {
 
 const buildRelease = release => (
   fs.pathExistsSync(repoPath) ?
-    execute(`git fetch && ! git diff-index --quiet ${release.target_commitish}`, repoPath) :
+    execute(`git fetch && ! git diff-index --quiet ${release.target_commitish} -- ':!package-lock.json'`, repoPath) :
     execute(`git clone https://github.com/algorithm-visualizer/tracers.git ${repoPath}`, __dirname)
 ).then(() => execute(`git reset --hard ${release.target_commitish} && npm install && npm run build && ./bin/build`, repoPath));
 
