Commit ece804a

Arthur-MilchiorByron

authored and

committed

Method stating which commit is being played during an halted rebase

This will be useful to me at least. This way, I know that I can tell my script to omit some specific commits. If you accept to merge it, I may also do similar method for merges and cherry pick.

1 parent d5cc590 commit ece804aCopy full SHA for ece804a

File tree

2 files changed

+12

-0

lines changed

AUTHORS
git/repo
- base.py

2 files changed

+12

-0

lines changed

`‎AUTHORS`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,6 @@ Contributors are:`
`33`	`33`	`-Steven Whitman <ninloot _at_ gmail.com>`
`34`	`34`	`-Stefan Stancu <stefan.stancu _at_ gmail.com>`
`35`	`35`	`-César Izurieta <cesar _at_ caih.org>`
	`36`	`+-Arthur Milchior <arthur _at_ milchior.fr>`
`36`	`37`
`37`	`38`	`Portions derived from other open source works and are clearly marked.`

`‎git/repo/base.py`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1062,3 +1062,14 @@ def has_separate_working_tree(self):`
`1062`	`1062`
`1063`	`1063`	`def __repr__(self):`
`1064`	`1064`	`return '<git.Repo "%s">' % self.git_dir`
	`1065`	`+`
	`1066`	`+ def currentlyRebasingOn(self):`
	`1067`	`+ """`
	`1068`	`+ :return: The hash of the commit which is currently being replayed while rebasing.`
	`1069`	`+`
	`1070`	`+ None if we are not currently rebasing.`
	`1071`	`+ """`
	`1072`	`+ rebase_head_file = osp.join(self.git_dir, "REBASE_HEAD")`
	`1073`	`+ if not osp.isfile(rebase_head_file):`
	`1074`	`+ return None`
	`1075`	`+ return open(rebase_head_file, "rt").readline().strip()`

0 commit comments

Comments

(0)

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit ece804a

File tree

2 files changed

2 files changed

`‎AUTHORS`

`‎git/repo/base.py`

0 commit comments