]> git.ipfire.org Git - thirdparty/git.git/commit - contrib/fast-import/git-p4
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 062410b) | patch
git-p4: Fix upstream branch detection for submit/rebase with multiple branches.
authorSimon Hausmann <simon@lst.de>
Wed, 18 Jul 2007 10:40:12 +0000 (12:40 +0200)
committerSimon Hausmann <simon@lst.de>
Wed, 18 Jul 2007 15:29:31 +0000 (17:29 +0200)
commit86506fe54c8e9e5f75a73956840497e3e5744f86
tree1f5429d94161bb3b368f21282e78e578784cc6b8tree | snapshot
parent062410bb9d6553e6bc4f8fa7f0cab1ed63b75628commit | diff
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>
contrib/fast-import/git-p4 diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.