Re: [PATCH] git-p4.py: Make submit working on bare repository

Junio C Hamano writes: > Amadeusz Żołnowski writes: > >>> Has anything happened to this topic after this? I am wondering if I >>> should discard the topic az/p4-bare-no-rebase without prejudice. I think you can discard the topic, because we're moving away from Per

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

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

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

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

[PATCH] git-p4.py: Make submit working on bare repository

command can be successful on bare repository. Signed-off-by: Amadeusz Żołnowski --- git-p4.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git-p4.py b/git-p4.py index c33dece..e00cd02 100755 --- a/git-p4.py +++ b/git-p4.py @@ -2059,8 +2059,9 @@ class P4Submit(Command

Re: [PATCH] git-p4.py: Make submit working on bare repository

rbarity and git-p4 submit shouldn't attempt to perform a rebase operation itself. Especially because it performs other operations before and we end up in the intermediate state (2) anyway. Is this explanation satisfactory? If yes, I'll include it in patch description. Kind regards, -- A

Re: [PATCH] git-p4.py: Make submit working on bare repository

from a user. Kind regards, -- Amadeusz Żołnowski signature.asc Description: PGP signature

Re: [PATCH] git-p4.py: Make submit working on bare repository

s you have pointed out, if user invokes submit in this context he/she actually wants to submit from bare repo and probably knows what he/she is doing - especially if he/she reads man page. (-: Kind regards, -- Amadeusz Żołnowski signature.asc Description: PGP signature

Re: [PATCH] git-p4.py: Make submit working on bare repository

Luke Diamand writes: > On 23 February 2016 at 20:56, Amadeusz Żołnowski wrote: >> >> To simplify things, why not just update ref during submit from bare >> repository? As you have pointed out, if user invokes submit in this >> context he/she actually wants to submit

Re: [PATCH] git-p4.py: Make submit working on bare repository

ith an option to skip rebase rather than do it only for bare repos. -- Amadeusz Żołnowski signature.asc Description: PGP signature