0
@@ -18,17 +18,19 @@ class StashController < ApplicationController
0
     render("diff/_diff_results", :locals => {:diff_results => (git.stash.diff(stash_item[:name]))})
0
   end
0
   
0
-  def apply
0
-    stash_item = select_stash(:prompt => "Select a stash to apply")
0
+  def pop
0
+    stash_item = select_stash(:prompt => "Select a stash to pop")
0
     if stash_item.nil?
0
       puts "Cancelled"
0
       return
0
     end
0
-    puts "<h2>Applying stash '#{stash_item[:description]}'</h2>"
0
+    puts "<h2>Popping stash '#{stash_item[:description]}'</h2>"
0
     flush
0
-
0
+    
0
+    stash_diff = git.stash.diff(stash_item[:name])
0
+    
0
     stash_it = lambda {
0
-      git.stash.apply(stash_item[:name])
0
+      git.stash.pop(stash_item[:name])
0
     }
0
 
0
     result = stash_it.call
0
@@ -56,7 +58,7 @@ class StashController < ApplicationController
0
     render "status/_status", :locals => {:status_data => status_data}
0
     
0
     puts "<h2>Diff of stash applied:</h2>"
0
-    render("/diff/_diff_results", :locals => {:diff_results => git.stash.diff(stash_item[:name])})
0
+    render("/diff/_diff_results", :locals => {:diff_results => stash_diff})
0
     
0
     rescan_project
0
   end

0
@@ -25,6 +25,10 @@ class SCM::Git::Stash < SCM::Git::CommandProxyBase
0
     base.command("stash", "apply", "--index", name)
0
   end
0
   
0
+  def pop(name)
0
+    base.command("stash", "pop", "--index", name)
0
+  end
0
+  
0
   def clear
0
     base.command("stash", "clear")
0
   end

0
@@ -162,8 +162,8 @@ module SCM
0
       options[:type] ||= nil
0
       params = []
0
       params << "-#{options[:type]}" if options[:type]
0
-      params << "--exclude-per-directory=.gitignore"
0
-      params << "--exclude-from=#{e_sh options[:exclude_file]}" if options[:exclude_file]
0
+      # params << "--exclude-per-directory=.gitignore"
0
+      # params << "--exclude-from=#{e_sh options[:exclude_file]}" if options[:exclude_file]
0
       
0
       command("ls-files", *params).split("\n")
0
     end