author | Pete Wyckoff <pw@padd.com> | |
Wed, 16 Mar 2011 20:52:46 +0000 (16:52 -0400) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 16 Mar 2011 21:34:16 +0000 (14:34 -0700) | ||
commit | accad8e05e7503e456798a35e8bba6f83d8ad8b6 | |
tree | 3c3176b97e6b6a19de2d4ca79a9a49819b4f0599 | tree | snapshot |
parent | f0c9fe050474e0f2a947366a82a62efd6afbf2ce | commit | diff |
git-p4: fix sync new branch regression
e32e00d (git-p4: better message for "git-p4 sync" when not
cloned, 2011-02-19) broke another use case, that of using
"git-p4 sync" to import a new branch into an existing repository.
Refine the fix again, on top of the fix in ac34efc.
Reported-by: Michael Horowitz <michael.horowitz@ieee.org>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Tested-by: Michael Horowitz <michael.horowitz@ieee.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
e32e00d (git-p4: better message for "git-p4 sync" when not
cloned, 2011-02-19) broke another use case, that of using
"git-p4 sync" to import a new branch into an existing repository.
Refine the fix again, on top of the fix in ac34efc.
Reported-by: Michael Horowitz <michael.horowitz@ieee.org>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Tested-by: Michael Horowitz <michael.horowitz@ieee.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/fast-import/git-p4 | diff | blob | history |