1.10.1

fix #63

README.md

@@ -1,25 +1,33 @@
-# git-fresh :lemon: 
+# git-fresh :lemon:
 
 Keep your repo fresh with one command.
 
 ## Usage
 
 ```
-Usage: git fresh [-fmrtF] [-sl] [remote] [root]
+Usage: git fresh [-fmrtRW] [-sl] [remote] [root]
 By default, git-fresh will:
- - rebase against remote current branch 
+ - rebase against remote current branch
  - stash changes
  - prune remote branches
 
+git-fresh will ignore any branches listed in a .freshignore file.
+.freshignore should contain branch names you would like to ignore
+on separate lines. The file can exist in the current Git repo
+or in the home directory, i.e. ~/.freshignore.
+
 -f: Delete stale local and remote branches
 -m: Merge remote root into current branch
 -r: Rebase current branch against remote root
 -t: Remove local tags that do not exist on remote
--F: Reset local root to remote root, wipe workspace
+-R: Reset local root to remote root
+-W: Wipe workspace clean
 
 -s: Apply stashed changes after run
 -l: Only delete local stale branches
 
+-v: Print git-fresh version and exit
+
 remote: remote name, origin by default
 root: root branch, master by default
 ```

git-fresh

@@ -7,21 +7,29 @@
 
 usage () {
 cat << EOD
-Usage: git fresh [-fmrtF] [-sl] [remote] [root]
+Usage: git fresh [-fmrtRW] [-sl] [remote] [root]
 By default, git-fresh will:
- - rebase against remote current branch 
+ - rebase against remote current branch
  - stash changes
  - prune remote branches
 
+git-fresh will ignore any branches listed in a .freshignore file.
+.freshignore should contain branch names you would like to ignore
+on separate lines. The file can exist in the current Git repo
+or in the home directory, i.e. ~/.freshignore.
+
 -f: Delete stale local and remote branches
 -m: Merge remote root into current branch
 -r: Rebase current branch against remote root
 -t: Remove local tags that do not exist on remote
--F: Reset local root to remote root, wipe workspace
+-R: Reset local root to remote root
+-W: Wipe workspace clean
 
 -s: Apply stashed changes after run
 -l: Only delete local stale branches
 
+-v: Print git-fresh version and exit
+
 remote: remote name, origin by default
 root: root branch, master by default
 EOD
@@ -44,7 +52,7 @@ error () {
 
 trap 'error $LINENO' ERR
 
-while getopts ":fmrtslFT" opt; do
+while getopts ":fmrtslRWTv" opt; do
   case $opt in
     f)
       FORCE_DELETE_STALE=true
@@ -64,12 +72,18 @@ while getopts ":fmrtslFT" opt; do
     l)
       DELETE_ONLY_LOCAL=true
       ;;
-    F)
-      FORCE_LOCAL_RESET=true
+    R)
+      RESET_ROOT=true
+      ;;
+    W)
+      WIPE_WORKSPACE=true
       ;;
     T)
       TEST=true
       ;;
+    v)
+      VERSION=1.10.1
+      ;;
     *)
       usage
       break
@@ -79,20 +93,34 @@ done
 
 shift $((OPTIND-1))
 
+# Are we in version mode?
+
+if [[ ! -z $VERSION ]]; then
+  echo git-fresh $VERSION
+  exit 0
+fi
+
 # Are we in testing mode?
 
 if [[ $TEST = true ]]; then
+  PATH=$(pwd):$PATH
+  TEST_DIR=/tmp/git-fresh-test
+  fail_test () {
+    echo 'Tests failed!'
+    rm -rf $TEST_DIR
+    exit 1
+  }
 
-PATH=$(pwd):$PATH
-TEST_DIR=/tmp/git-fresh-test
-
-mkdir -p $TEST_DIR; cd $TEST_DIR
-git init; touch test; git add test; git commit -am 'test'
-git checkout -b test; rm test; git commit -am 'delete test'
-git checkout master; git merge test; git checkout test
-git-fresh -fr; rm -rf $TEST_DIR
-exit 0
-
+  rm -rf $TEST_DIR; mkdir -p $TEST_DIR; cd $TEST_DIR
+  git init; touch test; git add test; git commit -am 'test'
+  git checkout -b test; rm test; git commit -am 'delete test'
+  git checkout master; git merge test; git checkout test
+  git-fresh -fr; git rev-parse --verify test && fail_test || true
+  git checkout -b test; git checkout master; git-fresh; git checkout -
+  git rev-parse --abbrev-ref HEAD | grep -q test || fail_test
+  rm -rf $TEST_DIR
+  echo 'Tests passed!'
+  exit 0
 fi
 
 # Are we inside a git repository?
@@ -106,17 +134,38 @@ fi
 # Are we in a non-empty git repository?
 
 TOP_LEVEL_DIRECTORY=$(git rev-parse --show-toplevel)
-
-[[ $(ls -1 "$TOP_LEVEL_DIRECTORY/.git/refs/heads" | wc -l | xargs) -eq "0" ]] && die "No HEAD ref available"
-
-CURRENT=$(git rev-parse --abbrev-ref HEAD)
 REMOTE=${1:-origin}
 ROOT=${2:-master}
 
+if [[ $(ls -1 "$TOP_LEVEL_DIRECTORY/.git/refs/heads" | wc -l | xargs) -eq "0" ]]; then
+  if git rev-parse --verify "$ROOT"; then
+    git rev-parse "$ROOT" > "$TOP_LEVEL_DIRECTORY/.git/refs/heads/$ROOT"
+  else
+    (git fsck --lost-found &> /dev/null; git checkout "$ROOT") || die "No HEAD ref available"
+  fi
+fi
+
+CURRENT=$(git rev-parse --abbrev-ref HEAD)
+
 if [[ $(git remote -v | wc -l) -gt "0" ]]; then
   REMOTES=true
 fi
 
+# Is this branch in .freshignore?
+
+FRESH_IGNORE="$TOP_LEVEL_DIRECTORY/.freshignore"
+
+if [[ ! -f $FRESH_IGNORE ]]; then
+  FRESH_IGNORE="~/.freshignore"
+fi
+
+if [[ -f $FRESH_IGNORE ]]; then
+    if [[ ! -z $(grep -Fx "$CURRENT" "$FRESH_IGNORE") ]]; then
+        die "Branch $CURRENT is ignored"
+    fi
+fi
+
+
 STASH_STAMP=git-fresh-$(date +%s)
 
 # Stash changed files
@@ -126,35 +175,41 @@ if ! git diff-files --quiet; then
 fi
 
 if [[ $REMOTES = true ]]; then
-
   # Update remotes and prune stale remotes
-    git remote update
-    git remote prune $REMOTE
-
+  git remote prune $REMOTE
+  git remote update $REMOTE
+  git remote prune $REMOTE
 
   # If the current branch exists on the remote, rebase against it
-
   REMOTE_CURRENT=$(git ls-remote $REMOTE --heads 2> /dev/null | grep "heads/$CURRENT$" | cat)
 
   if [[ ! -z "$REMOTE_CURRENT" ]]; then
     git rebase $REMOTE $CURRENT
   fi
-
 fi
 
-# Switch to root branch (master)
+# If we are not already on root branch, switch to root branch (master)
 
-git checkout $ROOT > /dev/null 2>&1
+if [[ "$ROOT" != "$CURRENT" ]]; then
+  git checkout $ROOT > /dev/null 2>&1
+fi
+
+# Wipe workspace?
+
+if [[ $WIPE_WORKSPACE = true ]]; then
+  git clean -dfx
+fi
+
+# Reset root?
 
 if [[ $REMOTES = true ]]; then
-
-  if [[ "$FORCE_LOCAL_RESET" = true ]]; then
-    git clean -dfx
-    git reset --hard $REMOTE $ROOT
-  else
-    git rebase -q $REMOTE $ROOT
+  if [[ $RESET_ROOT = true ]]; then
+    git reset --hard $REMOTE/$ROOT
   fi
+fi
 
+if [[ $REMOTES = true ]]; then
+  git rebase -q $REMOTE/$ROOT
 fi
 
 # Compute stale branches
@@ -170,21 +225,37 @@ REMOTE_STALE=${REMOTE_STALE//remotes\/$REMOTE\/}
 if [[ ! -z "${SMART_STALE// }" ]]; then
   if [[ ! -z "${LOCAL_STALE// }" ]]; then
     STALE_BRANCHES=true
+    if [[ -f "$FRESH_IGNORE" ]]; then
+      LOCAL_STALE=$(echo -n $LOCAL_STALE | tr " " "\n" | grep -Fxvf "$FRESH_IGNORE" | tr "\n" " ")
+      if [[ -z $LOCAL_STALE ]]; then
+        STALE_BRANCHES=false
+      fi
+    fi
     if [[ "$FORCE_DELETE_STALE" = true ]]; then
       echo -n $LOCAL_STALE | tr " " "\0" | xargs -0 git branch -d 2> /dev/null
     else
-      say "Local stale branches found:" $(echo -n $LOCAL_STALE | tr "\n" " ")
+      if [[ $STALE_BRANCHES = true ]]; then
+        say "Local stale branches found:" $(echo -n $LOCAL_STALE | tr "\n" " ")
+      fi
     fi
   fi
 
   if [[ ! -z "${REMOTE_STALE// }" ]]; then
     STALE_BRANCHES=true
+    if [[ -f "$FRESH_IGNORE" ]]; then
+      REMOTE_STALE=$(echo -n $REMOTE_STALE | tr " " "\n" | grep -Fxvf "$FRESH_IGNORE" | tr "\n" " ")
+      if [[ -z $REMOTE_STALE ]]; then
+        STALE_BRANCHES=false
+      fi
+    fi
     if [[ "$FORCE_DELETE_STALE" = true ]]; then
       if [[ "$DELETE_ONLY_LOCAL" != true ]]; then
         echo -n $REMOTE_STALE | tr " " "\0" | xargs -0 git push $REMOTE --delete
       fi
     else
-      say "Remote stale branches found:" $(echo -n $REMOTE_STALE | tr "\n" " ")
+      if [[ $STALE_BRANCHES = true ]]; then
+        say "Remote stale branches found:" $(echo -n $REMOTE_STALE | tr "\n" " ")
+      fi
     fi
   fi
 
@@ -193,21 +264,29 @@ if [[ ! -z "${SMART_STALE// }" ]]; then
   fi
 fi
 
+# Remove tracking information for missing upstreams
+
+if [[ ! -z $(git branch -vv | grep -F "[$REMOTE/$CURRENT: gone]") ]]; then
+  git branch --unset-upstream $CURRENT
+fi
+
 # Rebase or merge remote root against local branch
 
 if [[ ! -z $(git rev-parse --verify --quiet "$CURRENT") ]]; then
-  git checkout $CURRENT 2> /dev/null
+  if [[ "$ROOT" != "$CURRENT" ]]; then
+    git checkout $CURRENT
+  fi
 
   if [ "$REBASE" = true ] && [ "$MERGE" = true ]; then
     say "Rebase and merge enabled, skipping both"
   else
     if [[ "$REMOTES" = true ]]; then
       if [[ "$REBASE" = true ]]; then
-        git rebase $REMOTE $ROOT
+        git rebase $ROOT
       fi
 
       if [[ "$MERGE" = true ]]; then
-        git merge --no-edit $REMOTE $ROOT
+        git merge --no-edit $ROOT
       fi
     fi
   fi

package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-fresh",
-  "version": "1.6.1",
+  "version": "1.10.0",
   "description": "Utility to keep Git repositories fresh",
   "global": true,
   "repo": "imsky/git-fresh",