Handle tap file renames that remove a file from the formula directory

2 files changed, 14 insertions, 0 deletions

diff --git a/Library/Homebrew/test/fixtures/updater_fixture.yaml b/Library/Homebrew/test/fixtures/updater_fixture.yaml
index 6038623e6..b12f9d447 100644
--- a/Library/Homebrew/test/fixtures/updater_fixture.yaml
+++ b/Library/Homebrew/test/fixtures/updater_fixture.yaml
@@ -43,6 +43,9 @@ update_git_diff_output_with_changed_filetype: |
 update_git_diff_output_with_restructured_tap: |
   R100	git.rb	Formula/git.rb
   R100	lua.rb	Formula/lua.rb
+update_git_diff_simulate_homebrew_php_restructuring: |
+  R100	Formula/git.rb	Abstract/git.rb
+  R100	Formula/lua.rb	Abstract/lua.rb
 update_git_diff_output_with_tap_formulae_changes: |
   M	Rakefile
   M	README.md
diff --git a/Library/Homebrew/test/test_updater.rb b/Library/Homebrew/test/test_updater.rb
index b08766ae2..41824ebde 100644
--- a/Library/Homebrew/test/test_updater.rb
+++ b/Library/Homebrew/test/test_updater.rb
@@ -98,6 +98,17 @@ class UpdaterTests < Homebrew::TestCase
     perform_update("update_git_diff_output_with_restructured_tap")
 
     assert_equal %w{foo/bar/git foo/bar/lua}, @report.select_formula(:A)
+    assert_empty @report.select_formula(:D)
+  end
+
+  def test_update_homebrew_simulate_homebrew_php_restructuring
+    repo = HOMEBREW_LIBRARY.join("Taps", "foo", "bar")
+    @updater = UpdaterMock.new(repo)
+    repo.join("Formula").mkpath
+
+    perform_update("update_git_diff_simulate_homebrew_php_restructuring")
+
+    assert_empty @report.select_formula(:A)
     assert_equal %w{foo/bar/git foo/bar/lua}, @report.select_formula(:D)
   end