| commit | 4314b68573678b084fbaeaa07a1a0e74dd4b50b0 | |
| author | Benoit Sigoure <tsuna@lrde.epita.fr> | |
| Sun, 20 Jan 2008 11:24:38 +0000 (20 12:24 +0100) | ||
| committer | Benoit Sigoure <tsuna@lrde.epita.fr> | |
| Mon, 21 Jan 2008 00:03:05 +0000 (21 01:03 +0100) | ||
| tree | cc915f3777b12464f61c2ee61a21cfd92384d362 | treesnapshot (tar.gz zip) |
| parent | 30f51c0264548e9aa216f6c6dec02eff770fe3c9 | commitdiff |
Fix a couple of bugs.
* svn-merge2git.sh (extract_svn_branch_name): Properly set
$svn_branch_name to the empty string when we can't figure out the
name of the branch being merged. Also enhance the function to match
some other common patterns found in merge commits.
(find_merge_parent): Strengthen a couple of assertions.
(handling of $opt_remote): When creating a local branch from a
remote branch, schedule it so that it's processed by the main loop.
Signed-off-by: Benoit Sigoure <tsuna@lrde.epita.fr>
* svn-merge2git.sh (extract_svn_branch_name): Properly set
$svn_branch_name to the empty string when we can't figure out the
name of the branch being merged. Also enhance the function to match
some other common patterns found in merge commits.
(find_merge_parent): Strengthen a couple of assertions.
(handling of $opt_remote): When creating a local branch from a
remote branch, schedule it so that it's processed by the main loop.
Signed-off-by: Benoit Sigoure <tsuna@lrde.epita.fr>
| svn-merge2git.sh | diffblobblamehistory |