unset GIT_DIR variable after operation. fix issue minad#5

bronson · Aug 25, 2010 · 2e882f4 · 2e882f4
1 parent 7db859c
commit 2e882f4
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 18 deletions.
diff --git a/lib/gitrb/repository.rb b/lib/gitrb/repository.rb
@@ -276,26 +276,27 @@ def put(object)
     def method_missing(name, *args, &block)
       cmd = name.to_s
       if cmd[0..3] == 'git_'
-        ENV['GIT_DIR'] = path
         cmd = cmd[4..-1].tr('_', '-')
         args = args.flatten.compact.map {|s| "'" + s.to_s.gsub("'", "'\\\\''") + "'" }.join(' ')
         cmdline = "git #{cmd} #{args} 2>&1"
 
         @logger.debug "gitrb: #{cmdline}"
 
-	# Read in binary mode (ascii-8bit) and convert afterwards
-        out = if block_given?
-		IO.popen(cmdline, 'rb', &block)
-	      else
-                set_encoding IO.popen(cmdline, 'rb') {|io| io.read }
-              end
+        with_git_dir do
+          # Read in binary mode (ascii-8bit) and convert afterwards
+          out = if block_given?
+                  IO.popen(cmdline, 'rb', &block)
+                else
+                  set_encoding IO.popen(cmdline, 'rb') {|io| io.read }
+                end
+
+          if $?.exitstatus > 0
+            return '' if $?.exitstatus == 1 && out == ''
+            raise CommandError.new("git #{cmd}", args, out)
+          end
 
-        if $?.exitstatus > 0
-          return '' if $?.exitstatus == 1 && out == ''
-          raise CommandError.new("git #{cmd}", args, out)
+          out
         end
-
-        out
       else
         super
       end
@@ -316,6 +317,14 @@ def default_user
       User.new(name, email)
     end
 
+    def with_git_dir
+      old_path = ENV['GIT_DIR']
+      ENV['GIT_DIR'] = path
+      yield
+    ensure
+      ENV['GIT_DIR'] = old_path
+    end
+
     private
 
     def check_git_version

diff --git a/test/commit_test.rb b/test/commit_test.rb
@@ -36,12 +36,14 @@
     repo.root['a'] = Gitrb::Blob.new(:data => "Yay")
     commit = repo.commit("Commit Message", author, author)
 
-    IO.popen("git log") do |io|
-      io.gets.should.equal "commit #{commit.id}\n"
-      io.gets.should.equal "Author: hans <hans@email.de>\n"
-      io.gets.should.equal "Date:   Mon Apr 20 00:00:00 2009 #{Time.now.strftime('%z')}\n"
-      io.gets.should.equal "\n"
-      io.gets.should.equal "    Commit Message\n"
+    repo.with_git_dir do
+      IO.popen("git log") do |io|
+        io.gets.should.equal "commit #{commit.id}\n"
+        io.gets.should.equal "Author: hans <hans@email.de>\n"
+        io.gets.should.equal "Date:   Mon Apr 20 00:00:00 2009 #{Time.now.strftime('%z')}\n"
+        io.gets.should.equal "\n"
+        io.gets.should.equal "    Commit Message\n"
+      end
     end
   end
 

diff --git a/test/repository_test.rb b/test/repository_test.rb
@@ -10,6 +10,14 @@
     @repo = Gitrb::Repository.new(:path => REPO, :create => true)
   end
 
+  it 'should set the GIT_DIR environment variable' do
+    ENV['GIT_DIR'].should.equal nil
+    repo.with_git_dir do
+      ENV['GIT_DIR'].should.equal REPO + "/.git"
+    end
+    ENV['GIT_DIR'].should.equal nil
+  end
+
   it 'should put and get objects by sha' do
     blob1 = repo.put(Gitrb::Blob.new(:data => 'Hello'))
     blob2 = repo.put(Gitrb::Blob.new(:data => 'World'))