9 files changed, 23 insertions, 17 deletions
diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb
index 6727c0b6b..a4629025a 100644
--- a/Library/Homebrew/cmd/reinstall.rb
+++ b/Library/Homebrew/cmd/reinstall.rb
@@ -1,5 +1,5 @@
 #:  * `reinstall` <formula>:
-#:    Uninstall and then install <formula>.
+#:    Uninstall and then install <formula> (with existing install options).
 
 require "formula_installer"
 require "development_tools"
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 9f8763904..cf0bb2759 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -1,5 +1,5 @@
 #:  * `upgrade` [<install-options>] [`--cleanup`] [`--fetch-HEAD`] [<formulae>]:
-#:    Upgrade outdated, unpinned brews.
+#:    Upgrade outdated, unpinned brews (with existing install options).
 #:
 #:    Options for the `install` command are also valid here.
 #:
diff --git a/Library/Homebrew/language/python.rb b/Library/Homebrew/language/python.rb
index b52714dd5..3908f4b8f 100644
--- a/Library/Homebrew/language/python.rb
+++ b/Library/Homebrew/language/python.rb
@@ -134,11 +134,11 @@ module Language
       def virtualenv_install_with_resources(options = {})
         python = options[:using]
         if python.nil?
-          wanted = %w[python python3].select { |py| needs_python?(py) }
+          wanted = %w[python python@2 python@3 python3].select { |py| needs_python?(py) }
           raise FormulaAmbiguousPythonError, self if wanted.size > 1
-          python = wanted.first || "python"
+          python = wanted.first || "python2.7"
         end
-        venv = virtualenv_create(libexec, python)
+        venv = virtualenv_create(libexec, python.delete("@"))
         venv.pip_install resources
         venv.pip_install_and_link buildpath
         venv
diff --git a/Library/Homebrew/manpages/brew-cask.1.md b/Library/Homebrew/manpages/brew-cask.1.md
index 9fb3b794f..4b70822ee 100644
--- a/Library/Homebrew/manpages/brew-cask.1.md
+++ b/Library/Homebrew/manpages/brew-cask.1.md
@@ -86,7 +86,7 @@ names, and other aspects of this manual are still subject to change.
     If <token> is given, summarize the staged files associated with the
     given Cask.
 
-  * `outdated` [--greedy] [--verbose|--quiet] [ <token> ...]:
+  * `outdated` [--greedy] [--verbose|--quiet] [ <token> ... ]:
     Without token arguments, display all the installed Casks that have newer
     versions available in the tap; otherwise check only the tokens given
     in the command line.
@@ -116,8 +116,12 @@ names, and other aspects of this manual are still subject to change.
     Uninstall the given Cask. With `--force`, uninstall even if the Cask
     does not appear to be present.
 
-  * `upgrade` <token> [ <token> ... ]:
-    Upgrades the given Cask if outdated.
+  * `upgrade` [--force] [--greedy] <token> [ <token> ... ]:
+    Without token arguments, upgrade all the installed Casks that have newer
+    versions available in the tap; otherwise update the tokens given
+    in the command line.
+    If `--greedy` is given then also upgrade the Casks having `auto_updates true`
+    or `version :latest`.
 
   * `zap` <token> [ <token> ... ]:
     Unconditionally remove _all_ files associated with the given Cask.
diff --git a/Library/Homebrew/missing_formula.rb b/Library/Homebrew/missing_formula.rb
index 97ed5749a..146c3e984 100644
--- a/Library/Homebrew/missing_formula.rb
+++ b/Library/Homebrew/missing_formula.rb
@@ -122,7 +122,7 @@ module Homebrew
 
         tap.path.cd do
           unless silent
-            ohai "Searching for a previously deleted formula..."
+            ohai "Searching for a previously deleted formula (in the last month)..."
             if (tap.path/".git/shallow").exist?
               opoo <<~EOS
                 #{tap} is shallow clone. To get complete history run:
@@ -132,7 +132,7 @@ module Homebrew
             end
           end
 
-          log_command = "git log --name-only --max-count=1 --format=%H\\\\n%h\\\\n%B -- #{relative_path}"
+          log_command = "git log --since='1 month ago' --diff-filter=D --name-only --max-count=1 --format=%H\\\\n%h\\\\n%B -- #{relative_path}"
           hash, short_hash, *commit_message, relative_path =
             Utils.popen_read(log_command).gsub("\\n", "\n").lines.map(&:chomp)
 
diff --git a/Library/Homebrew/test/missing_formula_spec.rb b/Library/Homebrew/test/missing_formula_spec.rb
index 830ecb6aa..d16c6116f 100644
--- a/Library/Homebrew/test/missing_formula_spec.rb
+++ b/Library/Homebrew/test/missing_formula_spec.rb
@@ -140,6 +140,8 @@ describe Homebrew::MissingFormula do
       tap_path = Tap::TAP_DIRECTORY/"homebrew/homebrew-foo"
       tap_path.mkpath
       (tap_path/"deleted-formula.rb").write "placeholder"
+      ENV.delete "GIT_AUTHOR_DATE"
+      ENV.delete "GIT_COMMITTER_DATE"
 
       tap_path.cd do
         system "git", "init"
diff --git a/docs/Manpage.md b/docs/Manpage.md
index f42009ab5..51affc32c 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -397,7 +397,7 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
     all formulae or to determine if any current formulae have Ruby issues.
 
   * `reinstall` `formula`:
-    Uninstall and then install `formula`.
+    Uninstall and then install `formula` (with existing install options).
 
   * `search`, `-S`:
     Display all locally available formulae for brewing (including tapped ones).
@@ -569,7 +569,7 @@ With `--verbose` or `-v`, many commands print extra debugging information. Note
     or committed changes.
 
   * `upgrade` [`install-options`] [`--cleanup`] [`--fetch-HEAD`] [`formulae`]:
-    Upgrade outdated, unpinned brews.
+    Upgrade outdated, unpinned brews (with existing install options).
 
     Options for the `install` command are also valid here.
 
diff --git a/manpages/brew-cask.1 b/manpages/brew-cask.1
index 3457171b3..44e1ed14d 100644
--- a/manpages/brew-cask.1
+++ b/manpages/brew-cask.1
@@ -88,7 +88,7 @@ Without any arguments, list all installed Casks\. With \fB\-1\fR, always format
 If \fItoken\fR is given, summarize the staged files associated with the given Cask\.
 .
 .TP
-\fBoutdated\fR [\-\-greedy] [\-\-verbose|\-\-quiet] [ \fItoken\fR \.\.\.]
+\fBoutdated\fR [\-\-greedy] [\-\-verbose|\-\-quiet] [ \fItoken\fR \.\.\. ]
 Without token arguments, display all the installed Casks that have newer versions available in the tap; otherwise check only the tokens given in the command line\. If \fB\-\-greedy\fR is given then also include in the output the Casks having \fBauto_updates true\fR or \fBversion :latest\fR\. Otherwise they are skipped because there is no reliable way to know when updates are available for them\.
 .
 .br
@@ -114,8 +114,8 @@ Check the given Casks for correct style using RuboCop Cask \fIhttps://github\.co
 Uninstall the given Cask\. With \fB\-\-force\fR, uninstall even if the Cask does not appear to be present\.
 .
 .TP
-\fBupgrade\fR \fItoken\fR [ \fItoken\fR \.\.\. ]
-Upgrades the given Cask if outdated\.
+\fBupgrade\fR [\-\-force] [\-\-greedy] \fItoken\fR [ \fItoken\fR \.\.\. ]
+Without token arguments, upgrade all the installed Casks that have newer versions available in the tap; otherwise update the tokens given in the command line\. If \fB\-\-greedy\fR is given then also upgrade the Casks having \fBauto_updates true\fR or \fBversion :latest\fR\.
 .
 .TP
 \fBzap\fR \fItoken\fR [ \fItoken\fR \.\.\. ]
diff --git a/manpages/brew.1 b/manpages/brew.1
index d8cea8975..ba13b5680 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -406,7 +406,7 @@ This can be useful for debugging issues across all formulae when making signific
 .
 .TP
 \fBreinstall\fR \fIformula\fR
-Uninstall and then install \fIformula\fR\.
+Uninstall and then install \fIformula\fR (with existing install options)\.
 .
 .TP
 \fBsearch\fR, \fB\-S\fR
@@ -584,7 +584,7 @@ Fetches and resets Homebrew and all tap repositories using \fBgit\fR(1) to their
 .
 .TP
 \fBupgrade\fR [\fIinstall\-options\fR] [\fB\-\-cleanup\fR] [\fB\-\-fetch\-HEAD\fR] [\fIformulae\fR]
-Upgrade outdated, unpinned brews\.
+Upgrade outdated, unpinned brews (with existing install options)\.
 .
 .IP
 Options for the \fBinstall\fR command are also valid here\.