From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Feb 2019 06:05:25 +0000 (-0800)
Subject: Merge branch 'sg/travis-specific-cc'
X-Git-Tag: v2.21.0-rc0~17
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/51b996662bb5ac055cf9639eb0f0a1fc5876a4aa?ds=inline;hp=-c

Merge branch 'sg/travis-specific-cc'

The travis CI scripts have been corrected to build Git with the
compiler(s) of our choice.

* sg/travis-specific-cc:
travis-ci: build with the right compiler
travis-ci: switch to Xcode 10.1 macOS image
travis-ci: don't be '--quiet' when running the tests
.gitignore: ignore external debug symbols from GCC on macOS
---

51b996662bb5ac055cf9639eb0f0a1fc5876a4aa
diff --combined .gitignore
index 6fd61c7272,a9db568712..7374587f9d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,3 +1,4 @@@
 +/fuzz-commit-graph
  /fuzz_corpora
  /fuzz-pack-headers
  /fuzz-pack-idx
@@@ -125,6 -124,7 +125,6 @@@
  /git-rebase--am
  /git-rebase--common
  /git-rebase--interactive
 -/git-rebase--merge
  /git-rebase--preserve-merges
  /git-receive-pack
  /git-reflog
@@@ -229,3 -229,4 +229,4 @@@
  *.pdb
  /Debug/
  /Release/
+ *.dSYM