summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>2012-04-23 17:00:53 +0200
committerRonny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>2012-04-23 17:00:53 +0200
commit22d539f24b314b626c77a447c41fa4f9c26c4847 (patch)
treef994bf3e7f6b8be90f6b1f7fc198722eee826fa0
parentd7773143cbee857f1dd26c08f7cbcb29503e5732 (diff)
downloadsetuptools-scm-22d539f24b314b626c77a447c41fa4f9c26c4847.tar.gz
simplify deciding what path to use after findroots
-rw-r--r--hgdistver.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/hgdistver.py b/hgdistver.py
index 0036c93..d34a432 100644
--- a/hgdistver.py
+++ b/hgdistver.py
@@ -305,8 +305,7 @@ def find_files(dirname=''):
hg = findroot(abs, '.hg')
git = findroot(abs, '.git')
if hg and git:
- m = max(hg, git)
- if max is hg:
+ if hg > git:
git = None
if hg:
return find_hg_files(dirname)