Commitaf44258

committed

Merge pull request#319 from jeblair/fixhead

Always add '--' to git reset

2 parentsb21e2f1 +bdc38b8 commitaf44258Copy full SHA for af44258

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ def reset(self, commit='HEAD', index=True, working_tree=False,`
`55`	`55`
`56`	`56`	`:return: self"""`
`57`	`57`	`mode="--soft"`
`58`		`-add_arg=None`
`59`	`58`	`ifindex:`
`60`	`59`	`mode="--mixed"`
`61`	`60`
`@@ -73,12 +72,8 @@ def reset(self, commit='HEAD', index=True, working_tree=False,`
`73`	`72`
`74`	`73`	`# END working tree handling`
`75`	`74`
`76`		`-ifpaths:`
`77`		`-add_arg="--"`
`78`		`-# END nicely separate paths from rest`
`79`		`-`
`80`	`75`	`try:`
`81`		`-self.repo.git.reset(mode,commit,add_arg,paths,**kwargs)`
	`76`	`+self.repo.git.reset(mode,commit,'--',paths,**kwargs)`
`82`	`77`	`exceptGitCommandErrorase:`
`83`	`78`	`# git nowadays may use 1 as status to indicate there are still unstaged`
`84`	`79`	`# modifications after the reset`

Comments

(0)