diff options
| author | Marcin Kuzminski <marcin@python-works.com> | 2012-05-16 00:06:23 +0200 |
|---|---|---|
| committer | Marcin Kuzminski <marcin@python-works.com> | 2012-05-16 00:06:23 +0200 |
| commit | 1b0f7a440c977654a464199da57046ab0409469b (patch) | |
| tree | eb92c4b526e181293fb4adb319d7e396a4ed0956 /rhodecode/lib/vcs/backends/git/changeset.py | |
| parent | 2a7d84613e7ae9daf2062e80627e79f805896bd7 (diff) | |
fixes #449 bad regex could get more than revisions from parsing history
--HG--
branch : beta
Diffstat (limited to 'rhodecode/lib/vcs/backends/git/changeset.py')
| -rw-r--r-- | rhodecode/lib/vcs/backends/git/changeset.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rhodecode/lib/vcs/backends/git/changeset.py b/rhodecode/lib/vcs/backends/git/changeset.py index eadc2ce2..2480a85c 100644 --- a/rhodecode/lib/vcs/backends/git/changeset.py +++ b/rhodecode/lib/vcs/backends/git/changeset.py @@ -240,11 +240,11 @@ class GitChangeset(BaseChangeset): which is generally not good. Should be replaced with algorithm iterating commits. """ - cmd = 'log --pretty="format: %%H" --name-status -p %s -- "%s"' % ( + cmd = 'log --pretty="format: --%%H--" --name-status -p %s -- "%s"' % ( self.id, path ) so, se = self.repository.run_git_command(cmd) - ids = re.findall(r'\w{40}', so) + ids = re.findall(r'(?:--)(\w{40})(?:--)', so) return [self.repository.get_changeset(id) for id in ids] def get_file_annotate(self, path): |