Notice: this is a static mirror for historical purposes.

View Issue Details Jump to Notes ] Related Changesets ] Issue History ] Print ]
IDProjectCategoryView StatusDate SubmittedLast Update
030Source IntegrationGitwebpublic2009-04-22 20:422009-05-01 07:22
ReporterDavid Hicks 
Assigned ToJohn Reese 
Product Version 
Target Version0.14Fixed in Version0.14 
Summary030: Gitweb importing does not recognise multiple parent IDs for a commit
DescriptionFrom SourceGitweb.php:

            if( preg_match( '#<tr><td>parent</td><td class="sha1"><a [^<>]*>([a-f0-9]*)</a></td>#', $t_gitweb_data, $t_matches ) ) {
                $t_commit['parent'] = $t_matches[1];

Only the first parent ID is being read. In the case of merges, there are two parent IDs and it is required that the second one also be followed to find all the changesets that were merged.

Currently only the first parent is followed (which is usually the previous commit in the branch). The second parent (usually the last commit in the branch that has just been merged) is not followed.

The database format currently only stores one commit parent per changeset. This really needs to be changed so that a changeset can have an arbitrary number of parents attached (octopus merging in git, for example).
TagsNo tags attached.
Attached Files

- Relationships

-  Notes
User avatar (021)
John Reese (administrator)
2009-05-01 07:22

Fix committed to master branch at 2009-05-01 14:12:22.

- Related Changesets
Source Integration: master 30507623
Timestamp: 2009-05-01 14:12:22
Author: John Reese
Committer: John Reese
Details ] Diff ]
Fix 030: Gitweb integration did not properly parse multiple parent commits.
mod - SourceGitweb/SourceGitweb.php Diff ] File ]

- Issue History
Date Modified Username Field Change
2009-02-28 09:39 Changeset attached master 6bdeaedd =>
2009-04-22 20:42 David Hicks New Issue
2009-05-01 06:41 John Reese Assigned To => John Reese
2009-05-01 06:41 John Reese Status new => assigned
2009-05-01 06:41 John Reese Target Version => 0.16
2009-05-01 07:22 John Reese Note Added: 021
2009-05-01 07:22 John Reese Status assigned => resolved
2009-05-01 07:22 John Reese Fixed in Version => 0.16
2009-05-01 07:22 John Reese Resolution open => fixed
2009-05-01 07:22 John Reese Changeset attached master 30507623 =>

Copyright © 2000 - 2012 MantisBT Group
Time: 0.1391 seconds.
memory usage: 8,328 KB
Powered by Mantis Bugtracker

hosted with