Commit10fb861

committed

fix tests that assumed default initial branch setting

1 parenta943fa3 commit10fb861Copy full SHA for 10fb861

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ def _assert_diff_format(self, diffs):`
`51`	`51`	`@with_rw_directory`
`52`	`52`	`deftest_diff_with_staged_file(self,rw_dir):`
`53`	`53`	`# SET UP INDEX WITH MULTIPLE STAGES`
`54`		`-r=Repo.init(rw_dir)`
	`54`	`+r=Repo.init(rw_dir,initial_branch="master")`
`55`	`55`	`fp=osp.join(rw_dir,"hello.txt")`
`56`	`56`	`withopen(fp,"w")asfs:`
`57`	`57`	`fs.write("hello world")`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1193,7 +1193,7 @@ def test_remote_method(self):`
`1193`	`1193`	`@with_rw_directory`
`1194`	`1194`	`deftest_empty_repo(self,rw_dir):`
`1195`	`1195`	`"""Assure we can handle empty repositories"""`
`1196`		`-r=Repo.init(rw_dir,mkdir=False)`
	`1196`	`+r=Repo.init(rw_dir,mkdir=False,initial_branch="master")`
`1197`	`1197`	`# It's ok not to be able to iterate a commit, as there is none.`
`1198`	`1198`	`self.assertRaises(ValueError,r.iter_commits)`
`1199`	`1199`	`self.assertEqual(r.active_branch.name,"master")`
`@@ -1352,7 +1352,7 @@ def test_git_work_tree_env(self, rw_dir):`
`1352`	`1352`
`1353`	`1353`	`@with_rw_directory`
`1354`	`1354`	`deftest_rebasing(self,rw_dir):`
`1355`		`-r=Repo.init(rw_dir)`
	`1355`	`+r=Repo.init(rw_dir,initial_branch="master")`
`1356`	`1356`	`fp=osp.join(rw_dir,"hello.txt")`
`1357`	`1357`	`r.git.commit(`
`1358`	`1358`	`"--allow-empty",`

Comments

(0)