Handle repo cleanup race more elegantly (#3930)

* Don't attempt to get pwd for error message

* Print error instead of raising exception

This is more user-friendly too.

* Switch back to raise, but rescue it too

* Refactor
This commit is contained in:
Colin Seymour
2017-12-11 12:37:21 +00:00
committed by GitHub
parent e7e64bf39a
commit 1a769c4665

View File

@@ -117,9 +117,8 @@ def git_linguist(args)
end end
parser.parse!(args) parser.parse!(args)
git_dir = `git rev-parse --git-dir`.strip git_dir = `git rev-parse --git-dir`.strip
raise "git-linguist must be run in a Git repository (#{Dir.pwd})" unless $?.success? raise "git-linguist must be run in a Git repository" unless $?.success?
wrapper = GitLinguist.new(git_dir, commit, incremental) wrapper = GitLinguist.new(git_dir, commit, incremental)
case args.pop case args.pop
@@ -141,6 +140,10 @@ def git_linguist(args)
$stderr.print(parser.help) $stderr.print(parser.help)
exit 1 exit 1
end end
rescue Exception => e
$stderr.puts e.message
$stderr.puts e.backtrace
exit 1
end end
git_linguist(ARGV) git_linguist(ARGV)