when #check_applies fails, add the exitstatus to the accumulated stat…

…us return value
ooyala · Jan 13, 2011 · 3392866 · 3392866
1 parent 6684afe
commit 3392866
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/grit/git.rb b/lib/grit/git.rb
@@ -186,8 +186,8 @@ def check_applies(head_sha, applies_sha)
         native(:read_tree, options.dup, head_sha)
         stdin = native(:diff, options.dup, "#{applies_sha}^", applies_sha)
         native(:apply, options.merge(:check => true, :cached => true, :input => stdin))
-      rescue CommandFailed
-        status += 1
+      rescue CommandFailed => fail
+        status += fail.exitstatus
       end
       status
     end