git-multirepo 1.0.0.beta32 → 1.0.0.beta34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82162a9cc290a3d97f8db37ee108a82d0a480e29
-  data.tar.gz: f1b49390a52450c77dbed2125fec8e491351f44b
+  metadata.gz: c045eba95d5673d7f6d50df2792b88746c72a823
+  data.tar.gz: bf3bc7c42774720c56a5befa2d8d2282308e73e8
 SHA512:
-  metadata.gz: 01c17b8cd7dfdb152b8e72da33e0442caa61c6245beb58e345342f6da1921fb250d33ac395d52840a4a6b2d010784e1fa2d791cc1b76d5ceec29680626cbc3be
-  data.tar.gz: 1b1a49c8b247330283daf82ed667e04ec436f85ff69d7926b5e1ac850ac61cee290a2663b5d9e79b83fb4c0b2d4b00ab34a5331384489b938fc13b493d749d11
+  metadata.gz: 6c0d78aa10b2f0fa88d7b4cd0d9c55a83b00d44e54d8736ea7281753e81838218f8419ec426be2d2d1cfc74095bf440eff7c78036f1c03c5640b52b877717e54
+  data.tar.gz: fe699d4d22fa26656e12378319b6d47954ca9200b3c0b6938e8b10ef3cef547e463d9e47e8064d97c570fe245ad31fe89933440e98fbfb23234997790c29d1c0

data/.multirepo.lock

@@ -2,12 +2,12 @@
 - !ruby/object:MultiRepo::LockEntry
   name: git-multirepo-dummy
   id: e27695e9-e21d-4ad1-81b8-0ed587574c38
-  head: 111f680fd0153a35ed97febc48d118c784f0a98f
+  head: ff42af28013b1609f6b060d87b14d0b6414b2380
   branch: master
 - !ruby/object:MultiRepo::LockEntry
   name: git-multirepo-dummy-dep1
   id: dcb567d6-7456-494a-b7b5-adc208a87f2f
-  head: e906c3c87cbade5837b014b48ef9922f58c94fbb
+  head: b64dbc542086dbbf926b330d1a70b13d3f2a6a48
   branch: master
 - !ruby/object:MultiRepo::LockEntry
   name: git-multirepo-dummy-dep2
@@ -17,5 +17,5 @@
 - !ruby/object:MultiRepo::LockEntry
   name: git-multirepo-migrations
   id: ad6472a5-7238-447f-a54e-50f50197e21e
-  head: 841223db4851a1de7af8e22205eb7a840cc0ad38
+  head: 160b6a15d9bed989abbcf81d2a91cb4a226f4482
   branch: master

data/.multirepo.meta

@@ -1,2 +1,2 @@
 --- !ruby/object:MultiRepo::MetaFile
-version: 1.0.0.beta32
+version: 1.0.0.beta33

data/docs/bug-repros/91565510-repro.sh

@@ -0,0 +1,21 @@
+echo "----> Setup a new test repo"
+dir_name="PreCommitHookAddTest"
+rm -rf $dir_name; mkdir $dir_name; cd $dir_name
+git init; git commit --allow-empty -m "Initial commit"
+
+echo "----> Add a pre-commit hook that stages a file that doesn't currently exist in the repo"
+echo "touch auto-added; git add auto-added" > .git/hooks/pre-commit
+chmod +x .git/hooks/pre-commit
+
+echo "----> Try committing a new file using the '-o' flag"
+touch manually-added; git add manually-added
+git commit -o -m "Commit that ran the pre-commit hook and should contain file 'auto-added'" -- manually-added
+
+echo "----> Results (expected: working copy clean; actual: auto-added is reported as both DELETED and UNTRACKED. HEAD and working copy are the same, staging area contains ‘incorrect' state)"
+git status
+
+echo "----> Stage the file after the fact"
+git add auto-added
+
+echo "----> Notice that the working copy is now clean"
+git status

data/lib/git-multirepo.rb

@@ -1 +1,2 @@
-require "multirepo/hooks/pre-commit-hook.rb"
+require "multirepo/hooks/pre-commit-hook.rb"
+require "multirepo/hooks/post-commit-hook.rb"

data/lib/info.rb

@@ -1,5 +1,5 @@
 module MultiRepo
   NAME = "git-multirepo"
-  VERSION = "1.0.0.beta32"
+  VERSION = "1.0.0.beta34"
   DESCRIPTION = "Track multiple Git repositories side-by-side."
 end

data/lib/multirepo/commands/command.rb

@@ -32,10 +32,12 @@ module MultiRepo
     def install_hooks(path)
       actual_path = path || "."
       Utils.install_hook("pre-commit", actual_path)
+      Utils.install_hook("post-commit", actual_path)
     end
     
     def uninstall_hooks
       FileUtils.rm_f(".git/hooks/pre-commit")
+      FileUtils.rm_f(".git/hooks/post-commit")
     end
     
     def update_gitconfig(path)

data/lib/multirepo/commands/fetch-command.rb

@@ -10,6 +10,12 @@ module MultiRepo
       ensure_in_work_tree
       ensure_multirepo_enabled
       
+      Console.log_step("Fetching main repo...")
+      
+      main_repo = Repo.new(".")
+      Console.log_substep("Fetching from #{main_repo.remote('origin').url}...")
+      main_repo.fetch
+      
       Console.log_step("Fetching dependencies...")
       
       ConfigFile.load_entries.each do |entry|

data/lib/multirepo/commands/install-command.rb

@@ -55,22 +55,20 @@ module MultiRepo
     end
     
     def install_hooks_step
-      install_hooks(".")
-      Console.log_substep("Installed git hooks in main repo")
-      
-      multirepo_enabled_dependencies.each do |entry|
-        install_hooks(entry.repo.path)
-        Console.log_substep("Installed hooks in multirepo-enabled dependency '#{entry.repo.path}'")
-      end
+      perform_in_main_repo_and_dependencies("Installed git hooks") { |repo| install_hooks(repo) }
     end
     
     def update_gitconfigs_step
-      update_gitconfig(".")
-      Console.log_substep("Updated .git/config file")
+      perform_in_main_repo_and_dependencies("Updated .git/config file") { |repo| update_gitconfig(repo) }
+    end
+    
+    def perform_in_main_repo_and_dependencies(message_prefix, &operation)
+      operation.call(".")
+      Console.log_substep("#{message_prefix} in main repo")
       
       multirepo_enabled_dependencies.each do |entry|
-        update_gitconfig(entry.repo.path)
-        Console.log_substep("Updated .git/config in multirepo-enabled dependency '#{entry.repo.path}'")
+        operation.call(entry.repo.path)
+        Console.log_substep("#{message_prefix} in multirepo-enabled dependency '#{entry.repo.path}'")
       end
     end
     

data/lib/multirepo/files/config-file.rb

@@ -21,15 +21,15 @@ module MultiRepo
     end
     
     def self.entry_exists?(entry)
-      load.any? { |e| e == entry }
+      load_entries.any? { |e| e == entry }
     end
     
     def self.add_entry(entry)
-      save(load.push(entry))
+      save_entries(load_entries.push(entry))
     end
     
     def self.remove_entry(entry)
-      save(load.delete_if { |e| e == entry })
+      save_entries(load_entries.delete_if { |e| e == entry })
     end
   end
 end

data/lib/multirepo/git/git.rb

@@ -19,7 +19,10 @@ module MultiRepo
       # True fix for the -C flag issue in pre-commit hook where the status command would
       # fail to provide correct results if a pathspec was provided when performing a commit.
       # http://thread.gmane.org/gmane.comp.version-control.git/263319/focus=263323
-      full_command = "sh -c 'unset $(git rev-parse --local-env-vars); #{full_command};'" if Config.instance.running_git_hook
+      
+      if Config.instance.running_git_hook
+        full_command = "sh -c 'unset $(git rev-parse --local-env-vars); #{full_command};'" 
+      end
       
       run(full_command, verbosity)
     end

data/lib/multirepo/hooks/post-commit-hook.rb

@@ -0,0 +1,23 @@
+require "multirepo/files/config-file"
+require "multirepo/files/tracking-files"
+require "multirepo/utility/utils"
+require "multirepo/utility/console"
+
+module MultiRepo
+  class PostCommitHook
+    def self.run
+      Config.instance.running_git_hook = true
+      
+      Console.log_step("Performing post-commit operations...")
+      
+      # Works around bug #91565510 (https://www.pivotaltracker.com/story/show/91565510)
+      TrackingFiles.stage
+      Console.log_info("Cleaned-up staging area")
+      
+      exit 0 # Success!
+    rescue StandardError => e
+      Console.log_error("Post-commit hook failed to execute! #{e.message}")
+      exit 1 # Something went wrong!
+    end
+  end
+end

data/resources/post-commit

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "git-multirepo"
+
+MultiRepo::PostCommitHook.run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-multirepo
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta32
+  version: 1.0.0.beta34
 platform: ruby
 authors:
 - Michaël Fortin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-02 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,6 +120,7 @@ files:
 - README.md
 - Rakefile
 - bin/multi
+- docs/bug-repros/91565510-repro.sh
 - docs/git-multirepo-cheatsheet.docx
 - git-multirepo.gemspec
 - lib/commands.rb
@@ -152,12 +153,14 @@ files:
 - lib/multirepo/git/git.rb
 - lib/multirepo/git/remote.rb
 - lib/multirepo/git/repo.rb
+- lib/multirepo/hooks/post-commit-hook.rb
 - lib/multirepo/hooks/pre-commit-hook.rb
 - lib/multirepo/multirepo-exception.rb
 - lib/multirepo/utility/console.rb
 - lib/multirepo/utility/runner.rb
 - lib/multirepo/utility/utils.rb
 - resources/.gitconfig
+- resources/post-commit
 - resources/pre-commit
 - spec/integration/init_spec.rb
 - spec/spec_helper.rb