diff options
| author | Chris Kampmeier | 2013-12-15 05:13:08 -0800 |
|---|---|---|
| committer | Mike McQuaid | 2013-12-15 17:20:45 +0000 |
| commit | 2635817ca8ddde76d09e66bcad62213176c0601d (patch) | |
| tree | aec82ec4a84fa315f1a1b347ca739dfb3810050b /Library | |
| parent | d1d6451a6a72d79b3eb88f3010cf6c3380ccd002 (diff) | |
| download | brew-2635817ca8ddde76d09e66bcad62213176c0601d.tar.bz2 | |
doctor: don't let gitconfig break dirty-tree check
`brew doctor` always complains about uncommitted modifications to
Homebrew when you have status.branch=true in your git config, because
the implicit --branch makes `git status -s` always print branch/tracking
info. The --porcelain mode is similar to -s/--short, but ignores most of
the user's config and should remain stable.
The --untracked-files option ensures we'll see untracked files even for
users with status.showUntrackedFiles=no, which is not suppressed by
--porcelain for some reason.
Closes Homebrew/homebrew#25230.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/doctor.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index f4fe611d7..efefdc72c 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -909,7 +909,7 @@ end def check_git_status return unless which "git" HOMEBREW_REPOSITORY.cd do - unless `git status -s -- Library/Homebrew/ 2>/dev/null`.chomp.empty? + unless `git status --untracked-files=all --porcelain -- Library/Homebrew/ 2>/dev/null`.chomp.empty? <<-EOS.undent_________________________________________________________72 You have uncommitted modifications to Homebrew If this a surprise to you, then you should stash these modifications. |