diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2015-08-24 16:13:04 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2015-08-24 16:13:04 +0200 |
| commit | c70494206ed4de1af17b73f2fd7b26b0a8d4fc8e (patch) | |
| tree | 03d2c743c6ce5cd334cda90a75fdade63b30eb71 /lisp | |
| parent | bc10a366d9f04586f9ef54ef5ffabe651bc98807 (diff) | |
travis: do not assert Git is recent enough
Travis only has Git v1.8.5 but using Magit interactively requires
v1.9.4. However compiling Magit doesn't require Git at all and the
current tests also work with v1.8.5. So do not check the Git version
when compiling or loading `magit.el' on Travis. Eventually, when we
add new tests, that will start failing, but we can deal with that then
(by figuring out how to install a more recent Git version on Travis).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/magit.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/magit.el b/lisp/magit.el index f5747e3..3aeb09a 100644 --- a/lisp/magit.el +++ b/lisp/magit.el @@ -2261,7 +2261,8 @@ Git, and Emacs in the echo area." (when version (when (string-match "^\\([0-9]+\\.[0-9]+\\.[0-9]+\\)" version) (setq version (match-string 1 version))) - (when (version< version "1.9.4") + (when (and (not (equal (getenv "TRAVIS") "true")) + (version< version "1.9.4")) (display-warning 'magit (format "\ Magit requires Git >= 1.9.4, you are using %s. |