Commita5e607e

committed

fix(iter-commit): ambiguous argument error

In repositories like> git branch -a* test> lstest`repo.iter_commits` failed due to an ambigous argument(`'git rev-list test`).Now this cannot happen anymore.fixesgitpython-developers#264

1 parent630d030 commita5e607eCopy full SHA for a5e607e

File tree

2 files changed

+18

-2

lines changed

git
- objects
  - commit.py
- test
  - test_commit.py

2 files changed

+18

-2

lines changed

`‎git/objects/commit.py`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -189,9 +189,12 @@ def iter_items(cls, repo, rev, paths='', **kwargs):`
`189`	`189`	`if'pretty'inkwargs:`
`190`	`190`	`raiseValueError("--pretty cannot be used as parsing expects single sha's only")`
`191`	`191`	`# END handle pretty`
`192`		`-args=list()`
	`192`	`+`
	`193`	`+# use -- in any case, to prevent possibility of ambiguous arguments`
	`194`	`+# see https://github.com/gitpython-developers/GitPython/issues/264`
	`195`	`+args= ['--']`
`193`	`196`	`ifpaths:`
`194`		`-args.extend(('--',paths))`
	`197`	`+args.extend((paths,))`
`195`	`198`	`# END if paths`
`196`	`199`
`197`	`200`	`proc=repo.git.rev_list(rev,args,as_process=True,**kwargs)`

`‎git/test/test_commit.py`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,15 +19,19 @@`
`19`	`19`	`Actor,`
`20`	`20`	`)`
`21`	`21`	`fromgitdbimportIStream`
	`22`	`+fromgitdb.test.libimportwith_rw_directory`
`22`	`23`	`fromgit.compatimport (`
`23`	`24`	`string_types,`
`24`	`25`	`text_type`
`25`	`26`	`)`
	`27`	`+fromgitimportRepo`
	`28`	`+fromgit.repo.funimporttouch`
`26`	`29`
`27`	`30`	`fromioimportBytesIO`
`28`	`31`	`importtime`
`29`	`32`	`importsys`
`30`	`33`	`importre`
	`34`	`+importos`
`31`	`35`
`32`	`36`
`33`	`37`	`defassert_commit_serialization(rwrepo,commit_id,print_performance_info=False):`
`@@ -219,6 +223,15 @@ def test_rev_list_bisect_all(self):`
`219`	`223`	`forsha1,commitinzip(expected_ids,commits):`
`220`	`224`	`assert_equal(sha1,commit.hexsha)`
`221`	`225`
	`226`	`+@with_rw_directory`
	`227`	`+deftest_ambiguous_arg_iteration(self,rw_dir):`
	`228`	`+rw_repo=Repo.init(os.path.join(rw_dir,'test_ambiguous_arg'))`
	`229`	`+path=os.path.join(rw_repo.working_tree_dir,'master')`
	`230`	`+touch(path)`
	`231`	`+rw_repo.index.add([path])`
	`232`	`+rw_repo.index.commit('initial commit')`
	`233`	`+list(rw_repo.iter_commits(rw_repo.head.ref))# should fail unless bug is fixed`
	`234`	`+`
`222`	`235`	`deftest_count(self):`
`223`	`236`	`assertself.rorepo.tag('refs/tags/0.1.5').commit.count()==143`
`224`	`237`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita5e607e

File tree

2 files changed

2 files changed

`‎git/objects/commit.py`

`‎git/test/test_commit.py`

0 commit comments