Merge branch 'non-tracking-local'

Closes #65

* non-tracking-local:
  Rearrange fresh_update to have guards and error messages together
  Local files should not be updated if on an untracked branch

bin/fresh

@@ -543,13 +543,21 @@ usage: fresh update <filter>
     (
       set -e
       [[ -e "$FRESH_LOCAL/.git" ]] || exit 0
-      if [[ -z "$(cd $FRESH_LOCAL && git status --porcelain)" ]]; then
-        _update_repo "$FRESH_LOCAL" "local files"
-      else
-        _note "Not updating $FRESH_LOCAL because it has uncommitted changes."
+
+      if ! (cd $FRESH_LOCAL && git rev-parse @{u} &> /dev/null); then
+        _note "Not updating $FRESH_LOCAL because the current branch is non-tracking."
         if [[ "$1" == "--local" ]]; then
           exit 1
         fi
+      else
+        if [[ -n "$(cd $FRESH_LOCAL && git status --porcelain)" ]]; then
+          _note "Not updating $FRESH_LOCAL because it has uncommitted changes."
+          if [[ "$1" == "--local" ]]; then
+            exit 1
+          fi
+        else
+          _update_repo "$FRESH_LOCAL" "local files"
+        fi
       fi
     )
     [[ $? == 0 ]] || exit 1

test/fresh_test.sh

@@ -956,6 +956,8 @@ it_updates_local_repo_with_no_args() {
 
   assertFileMatches $SANDBOX_PATH/git.log <<EOF
 cd $FRESH_LOCAL
+git rev-parse @{u}
+cd $FRESH_LOCAL
 git status --porcelain
 cd $FRESH_LOCAL
 git pull --rebase
@@ -973,6 +975,8 @@ it_only_updates_local_repo_with_local_arg() {
 
   assertFileMatches $SANDBOX_PATH/git.log <<EOF
 cd $FRESH_LOCAL
+git rev-parse @{u}
+cd $FRESH_LOCAL
 git status --porcelain
 cd $FRESH_LOCAL
 git pull --rebase
@@ -1001,6 +1005,8 @@ it_does_not_update_local_dirty_local() {
 
   assertFileMatches $SANDBOX_PATH/git.log <<EOF
 cd $FRESH_LOCAL
+git rev-parse @{u}
+cd $FRESH_LOCAL
 git status --porcelain
 EOF
   assertFileMatches $SANDBOX_PATH/out.log <<EOF