From: "Amadeusz Żołnowski" <aidecoe@aidecoe.name>
To: Luke Diamand <luke@diamand.org>
Cc: Junio C Hamano <gitster@pobox.com>, Git Users <git@vger.kernel.org>
Subject: Re: [PATCH] git-p4.py: Make submit working on bare repository
Date: Sun, 28 Feb 2016 20:46:44 +0000 [thread overview]
Message-ID: <87si0cpnpn.fsf@freja.aidecoe.name> (raw)
In-Reply-To: <CAE5ih7-rBuipoAGEnK60iidi1nYA9xWZQV6jRMHTVQe6f=cQag@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1209 bytes --]
Luke Diamand <luke@diamand.org> writes:
> On 23 February 2016 at 20:56, Amadeusz Żołnowski <aidecoe@aidecoe.name> 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 from bare repo and probably
>> knows what he/she is doing - especially if he/she reads man page. (-:
>
> Will it do something sensible if anything goes wrong?
>
> I'm thinking about what happens if you submit and one of the commits
> fails to go to P4 due to a merge conflict.
Handling failures in this case is a bit tricky, indeed.
> But I guess just doing an update-ref could be an OK thing to do.
> Without actually trying it out for real though I can't be sure. It
> might make sense to get some practical experience of how this works
> out.
True. For now I have these cases covered by wrapper scripts. The minimum
I need from git-p4 is just not to fail on git submit from bare
repository which is covered by patch I have submitted. If I get my
solution enough testing, I'd think of transforming it into patch for
git-p4.py as well.
--
Amadeusz Żołnowski
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 950 bytes --]
next prev parent reply other threads:[~2016-02-28 20:47 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-17 22:46 [PATCH] git-p4.py: Don't try to rebase on submit from bare repository Amadeusz Żołnowski
2016-02-19 9:47 ` Luke Diamand
2016-02-19 17:21 ` Junio C Hamano
2016-02-19 18:27 ` Amadeusz Żołnowski
2016-02-19 18:40 ` Eric Sunshine
2016-02-19 21:57 ` [PATCH] git-p4.py: Make submit working on " Amadeusz Żołnowski
2016-02-19 22:44 ` Junio C Hamano
2016-02-20 11:00 ` Amadeusz Żołnowski
2016-02-21 7:36 ` Junio C Hamano
2016-02-22 18:50 ` Amadeusz Żołnowski
2016-02-23 6:59 ` Junio C Hamano
2016-02-23 12:05 ` Luke Diamand
2016-02-23 20:56 ` Amadeusz Żołnowski
2016-02-28 4:26 ` Luke Diamand
2016-02-28 20:46 ` Amadeusz Żołnowski [this message]
2016-02-29 15:29 ` Luke Diamand
2016-04-12 23:25 ` Junio C Hamano
2016-04-13 20:27 ` Amadeusz Żołnowski
2016-04-13 21:47 ` Junio C Hamano
2016-06-07 20:32 ` Amadeusz Żołnowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87si0cpnpn.fsf@freja.aidecoe.name \
--to=aidecoe@aidecoe.name \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=luke@diamand.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.