Make autoupdate work for non-master default branches

asottile · asottile · commit 8be0f857e8a9 · 2019-07-20T15:30:30.000-07:00
diff --git a/pre_commit/commands/autoupdate.py b/pre_commit/commands/autoupdate.py
@@ -38,17 +38,17 @@ def _update_repo(repo_config, store, tags_only):
     """
     with tmpdir() as repo_path:
         git.init_repo(repo_path, repo_config['repo'])
-        cmd_output('git', 'fetch', cwd=repo_path)
+        cmd_output('git', 'fetch', 'origin', 'HEAD', '--tags', cwd=repo_path)
 
-        tag_cmd = ('git', 'describe', 'origin/master', '--tags')
+        tag_cmd = ('git', 'describe', 'FETCH_HEAD', '--tags')
         if tags_only:
             tag_cmd += ('--abbrev=0',)
         else:
             tag_cmd += ('--exact',)
         try:
             rev = cmd_output(*tag_cmd, cwd=repo_path)[1].strip()
         except CalledProcessError:
-            tag_cmd = ('git', 'rev-parse', 'origin/master')
+            tag_cmd = ('git', 'rev-parse', 'FETCH_HEAD')
             rev = cmd_output(*tag_cmd, cwd=repo_path)[1].strip()
 
     # Don't bother trying to update if our rev is the same
diff --git a/tests/commands/autoupdate_test.py b/tests/commands/autoupdate_test.py
@@ -309,6 +309,12 @@ def test_autoupdate_hook_disappearing_repo(
     assert before == after
 
 
+def test_autoupdate_non_master_default_branch(up_to_date_repo, store):
+    # change the default branch to be not-master
+    cmd_output('git', '-C', up_to_date_repo, 'branch', '-m', 'dev')
+    test_up_to_date_repo(up_to_date_repo, store)
+
+
 def test_autoupdate_local_hooks(in_git_dir, store):
     config = sample_local_config()
     add_config_to_repo('.', config)
