@@ -53,8 +53,13 @@ def test_git_dir(git_path, mocked_toplevel_git_dir, expected, environment, fp):
5353 "/git-dir" ,
5454 {
5555 ("git" , "-C" , "/git-dir" , "rev-parse" , "--is-inside-work-tree" ): "true" ,
56- ("git" , "-C" , "/git-dir" , "symbolic-ref" , "refs/remotes/upstream/HEAD" ):
57- "refs/remotes/upstream/develop" ,
56+ (
57+ "git" ,
58+ "-C" ,
59+ "/git-dir" ,
60+ "symbolic-ref" ,
61+ "refs/remotes/upstream/HEAD" ,
62+ ): "refs/remotes/upstream/develop" ,
5863 },
5964 "develop" ,
6065 ),
@@ -72,8 +77,15 @@ def test_git_dir(git_path, mocked_toplevel_git_dir, expected, environment, fp):
7277 "/git-dir" ,
7378 {
7479 ("git" , "-C" , "/git-dir" , "rev-parse" , "--is-inside-work-tree" ): "true" ,
75- ("git" , "-C" , "/git-dir" , "ls-remote" , "--symref" , "upstream" , "HEAD" ):
76- "ref: refs/heads/master\t HEAD\n abc123\t HEAD\n " ,
80+ (
81+ "git" ,
82+ "-C" ,
83+ "/git-dir" ,
84+ "ls-remote" ,
85+ "--symref" ,
86+ "upstream" ,
87+ "HEAD" ,
88+ ): "ref: refs/heads/master\t HEAD\n abc123\t HEAD\n " ,
7789 },
7890 "master" ,
7991 ),
@@ -82,8 +94,15 @@ def test_git_dir(git_path, mocked_toplevel_git_dir, expected, environment, fp):
8294 "/git-dir" ,
8395 {
8496 ("git" , "-C" , "/git-dir" , "rev-parse" , "--is-inside-work-tree" ): "true" ,
85- ("git" , "-C" , "/git-dir" , "ls-remote" , "--symref" , "origin" , "HEAD" ):
86- "ref: refs/heads/trunk\t HEAD\n abc123\t HEAD\n " ,
97+ (
98+ "git" ,
99+ "-C" ,
100+ "/git-dir" ,
101+ "ls-remote" ,
102+ "--symref" ,
103+ "origin" ,
104+ "HEAD" ,
105+ ): "ref: refs/heads/trunk\t HEAD\n abc123\t HEAD\n " ,
87106 },
88107 "trunk" ,
89108 ),
@@ -130,9 +149,7 @@ def test_git_default_branch_conditional(environment, fp):
130149 )
131150 fp .allow_unregistered (allow = True )
132151
133- template = environment .from_string (
134- "{% if (git_path | gitdefaultbranch) %}yes{% else %}no{% endif %}"
135- )
152+ template = environment .from_string ("{% if (git_path | gitdefaultbranch) %}yes{% else %}no{% endif %}" )
136153 assert template .render (git_path = "/git-dir" ) == "yes"
137154 assert template .render (git_path = "/non-git-dir" ) == "no"
138155
0 commit comments