diff options
| author | Mike McQuaid | 2017-12-31 09:42:36 +0000 |
|---|---|---|
| committer | GitHub | 2017-12-31 09:42:36 +0000 |
| commit | e048106624264fa07cb3e52059ef2d69d0980dbd (patch) | |
| tree | 42c9251ab78ccc298ce54578925379c86b5f392d /Library/Homebrew | |
| parent | 884a2f3667f21109b569d129591199619e76dbe8 (diff) | |
| parent | 799312c5fc45b24ef38e31e54f43e385ad412d53 (diff) | |
| download | brew-e048106624264fa07cb3e52059ef2d69d0980dbd.tar.bz2 | |
Merge pull request #3614 from MikeMcQuaid/previously-deleted-month
missing_formula: check deleted in the last month.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/missing_formula.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/test/missing_formula_spec.rb | 2 |
2 files changed, 4 insertions, 2 deletions
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" |
