From 638eda5f2d62afe157c4d2e55f8174edbdeb1e16 Mon Sep 17 00:00:00 2001
From: Xu Cheng <xucheng@me.com>
Date: Thu, 13 Aug 2015 14:56:14 +0800
Subject: [PATCH] tap-info: fix for not installed tap

Closes Homebrew/homebrew#42890.

Signed-off-by: Xu Cheng <xucheng@me.com>
---
 Library/Homebrew/cmd/tap-info.rb |  2 +-
 Library/Homebrew/tap.rb          | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/cmd/tap-info.rb b/Library/Homebrew/cmd/tap-info.rb
index c4114fb981..1354264df7 100644
--- a/Library/Homebrew/cmd/tap-info.rb
+++ b/Library/Homebrew/cmd/tap-info.rb
@@ -48,11 +48,11 @@ module Homebrew
           command_count = tap.command_files.size
           info += "#{command_count} command#{plural(command_count)} " if command_count > 0
           info += "\n#{tap.path} (#{tap.path.abv})"
+          info += "\nFrom: #{tap.remote.nil? ? "N/A" : tap.remote}"
         else
           info += "Not installed"
         end
         puts info
-        puts "From: #{tap.remote.nil? ? "N/A" : tap.remote}"
       end
     end
   end
diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb
index 24b496ebe5..9d92dbe96d 100644
--- a/Library/Homebrew/tap.rb
+++ b/Library/Homebrew/tap.rb
@@ -123,20 +123,25 @@ class Tap
   end
 
   def to_hash
-    {
+    hash = {
       "name" => @name,
       "user" => @user,
       "repo" => @repo,
       "path" => @path.to_s,
-      "remote" => remote,
       "installed" => installed?,
       "official" => official?,
-      "custom_remote" => custom_remote?,
       "formula_names" => formula_names,
       "formula_files" => formula_files.map(&:to_s),
       "command_files" => command_files.map(&:to_s),
       "pinned" => pinned?
     }
+
+    if installed?
+      hash["remote"] = remote
+      hash["custom_remote"] = custom_remote?
+    end
+
+    hash
   end
 
   # Hash with tap formula renames