[PATCH] Correction to git-p4 "exclude" change

[PATCH] Correction to git-p4 "exclude" change

[Luke Diamand]

My previous change for adding support for "exclude" to git-p4 "sync"
was incorrect, missing out a comma, which stopped git-p4 from working.
This change fixes that.

I've also noticed that t9814-git-p4-rename.sh has stopped working; I'm
going to follow up with a fix for that once I've worked out what's
wrong with it. There's a small shell syntax problem (missing "esac")
but after fixing that it still fails, so I'm not sure what's happening
yet. It was discussed a while back.

Luke Diamand (1):
  git-p4: correct "exclude" change

 git-p4.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.3.0.rc2.188.g4b64765.dirty

[PATCH] git-p4: correct "exclude" change

[Luke Diamand]

The previous change for excluding paths in the "sync"
subcommand was incorrect, missing a comma, preventing
git-p4 from working.

Signed-off-by: Luke Diamand <luke@diamand.org>
---
 git-p4.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-p4.py b/git-p4.py
index 6ff0b76..549022e 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1915,7 +1915,7 @@ class P4Sync(Command, P4UserMap):
                 optparse.make_option("--keep-path", dest="keepRepoPath", action='store_true',
                                      help="Keep entire BRANCH/DIR/SUBDIR prefix during import"),
                 optparse.make_option("--use-client-spec", dest="useClientSpec", action='store_true',
-                                     help="Only sync files that are included in the Perforce Client Spec")
+                                     help="Only sync files that are included in the Perforce Client Spec"),
                 optparse.make_option("-/", dest="cloneExclude",
                                      action="append", type="string",
                                      help="exclude depot path"),
-- 
2.3.0.rc2.188.g4b64765.dirty

Re: [PATCH] Correction to git-p4 "exclude" change

[Junio C Hamano]

Luke Diamand <luke@diamand.org> writes:

> My previous change for adding support for "exclude" to git-p4 "sync"
> was incorrect, missing out a comma, which stopped git-p4 from working.
> This change fixes that.
>
> I've also noticed that t9814-git-p4-rename.sh has stopped working; I'm
> going to follow up with a fix for that once I've worked out what's
> wrong with it. There's a small shell syntax problem (missing "esac")
> but after fixing that it still fails, so I'm not sure what's happening
> yet. It was discussed a while back.
>
> Luke Diamand (1):
>   git-p4: correct "exclude" change
>
>  git-p4.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Thanks.

Will keep out of 'master' for now.  It may not be a bad idea to
squash this fix (and any futher ones if needed) into a single patch
when we rewind 'next' after 2.3 final is tagged.

Re: [PATCH] Correction to git-p4 "exclude" change

[Luke Diamand]

(Resending as plain text).

I could be wrong about this, but my correction above doesn't seem to
be in 'next'. Does that mean (reading your last "what's cooking") that
the broken version is going to go out to 'master' soon?

Thanks,
Luke

On 5 February 2015 at 08:19, Luke Diamand <luke@diamand.org> wrote:
> I could be wrong about this, but my correction above doesn't seem to be in
> 'next'. Does that mean (reading your last "what's cooking") that the broken
> version is going to go out to 'master' soon?
>
> Thanks,
> Luke
>
>
> On 28 January 2015 at 20:49, Junio C Hamano <gitster@pobox.com> wrote:
>>
>> Luke Diamand <luke@diamand.org> writes:
>>
>> > My previous change for adding support for "exclude" to git-p4 "sync"
>> > was incorrect, missing out a comma, which stopped git-p4 from working.
>> > This change fixes that.
>> >
>> > I've also noticed that t9814-git-p4-rename.sh has stopped working; I'm
>> > going to follow up with a fix for that once I've worked out what's
>> > wrong with it. There's a small shell syntax problem (missing "esac")
>> > but after fixing that it still fails, so I'm not sure what's happening
>> > yet. It was discussed a while back.
>> >
>> > Luke Diamand (1):
>> >   git-p4: correct "exclude" change
>> >
>> >  git-p4.py | 2 +-
>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> Thanks.
>>
>> Will keep out of 'master' for now.  It may not be a bad idea to
>> squash this fix (and any futher ones if needed) into a single patch
>> when we rewind 'next' after 2.3 final is tagged.
>>
>

Re: [PATCH] Correction to git-p4 "exclude" change

[Junio C Hamano]

Luke Diamand <luke@diamand.org> writes:

> (Resending as plain text).
>
> I could be wrong about this, but my correction above doesn't seem to
> be in 'next'. Does that mean (reading your last "what's cooking") that
> the broken version is going to go out to 'master' soon?

The current copy of "What's cooking" I have reads like so:

    * ld/p4-exclude-in-sync (2015-01-28) 2 commits
     - git-p4: correct "exclude" change
      (merged to 'next' on 2015-01-22 at f6f1fc7)
     + git-p4: support excluding paths on sync

     Will squash into one after 2.3 final.

As we are too late to merge anything new to 'master', and the broken
one is not in 'master', I have been playing lazy to make time to
tend to other issues ;-)  After 2.3 final, we would rewind the tip
of 'next' and will rebuild, and when that happens, I am hoping that
we can make these two into one commit that does not have the "oops,
I forgot a comma and broke the entire command" fix-up as a separate
commit.

Or did I mis-read you?  Do we have broken code already in 'master'
that this hot-fix needs to be applied to unbreak?