diff --git a/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb b/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb
index e015453a..f2866bd5 100644
--- a/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb
+++ b/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb
@@ -23,6 +23,12 @@ def setup_environment
         end
       end
 
+      # Returns whether the current git branch is empty (has no commits).
+      def initial_commit?
+        return @initial_commit unless @initial_commit.nil?
+        @initial_commit = Overcommit::GitRepo.initial_commit?
+      end
+
       # Restore unstaged changes and reset file modification times so it appears
       # as if nothing ever changed.
       #
@@ -61,12 +67,6 @@ def store_modified_times
         end
       end
 
-      # Returns whether the current git branch is empty (has no commits).
-      def initial_commit?
-        return @initial_commit unless @initial_commit.nil?
-        @initial_commit = Overcommit::GitRepo.initial_commit?
-      end
-
       # Returns whether there are any changes to tracked files which have not yet
       # been staged.
       def unstaged_changes?