Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: cleishm/heroku-buildpack-nodejs
base: master
...
head fork: randomafk/heroku-buildpack-nodejs
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 2 contributors
Commits on Dec 24, 2011
@cleishm Reset GIT_DIR when calling npm 4b1522b
Commits on Oct 04, 2012
@randomafk randomafk asdf b18283c
Showing with 10 additions and 0 deletions.
  1. +10 −0 bin/compile
View
10 bin/compile
@@ -96,10 +96,20 @@ fi
echo "-----> Installing dependencies with npm $NPM_VERSION"
cd $BUILD_DIR
+<<<<<<< HEAD
run_npm install
run_npm rebuild
echo "Dependencies installed" | indent
+=======
+HOME="$BUILD_DIR" GIT_DIR=".git" $VENDORED_NODE/bin/node $VENDORED_NPM/cli.js install 2>&1 | indent
+if [ "${PIPESTATUS[*]}" != "0 0" ]; then
+ echo " ! Failed to install dependencies with npm"
+ exit 1
+else
+ echo " Dependencies installed"
+fi
+>>>>>>> chrisleishman/git_fix
# repack cache with new assets
if [ -d $CACHE_TARGET_DIR ]; then

No commit comments for this range

Something went wrong with that request. Please try again.