Re: [PATCH] git-p4.py: Don't try to rebase on submit from bare repository

2016-02-19 Thread Eric Sunshine
On Fri, Feb 19, 2016 at 1:27 PM, Amadeusz Żołnowski wrote: > git-p4 can be successfully used from bare repository (which acts as a > bridge between Perforce repository and pure Git repositories). On submit > git-p4 performs unconditional rebase. Do rebase only on non-bare > repositories. As a per

[PATCH] git-p4.py: Don't try to rebase on submit from bare repository

2016-02-19 Thread Amadeusz Żołnowski
git-p4 can be successfully used from bare repository (which acts as a bridge between Perforce repository and pure Git repositories). On submit git-p4 performs unconditional rebase. Do rebase only on non-bare repositories. Signed-off-by: Amadeusz Żołnowski --- git-p4.py | 5 +++-- 1 file changed,

Re: [PATCH] git-p4.py: Don't try to rebase on submit from bare repository

2016-02-19 Thread Junio C Hamano
Luke Diamand writes: > On 17 February 2016 at 22:46, Amadeusz Żołnowski wrote: >> git-p4 can be successfully used from bare repository (which acts as a >> bridge between Perforce repository and pure Git repositories). On submit >> git-p4 performs unconditional rebase. Do rebase only on non-bare

Re: [PATCH] git-p4.py: Don't try to rebase on submit from bare repository

2016-02-19 Thread Luke Diamand
On 17 February 2016 at 22:46, Amadeusz Żołnowski wrote: > git-p4 can be successfully used from bare repository (which acts as a > bridge between Perforce repository and pure Git repositories). On submit > git-p4 performs unconditional rebase. Do rebase only on non-bare > repositories. This looks

[PATCH] git-p4.py: Don't try to rebase on submit from bare repository

2016-02-18 Thread Amadeusz Żołnowski
git-p4 can be successfully used from bare repository (which acts as a bridge between Perforce repository and pure Git repositories). On submit git-p4 performs unconditional rebase. Do rebase only on non-bare repositories. --- git-p4.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) di