On Mon, Feb 10, 2014 at 11:33:29AM +0100, Helga Velroyen wrote:
> On Mon, Feb 10, 2014 at 11:19 AM, Jose A. Lopes <[email protected]>wrote:
>
> > ... but do not try to check the copyrights for local branches which do
> > not have a proper remote branch, which would fail at a later step
> > anyway.
> >
> > Signed-off-by: Jose A. Lopes <[email protected]>
> > ---
> > devel/check_copyright | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/devel/check_copyright b/devel/check_copyright
> > index 4b093c9..5fa1db5 100755
> > --- a/devel/check_copyright
> > +++ b/devel/check_copyright
> > @@ -32,7 +32,7 @@ function join {
> > }
> >
> > # Determine the tracking branch for the current branch
> > -readonly REMOTE=$(git branch -vv | grep "^\*" | cut -d "[" -f 2- | cut -d
> > ":" -f 1)
> > +REMOTE=$(git branch -vv | grep -e "^\*" | sed -e "s/ \+/ /g" | awk '{
> > print $4 }' | grep "\[" | tr -d ":[]")
> >
>
> is removing the 'readonly' here necessary? (I suspect there is a reason for
> it :))
I did some changes and forgot to put it back.
I'm putting it back now.
diff --git a/devel/check_copyright b/devel/check_copyright
index 4b093c9..fc3a4c8 100755
--- a/devel/check_copyright
+++ b/devel/check_copyright
@@ -32,7 +32,7 @@ function join {
}
# Determine the tracking branch for the current branch
-readonly REMOTE=$(git branch -vv | grep "^\*" | cut -d "[" -f 2- | cut -d ":"
-f 1)
+readonly REMOTE=$(git branch -vv | grep -e "^\*" | sed -e "s/ \+/ /g" | awk '{
print $4 }' | grep "\[" | tr -d ":[]")
if [ -z "$REMOTE" ]
then
> >
> > if [ -z "$REMOTE" ]
> > then
> > --
> > 1.9.0.rc1.175.g0b1dcb5
> >
> >
> Apart from that, LGTM, although I did not test your commandline magic here
> ;)
Too bad. You're missing out on some great magic foo stuff that will blow your
mind XD
Thanks,
Jose
> Cheers,
> Helga
>
>
> --
> --
> Helga Velroyen | Software Engineer | [email protected] |
>
> Google Germany GmbH
> Dienerstr. 12
> 80331 München
>
> Registergericht und -nummer: Hamburg, HRB 86891
> Sitz der Gesellschaft: Hamburg
> Geschäftsführer: Graham Law, Christine Elizabeth Flores
--
Jose Antonio Lopes
Ganeti Engineering
Google Germany GmbH
Dienerstr. 12, 80331, München
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschäftsführer: Graham Law, Christine Elizabeth Flores
Steuernummer: 48/725/00206
Umsatzsteueridentifikationsnummer: DE813741370
