git-utils 0.7.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ff6ac2207f071e41328576590172fe7dc6f8721c
-  data.tar.gz: e34ce04c025afcd6bc0382e8a9c7c28b4cfa52d3
+SHA256:
+  metadata.gz: 3e1c46d3c400bbc8d913745063c92a103b45b11e59cdd2bb494a099100b12d05
+  data.tar.gz: b2d4253cc25ec916282f1bfd9198f3017d6369bc55deb41b3a0161fb52bbd34c
 SHA512:
-  metadata.gz: 57314c2b35a311cb40e289595bb9dfa0232941ffa38700ce9442e39ed5e4190f5310c6d3e16dad38a9c8411744e07be746b744cf5464bdd1fce38114578de7fa
-  data.tar.gz: 2d0bb6d0ebec487eea8f45f7ff973b3333226f7e6d03e5654c067e6ab03402bf878e23822e15ff7962b62ec76ca8291fdf9f42a99bec6eee162d95a201c7c910
+  metadata.gz: bff26db7b631b266ba97210256544ca7031efb99e4af1f9289414598c343d8f9762421e386921c58d3c00ad93a5bc03d7eed2e3e60dcc5b26d9f5411d71aee3a
+  data.tar.gz: 5ba1d70da71ae6b35afa1fa1dd7e8ceb36b2db348587b9a7adb910fc084f5a4933aefba765f2d0b9db2e96975083dcea99f99b9de74efd6c1472eb6e75fdfa34

data/README.md

@@ -1,62 +1,64 @@
 # Git utilities
 
-This repo contains some Git utility scripts. The highlights are `git open`, `git pull-request`, `git push-branch`, and `git undo`, which you'll never understand how you did without.
+This repo contains some Git utility scripts. The highlights are `git open`, `git pull-request`, `git push-branch`, and `git undo`, which you’ll never understand how you did without.
 
-The commands are especially useful when combined with [pivotal-github](https://github.com/mhartl/pivotal-github) gem (which, despite its name, also works with Bitbucket).
-
-The `git-utils` used to be pure Bash scripts, but they are now available as a Ruby gem, both because Ruby is more powerful than bash and because now `git-utils` can be included more easily as a dependency for the [pivotal-github](https://github.com/mhartl/pivotal-github/) gem. As a result, installation is easy if you have RubyGems installed:
+`git-utils` used to be pure Bash scripts, but they are now available as a Ruby gem:
 
     gem install git-utils
 
+See below for more details on the commands defined by `git-utils`. To learn more about how to use Git itself, see the tutorial book and online course [*Learn Enough Git to Be Dangerous*](https://www.learnenough.com/git).
+
 ## Commands
 
 * `git amend`: alias for `git commit --amend`
-* `git anal` (*use with caution*): makes a commit with the message "Make anal changes"
-* `git bump`: makes a commit with the message "Bump version number"
-* `git cleanup`: deletes every branch already merged into current branch (apart from `master`, `staging`, `development`, and any branches listed in `~/.git-cleanup-preserved`). Pass the `-r` option to delete remote merged branches.
-* `git merge-branch [branch]`: merges current branch into given branch (defaults to `master`)
-* `git open`: opens the remote page for the repo (OS X & Linux)
-* `git polish`: makes a commit with the message "Polish"
-* `git pull-request`: pushes the branch and opens the remote page for issuing a new a pull request (OS X only)
+* `git bump`: makes a commit with the message `"Bump version number"`
+* `git cleanup`: deletes every branch already merged into current branch (apart from `master`, `main`, `staging`, `development`, and any branches listed in `~/.git-cleanup-preserved`). Pass the `-r` option to delete remote merged branches.
+* `git merge-into-branch [branch]`: merges current branch into given branch (defaults to repo's default branch)
+* `git minor`: makes a commit with the message `"Make minor changes"`
+* `git open`: opens the remote page for the repo (macOS & Linux)
+* `git polish`: makes a commit with the message `"Polish"`
+* `git pull-request`: pushes the branch and opens the remote page for issuing a new a pull request (macOS-only)
 * `git push-branch`: pushes the current branch up to origin
 * `git delete-remote-branch <branch>`: deletes the remote branch if it is safe to do so
 * `git switch <pattern>`: switches to the first branch matching the given pattern
-* `git sync [branch]`: syncs the given branch with the remote branch (defaults to master)
-* `git typo`: makes a commit with the message "Fix typo"
+* `git sync [branch]`: syncs the given branch with the remote branch (defaults to repo's default branch)
+* `git sync-fork`: syncs the default branch of a fork with the original upstream default (assumes upstream configuration as in “[Configuring a remote for a fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork)”)
+* `git typo`: makes a commit with the message `"Fix typo"`
 * `git undo`: undoes the last commit
+* `git graph`: displays full repository history in graphical format; alias for `git log --graph --oneline --decorate --all --full-history --author-date-order --no-notes`
 
 ## Aliases
 
 Here are some suggested aliases:
 
-    git config --global alias.mb merge-branch
-    git config --global alias.pr pull-request
-    git config --global alias.pb push-branch
+    git config --global alias.mib merge-into-branch
+    git config --global alias.pr  pull-request
+    git config --global alias.pb  push-branch
 
 ## Further details
 
 Some of these commands deserve further explanation.
 
-### git merge-branch
+### git merge-into-branch
 
-`git merge-branch [target]` merges the current branch into the target branch (defaults to `master`). On a branch called `add-markdown-support`, `git merge-branch` is equivalent to the following:
+`git merge-into-branch [target]` merges the current branch into the target branch (defaults to repo's default branch). On a branch called `add-markdown-support` in a repo with default branch `main`, `git merge-into-branch` is equivalent to the following:
 
-    $ git checkout master
+    $ git checkout main
     $ git merge --no-ff --log add-markdown-support
 
-Note that this effectively changes the default merge behavior from fast-forward to no-fast-forward, which makes it possible to use `git log` to see which of the commit objects together have implemented a feature on a particular branch. As noted in [A successful Git branching model](http://nvie.com/posts/a-successful-git-branching-model/),
+Note that this effectively changes the default merge behavior from fast-forward to no-fast-forward, which makes it possible to use `git log` to see which of the commit objects together have implemented a feature on a particular branch. As noted in [A successful Git branching model](http://nvie.com/posts/a-successful-git-branching-model/):
 
 > The `--no-ff` flag causes the merge to always create a new commit object, even if the merge could be performed with a fast-forward. This avoids losing information about the historical existence of a feature branch and groups together all commits that together added the feature… Yes, it will create a few more (empty) commit objects, but the gain is much bigger than that cost.
 
 In addition, the `--log` option puts the commit messages from the individual commits in the merge message, which is especially useful for viewing the full diff represented by the commit.
 
-These options can be overriden (and thus restored to their defaults) by passing the options `-ff` or `--no-log`. `git merge-branch` accepts any options valid for `git merge`.
+These options can be overriden (and thus restored to their defaults) by passing the options `-ff` or `--no-log`. `git merge-into-branch` accepts any options valid for `git merge`.
 
 ### git push-branch
 
 `git push-branch` creates a remote branch at `origin` with the name of the current branch:
 
-    $ git branch-push
+    $ git push-branch
     * [new branch]      add-markdown-support -> add-markdown-support
 
 `git push-branch` accepts any options valid for `git push`.
@@ -64,24 +66,24 @@ These options can be overriden (and thus restored to their defaults) by passing
 
 ### git sync
 
-`git sync [branch]` syncs the given local branch  with the remote branch (defaults to master). On a branch called `add-markdown-support`, `git sync` is equivalent to the following:
+`git sync [branch]` syncs the given local branch  with the remote branch (defaults to repo's default branch). On a branch called `add-markdown-support` in a repo with default branch `master`, `git sync` is equivalent to the following:
 
     $ git checkout master
     $ git pull
     $ git checkout add-markdown-support
 
-The main purpose of `git sync` is to prepare the current branch for merging with `master`:
+The main purpose of `git sync` is to prepare the current branch for merging with the default branch:
 
     $ git sync
-    $ git merge master
+    $ git merge master    # or `main`, etc.
 
 (This is essentially equivalent to
 
     $ git fetch
     $ git merge origin/master
 
-but I don't like having `master` and `origin/master` be different since that means you have to remember to run `git pull` on `master` some time down the line.)
+but I don’t like having `master` and `origin/master` be different since that means you have to remember to run `git pull` on `master` some time down the line.)
 
 ## Installation
 
-    gem install git-utils
+    gem install git-utils

data/bin/git-cleanup

@@ -2,9 +2,9 @@
 require 'optparse'
 
 # Deletes (almost) every branch already merged into current branch.
-# Exceptions are `master`, `staging`, and `development`, and the current
-# branch, which are preserved. We also support custom configuration via the
-# `~/.git-cleanup-preserved` file.
+# Exceptions are `master`, `main`, `staging`, and `development`,
+# and the current branch, which are preserved.
+# We also support custom configuration via the `~/.git-cleanup-preserved` file.
 
 options = {}
 OptionParser.new do |opts|
@@ -15,7 +15,7 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-preserved = "master|staging|development"
+preserved = "master|main|staging|development"
 preserved_file = File.join(Dir.home, '.git-cleanup-preserved')
 if File.exist?(preserved_file)
   additional_preserved = File.read(preserved_file).strip.split("\n")

data/bin/git-graph

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+# Displays full repository history in graphical format
+system 'git log --graph --oneline --decorate --all --full-history --author-date-order --no-notes'

data/bin/{git-merge-branch → git-merge-into-branch}

@@ -3,9 +3,9 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'git-utils/merge_branch'
 
 # Merges the current branch into the given branch (defaults to master).
-# E.g., 'git merge-branch foobar' merges the current branch into foobar.
-# 'git merge-branch', merges the current branch into master.
-# git merge-branch uses the --no-ff --log options to ensure that the
+# E.g., 'git merge-into-branch foobar' merges the current branch into foobar.
+# 'git merge-into-branch', merges the current branch into master.
+# git merge-into-branch uses the --no-ff --log options to ensure that the
 # merge creates a new commit object and that the individual commits appear
 # in the log file.
 exit Command.run!(MergeBranch, ARGV.dup)

data/bin/git-minor

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+# Makes minor changes.
+system 'git commit -am "Make minor changes"'

data/bin/git-sync-fork

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'git-utils/sync_fork'
+
+# Syncs the local master branch with remote.
+exit Command.run!(SyncFork, ARGV.dup)

data/lib/git-utils.rb

@@ -7,4 +7,5 @@ require "git-utils/delete_remote_branch"
 require "git-utils/push_branch"
 require "git-utils/switch"
 require "git-utils/sync"
+require "git-utils/sync_fork"
 require "git-utils/pull_request"

data/lib/git-utils/command.rb

@@ -26,6 +26,27 @@ class Command
     @current_branch ||= `git rev-parse --abbrev-ref HEAD`.strip
   end
 
+  # Returns the default branch for the current repository.
+  # Command retrieved from
+  # https://stackoverflow.com/questions/28666357/git-how-to-get-default-branch
+  def default_branch
+    branch_name = `git symbolic-ref --short refs/remotes/origin/HEAD \
+                   | sed 's@^origin/@@'`.strip
+    if branch_name.empty?
+      $stderr.puts "Repository configuration error"
+      $stderr.puts "Missing reference to refs/remotes/origin/HEAD"
+      $stderr.puts "Run"
+      $stderr.puts
+      $stderr.puts "  git remote set-head origin <default branch>"
+      $stderr.puts
+      $stderr.puts "where <default branch> is the default branch name"
+      $stderr.puts "(typically `main`, `master`, or `trunk`)"
+      $stderr.puts "and then rerun the command"
+      exit(1)
+    end
+    @default_branch ||= branch_name
+  end
+
   # Returns the URL for the remote origin.
   def origin_url
     @origin_url ||= `git config --get remote.origin.url`.strip
@@ -95,4 +116,4 @@ class Command
     def deliver?
       options.deliver
     end
-end
+end

data/lib/git-utils/merge_branch.rb

@@ -4,7 +4,7 @@ class MergeBranch < Command
 
   def parser
     OptionParser.new do |opts|
-      opts.banner = "Usage: git merge-branch [branch] [options]"
+      opts.banner = "Usage: git merge-into-branch [branch] [options]"
       opts.on_tail("-h", "--help", "this usage guide") do
         puts opts.to_s; exit 0
       end
@@ -28,8 +28,8 @@ class MergeBranch < Command
 
     # Returns the name of the branch to be merged into.
     # If there is anything left in the known options after parsing,
-    # that's the merge branch. Otherwise, it's master.
+    # that's the merge branch. Otherwise, it's the default branch.
     def target_branch
-      self.known_options.first || 'master'
+      self.known_options.first || default_branch
     end
-end
+end

data/lib/git-utils/open.rb

@@ -34,7 +34,7 @@ class Open < Command
     origin_url.sub(pattern, replacement)
   end
 
-  # Returns a command appropriate for executing at the command line..
+  # Returns a command appropriate for executing at the command line.
   def cmd
     if options[:print]
       puts page_url

data/lib/git-utils/sync.rb

@@ -13,10 +13,10 @@ class Sync < Command
 
   # Returns a command appropriate for executing at the command line.
   def cmd
-    branch = self.known_options.first || 'master'
+    branch = self.known_options.first || default_branch
     c = ["git checkout #{branch}"]
     c << "git pull"
     c << "git checkout #{current_branch}"
     c.join("\n")
   end
-end
+end

data/lib/git-utils/sync_fork.rb

@@ -0,0 +1,21 @@
+require 'git-utils/command'
+
+class SyncFork < Command
+
+  def parser
+    OptionParser.new do |opts|
+      opts.banner = "Usage: git sync-fork [default]"
+      opts.on_tail("-h", "--help", "this usage guide") do
+        puts opts.to_s; exit 0
+      end
+    end
+  end
+
+  # Returns a command appropriate for executing at the command line.
+  def cmd
+    c = ["git checkout #{default_branch}"]
+    c << "git fetch upstream"
+    c << "git merge upstream/#{default_branch}"
+    c.join("\n")
+  end
+end

data/lib/git-utils/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Utils
-    VERSION = "0.7.0"
+    VERSION = "2.2.0"
   end
 end

data/spec/commands/merge_branch_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 describe MergeBranch do
 
   let(:command) { MergeBranch.new }
-  before { command.stub(:current_branch).and_return('tau-manifesto') }
+  before  { command.stub(:current_branch).and_return('tau-manifesto') }
   subject { command }
 
   its(:cmd) { should match /git merge/ }
 
-  shared_examples "merge-branch with known options" do
+  shared_examples "merge-into-branch with known options" do
     subject { command }
     it "should not raise an error" do
       expect { command.parse }.not_to raise_error(OptionParser::InvalidOption)
@@ -19,6 +19,21 @@ describe MergeBranch do
     its(:cmd) { should match /git checkout master/ }
   end
 
+  describe "default branch" do
+    let(:command) { MergeBranch.new }
+
+    describe "for current real repo" do
+      subject { command.default_branch }
+      it { should match 'master' }
+    end
+
+    describe "for repo with different default" do
+      before  { command.stub(:default_branch).and_return('main') }
+      subject { command.default_branch }
+      it { should match 'main' }
+    end
+  end
+
   describe "with a custom development branch" do
     let(:command) { MergeBranch.new(['development']) }
     its(:cmd) { should match /git checkout development/ }
@@ -26,13 +41,13 @@ describe MergeBranch do
 
   describe "with some unknown options" do
     let(:command) { MergeBranch.new(['dev', '-o', '-a', '-z', '--foo']) }
-    it_should_behave_like "merge-branch with known options"
+    it_should_behave_like "merge-into-branch with known options"
     its(:cmd) { should match /-a -z --foo/ }
   end
 
   describe "command-line command" do
-    subject { `bin/git-merge-branch --debug development` }
+    subject { `bin/git-merge-into-branch --debug development` }
     it { should match /git checkout development/ }
     it { should match /git merge --no-ff --log/ }
   end
-end
+end

data/spec/commands/sync_fork_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe SyncFork do
+
+  let(:command) { SyncFork.new }
+  subject { command }
+
+  its(:cmd) { should match /git checkout master/ }
+  its(:cmd) { should match /git fetch upstream/ }
+  its(:cmd) { should match /git merge upstream\/master/ }
+
+
+  describe "command-line command" do
+    subject { `bin/git-sync-fork --debug` }
+    it { should match /git fetch upstream/ }
+  end
+end

metadata

@@ -1,31 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: git-utils
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Michael Hartl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies: []
 description: Add some Git utilities
 email:
 - michael@michaelhartl.com
 executables:
 - git-amend
-- git-anal
 - git-bump
 - git-cleanup
 - git-delete-remote-branch
-- git-merge-branch
+- git-graph
+- git-merge-into-branch
+- git-minor
 - git-open
 - git-polish
 - git-pull-request
 - git-push-branch
 - git-switch
 - git-sync
+- git-sync-fork
 - git-typo
 - git-undo
 extensions: []
@@ -40,17 +42,19 @@ files:
 - README.md
 - Rakefile
 - bin/git-amend
-- bin/git-anal
 - bin/git-bump
 - bin/git-cleanup
 - bin/git-delete-remote-branch
-- bin/git-merge-branch
+- bin/git-graph
+- bin/git-merge-into-branch
+- bin/git-minor
 - bin/git-open
 - bin/git-polish
 - bin/git-pull-request
 - bin/git-push-branch
 - bin/git-switch
 - bin/git-sync
+- bin/git-sync-fork
 - bin/git-typo
 - bin/git-undo
 - git-utils.gemspec
@@ -64,6 +68,7 @@ files:
 - lib/git-utils/push_branch.rb
 - lib/git-utils/switch.rb
 - lib/git-utils/sync.rb
+- lib/git-utils/sync_fork.rb
 - lib/git-utils/version.rb
 - spec/.DS_Store
 - spec/commands/.DS_Store
@@ -74,6 +79,7 @@ files:
 - spec/commands/pull_request_spec.rb
 - spec/commands/push_branch_spec.rb
 - spec/commands/switch_spec.rb
+- spec/commands/sync_fork_spec.rb
 - spec/commands/sync_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mhartl/git-utils
@@ -95,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: See the README for full documentation
@@ -110,5 +115,6 @@ test_files:
 - spec/commands/pull_request_spec.rb
 - spec/commands/push_branch_spec.rb
 - spec/commands/switch_spec.rb
+- spec/commands/sync_fork_spec.rb
 - spec/commands/sync_spec.rb
 - spec/spec_helper.rb

data/bin/git-anal

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-# Makes anal changes.
-system 'git commit -am "Make anal changes"'