git-scripts 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cc0297b2c9b3b2feb0d7f3ab4f2d5f995aeab9da56e26ba4f308b38b91d2d6b
-  data.tar.gz: caeec35a27613bf6e234229449ed8aeceded10a0f77a0799ea471a298a2c734b
+  metadata.gz: 3e5d80b708d282d506e10b2c2b2a70efcb888bd8cf85722f70cf8d3d62adcdb0
+  data.tar.gz: f087693642161ef49da12207a75471daa82effe96dfc2f63cfc669ab98a50185
 SHA512:
-  metadata.gz: 95fbeb5944ad5bf085f704abfa9c0672dbf4b1ea19f2b3acc6d64bb2d28df4dcc514bfd9fffe30164691cd5ce9e40681791be4047fa99f1b302e53c76f2077b9
-  data.tar.gz: bfdb2bd45601533f0be2d4de08a15c29be5ea25af4f13db0e24c946426ccdbc20ca714de9a384c9d2ee34c41c827ddf569d9f47103861328a4def3bcd3c1114d
+  metadata.gz: d4fc9f06c243191725a23cb5fc1baad0dc2e21ad9dbfc69ce0121aaad7207187c4d68bbdc54efe282a300a626d9012ba696fc41aa0f68a9d651ca5002ae24dbf
+  data.tar.gz: cee8d4b300803a86a526f2c0a251954ac7977c684c9e64781f32be5c935b5aa102640542bf8494380a8309257f12d48acd5405eb51aed385820870293d1e8590

data/README.md

@@ -2,7 +2,7 @@
 
 # Git Scripts
 
-User scripts for easily managing feature branches and hotfixes.
+User scripts for easily managing feature branches.
 
 ## Installation
 ```bash
@@ -16,45 +16,23 @@ git clone git://github.com/iFixit/git-scripts.git
 cd git-scripts
 bundle install
 ln -s ${PWD}/bin/feature /path/to/bin/dir/
-ln -s ${PWD}/bin/hotfix /path/to/bin/dir/
 ```
 
 ## Branching Model
 
 This is loosely based on the [Git Flow][gitflow] branching model, with a couple
 of noteable changes. Essentially Git Flow's `develop` is our `master`, Git
-Flow's `master` is our `stable`, and there are no `release` branches and our
-`hotfix` branch names all have a prefix.
+Flow's `master` is our `stable`, there are no `release` branches nor hotfix
+branches.
 
-**master** is the active development branch, and what our development server
-has checked out. This is configurable using: `git config
-feature.development_branch branch-name`
-
-**stable** is the branch which is deployed on the production machines. You
-should always be able to check out this branch and get "bug-free" production
-code.  This branch is always ready-to-go and should always be deployed as soon
-as it's changed
+**master** is always deployed. It's also the branch that all feature branches
+start from. This is configurable using: `git config feature.development_branch
+branch-name`
 
 **feature branches** are named after the feature you're developing and branched
 from `master`. When finished, the feature branch is merged back into master
 with `--no-ff` (so we preserve the merge commit) and deleted.
 
-**hotfix branches** are named `hotfix-name` and branched from `stable`. When
-finished, the hotfix branch is merged back into `stable` with `--no-ff` so we
-preserve the merge commit. We attempt to merge it back into `master` as well,
-but if it's going to get messy just bail.
-
-## Deployment
-
-The production machines always run off the `stable` branch. When deploying,
-you need to:
-
-* Merge `stable` into `master` (and vice-versa). This ensures that the two code
-  paths come together relatively frequently. This also guarantees that we'll
-  pick up any stray hotfixes that didn't get merged back.
-
-* Create a tag on `stable` for keeping track of deploys
-
 ## feature script
 
     feature <command> [branch name]
@@ -96,33 +74,6 @@ remote version of the current branch (the upstream).
 Lists the stashes saved on the current branch if any. -v shows all stashes on
 all branches.
 
-## hotfix script
-
-    hotfix <command> [branch name]
-
-Automates the process of fixing a bug on the live site, similar to the
-`feature` script with a few differences. Any command that is run with missing
-arguments will just print the help and exit
-
-    hotfix start my-sweet-fix
-
-Makes a new branch from `stable` named `hotfix_my-sweet-fix`. Prepending the
-name with `hotfix_` allows easy filtering.
-
-    hotfix switch my-other-fix
-
-Switches hotfix branches. Assuming the branch `hotfix_my-other-fix` exists, it
-checks out that branch and informs you about any stashes saved on that branch.
-
-    hotfix finish [my-other-fix]
-
-Creates a pull-request on Github for the current or specified hotfix branch.
-
-    hotfix merge [my-other-fix]
-
-Merges the hotfix branch back into `stable` with `--no-ff`. Also does a
-merge back into `master`.
-
 [gitflow]: http://nvie.com/posts/a-successful-git-branching-model/
 
 ## Plugins

data/bin/feature

@@ -88,10 +88,6 @@ when 'status'
 when 'finish'
    feature = ARGV[1] || Git::current_branch
 
-   if is_hotfix_branch feature
-      abort "This is a hotfix branch.  Please use hotfix-finish."
-   end
-
    # Push commits to origin
    Git::run_safe(["git push origin #{feature}:#{feature}"])
 
@@ -123,10 +119,6 @@ when 'finish-issue'
    issue = ARGV[1]
    feature = Git::current_branch
 
-   if is_hotfix_branch feature
-      abort "This is a hotfix branch.  Please use hotfix-finish-issue."
-   end
-
    # Push commits to origin
    Git::run_safe(["git push origin #{feature}:#{feature}"])
 
@@ -183,10 +175,6 @@ when 'merge'
       feature = ARGV[1] || Git::current_branch
    end
 
-   if is_hotfix_branch feature
-      exit 1 unless confirm("It looks like this is a hotfix branch.  Are you sure you want to merge it into only #{dev_branch}?")
-   end
-
    pull_info = Github::get_pull_request_info_from_api(feature, dev_branch)
 
    warning = Github::get_commit_status_warning(pull_info[:status])

data/completion/_feature

@@ -22,7 +22,7 @@ _feature() {
                "$words[2]" == "url"    ||
                "$words[2]" == "finish" ]]; then
            local -a featureBranches args
-           featureBranches="$(git branch -a | tr -d ' *' | grep -v 'hotfix-' | sed 's|remotes/origin/||')"
+           featureBranches="$(git branch -a | tr -d ' *' | sed 's|remotes/origin/||')"
            args="$(echo ${featureBranches} | tr "\$\'\\n\'" " ")"
            _arguments '2:Branches:($(echo ${args}))'
          fi

data/completion/bash_completion.sh

@@ -12,16 +12,7 @@ _git-scripts()
       if [ "$line" = "$cmd $cur" ]; then
          words="switch start finish finish-issue stashes list merge pull status prune url"
       else
-         # get branch names minus hotfixes
-         words="$(git branch -a | tr -d ' *' | grep -v 'hotfix-' | sed 's|remotes/origin/||')"
-      fi
-      ;;
-   hotfix)
-      if [ "$line" = "$cmd $cur" ]; then
-         words="switch start finish finish-issue merge list url"
-      else
-         # get hotfix branch names
-         words="$(git branch -a | tr -d ' *' | grep 'hotfix-' | sed -e 's|remotes/origin/||' -e 's|hotfix-||')"
+         words="$(git branch -a | tr -d ' *' | sed 's|remotes/origin/||')"
       fi
       ;;
    esac
@@ -30,4 +21,4 @@ _git-scripts()
    return 0
 }
 
-complete -F _git-scripts feature hotfix
+complete -F _git-scripts feature

data/lib/git.rb

@@ -59,20 +59,6 @@ module Git
       self::all_branches - self::merged_branches(branch)
    end
 
-   # Returns an array of unmerged hotfix branches
-   def self.hotfix_branches(type)
-      stable_branch = get_branch('stable')
-      branches = if type == :unmerged
-         self.branches_not_merged_into(stable_branch)
-      elsif type == :merged
-         self.merged_branches(stable_branch)
-      else
-         raise ArgumentError, 'Must specify :merged or :unmerged in hotfix_branches.'
-      end
-
-      branches.select {|branch| branch.include?('hotfix-') }
-   end
-
    # Returns an array of unmerged feature branches
    def self.feature_branches(type)
       devBranch = get_branch('development')
@@ -85,7 +71,7 @@ module Git
          raise ArgumentError, 'Must specify :merged or :unmerged in feature_branches.'
       end
 
-      branches.reject {|branch| branch.include?('hotfix-') }
+      branches
    end
 
    # Returns an array of all branch names that have have been merged into the

data/lib/helpers.rb

@@ -31,24 +31,6 @@ def display_feature_help(command = nil, message = nil)
    )
 end
 
-def display_hotfix_help(command = nil, message = nil)
-   display_help(
-      :script_name => "Git Hotfix Helper",
-      :commands => {
-         :list    => "hotfix list [-v]",
-         :url     => "hotfix url [name-of-hotfix]",
-         :start   => "hotfix start name-of-hotfix",
-         :switch  => "hotfix switch (name-of-hotfix | -n number-of-hotfix) [options]",
-         :finish  => "hotfix finish [name-of-hotfix]",
-         :'finish-issue'  => "hotfix finish-issue issue-number",
-         :merge   => "hotfix merge (name-of-hotfix | -n number-of-hotfix)",
-      },
-      :command_name => 'hotfix',
-      :command => command,
-      :message => message
-   )
-end
-
 def display_help(args)
    command = args[:command]
    message = args[:message]
@@ -90,11 +72,7 @@ end
 ##
 def require_argument(program, command = nil, min = 2, max = 2)
    help = lambda do |msg|
-      if program == :hotfix
-         display_hotfix_help(command, msg)
-      else
-         display_feature_help(command, msg)
-      end
+      display_feature_help(command, msg)
    end
 
    if (ARGV.length > max)
@@ -137,30 +115,6 @@ def get_branch_name_from_number(num)
    return octokit.pull_request(Github::get_github_repo, num).head.ref
 end
 
-def hotfix_branch(name)
-   if is_hotfix_branch(name)
-     return name
-   else
-     return "hotfix-#{name}"
-   end
-end
-
-def current_hotfix_branch()
-   if ARGV[1] == '-n'
-      branch = get_branch_name_from_number(ARGV[2])
-   elsif ARGV[1]
-      branch = hotfix_branch(ARGV[1])
-   else
-      branch = Git::current_branch
-   end
-
-   return branch
-end
-
-def is_hotfix_branch(name)
-   name =~ /^hotfix-/
-end
-
 def wrap_text(txt, col = 80)
    txt.gsub(
     /(.{1,#{col}})(?: +|$)\n?|(.{#{col}})/,

data/man/feature-finish-issue.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-FINISH\-ISSUE" "1" "February 2014" "iFixit" ""
+.TH "FEATURE\-FINISH\-ISSUE" "1" "November 2019" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-finish\-issue\fR \- Finish this feature branch and attach it to an issue\.
@@ -16,7 +16,7 @@ Finish the current feature branch and optionally convert an existing issue into
 Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
-feature(1), feature\-finish(1), hotfix\-finish(1), hotfix\-finish\-issue(1)
+feature(1), feature\-finish(1)
 .
 .SH "WWW"
 https://github\.com/iFixit/git\-scripts

data/man/feature-finish-issue.1.ronn

@@ -18,7 +18,7 @@ Copyright (c) 2012-2013 iFixit.
 
 ## SEE ALSO
 
-feature(1), feature-finish(1), hotfix-finish(1), hotfix-finish-issue(1)
+feature(1), feature-finish(1)
 
 ## WWW
 

data/man/feature-finish.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-FINISH" "1" "February 2014" "iFixit" ""
+.TH "FEATURE\-FINISH" "1" "November 2019" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-finish\fR \- Finish this feature branch\.
@@ -16,7 +16,7 @@ Finish the current feature branch or the one specified\. Push all remote commits
 Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
-feature(1), feature\-finish\-issue(1), hotfix\-finish(1), hotfix\-finish\-issue(1)
+feature(1), feature\-finish\-issue(1)
 .
 .SH "WWW"
 https://github\.com/iFixit/git\-scripts

data/man/feature-finish.1.ronn

@@ -18,7 +18,7 @@ Copyright (c) 2012-2013 iFixit.
 
 ## SEE ALSO
 
-feature(1), feature-finish-issue(1), hotfix-finish(1), hotfix-finish-issue(1)
+feature(1), feature-finish-issue(1)
 
 ## WWW
 

data/man/feature-github-test.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-GITHUB\-TEST" "1" "September 2013" "iFixit" ""
+.TH "FEATURE\-GITHUB\-TEST" "1" "July 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-github\-test\fR \- Test Github authentication\.

data/man/feature-list.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-LIST" "1" "September 2013" "iFixit" ""
+.TH "FEATURE\-LIST" "1" "November 2019" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-list\fR \- Lists the current branch and any available feature branches\.
@@ -22,7 +22,7 @@ List merged branches\.
 Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
-feature(1), hotfix\-list(1)
+feature(1)
 .
 .SH "WWW"
 https://github\.com/iFixit/git\-scripts

data/man/feature-list.1.ronn

@@ -21,7 +21,7 @@ Copyright (c) 2012-2013 iFixit.
 
 ## SEE ALSO
 
-feature(1), hotfix-list(1)
+feature(1)
 
 ## WWW
 

data/man/feature-merge.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-MERGE" "1" "September 2013" "iFixit" ""
+.TH "FEATURE\-MERGE" "1" "November 2019" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-merge\fR \- Merge a feature branch into the development branch\.
@@ -19,7 +19,7 @@ Deletes the local copy of the branch on success\.
 Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
-feature(1), hotfix\-merge(1)
+feature(1)
 .
 .SH "WWW"
 https://github\.com/iFixit/git\-scripts

data/man/feature-merge.1.ronn

@@ -21,7 +21,7 @@ Copyright (c) 2012-2013 iFixit.
 
 ## SEE ALSO
 
-feature(1), hotfix-merge(1)
+feature(1)
 
 ## WWW
 

data/man/feature-prune.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-PRUNE" "1" "September 2013" "iFixit" ""
+.TH "FEATURE\-PRUNE" "1" "July 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-prune\fR \- Remove old branches on original or local\.

data/man/feature-start.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-START" "1" "September 2013" "iFixit" ""
+.TH "FEATURE\-START" "1" "November 2019" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-start\fR \- Start a new feature branch\.
@@ -16,7 +16,7 @@ Start a new feature branch based off \fIfeature\.development\-branch\fR\.
 Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
-feature(1), hotfix\-start(1)
+feature(1)
 .
 .SH "WWW"
 https://github\.com/iFixit/git\-scripts

data/man/feature-start.1.ronn

@@ -15,7 +15,7 @@ Copyright (c) 2012-2013 iFixit.
 
 ## SEE ALSO
 
-feature(1), hotfix-start(1)
+feature(1)
 
 ## WWW
 

data/man/feature-stashes.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-STASHES" "1" "September 2013" "iFixit" ""
+.TH "FEATURE\-STASHES" "1" "November 2019" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-stashes\fR \- Show stashes saved on the current branch\.
@@ -12,9 +12,6 @@
 .SH "DESCRIPTION"
 Show stashes saved on the current branch\. Display the relative time the stash was saved, the stash message, and instructions on viewing and applying the stash\.
 .
-.P
-Compatible with hotfix branches\.
-.
 .SH "OPTIONS"
 .
 .TP