| commit | 86506fe54c8e9e5f75a73956840497e3e5744f86 | |
| author | Simon Hausmann <simon@lst.de> | |
| Wed, 18 Jul 2007 10:40:12 +0000 (18 12:40 +0200) | ||
| committer | Simon Hausmann <simon@lst.de> | |
| Wed, 18 Jul 2007 15:29:31 +0000 (18 17:29 +0200) | ||
| tree | 1f5429d94161bb3b368f21282e78e578784cc6b8 | treesnapshot (tar.gz zip) |
| parent | 062410bb9d6553e6bc4f8fa7f0cab1ed63b75628 | commitdiff |
git-p4: Fix upstream branch detection for submit/rebase with multiple branches.
Don't use git name-rev to locate the upstream git-p4 branch for rebase and submit but instead locate the branch by comparing the depot paths.
name-rev may produce results like wrongbranch~12 as it uses the first match.
Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
Don't use git name-rev to locate the upstream git-p4 branch for rebase and submit but instead locate the branch by comparing the depot paths.
name-rev may produce results like wrongbranch~12 as it uses the first match.
Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
| contrib/fast-import/git-p4 | diffblobblamehistory |