Home page logo
/

wireshark logo Wireshark mailing list archives

Re: Git+gerrit status update - 2014-01-14
From: Hadriel Kaplan <hadriel.kaplan () oracle com>
Date: Wed, 29 Jan 2014 23:56:40 -0500



Is anyone else having problems with git pushing and the Change-Id?
I’ve successfully used it once for pushing, after figuring out to download the commit-msg hook and re-doing my commit.
But trying to push two other commits keeps getting the dreaded "ERROR: missing Change-Id in commit message footer” 
result, even though according to ‘git log’ my commit has a Change-Id at the end.  Fwiw, the suggested Change-Id value 
suggested by gerrit isn’t the same one created by commit-msg hook.

The server sends back this:
remote: ERROR: missing Change-Id in commit message footer
remote: Suggestion for commit message:
remote: Merge branch 'master' of ssh://code.wireshark.org:29418/wireshark
remote:
remote: Change-Id: I822fbedd22746042a4a18f40811a78a4e570bba0

git log shows this:
commit 3c98af518ea9c497bada38e4e600977802da9226
Author: Hadriel Kaplan <hadrielk () yahoo com>
Date:   Wed Jan 29 23:43:31 2014 -0500

    Added dylib and sublimetext file types to be ignored, plus init.lua from root wireshark directory.

    Change-Id: Ib3910c931da2807d207f4bf2010221422a3bac43

I must be doing something stupid.

-hadriel

On Tue, Jan 14, 2014 at 4:50 PM, Gerald Combs <gerald () wireshark org> wrote:
The live Gerrit site is up and running at
https://code.wireshark.org/review. At this point you should be able to
do the following:

- Create an account[1]. This includes adding SSH keys, adding
 OpenID identities, and setting an HTTP password.

- Clone the repository anonymously or using your ID:
 https://code.wireshark.org/review/wireshark
 ssh://your.username () code wireshark org:29418/wireshark
 https://your.username () code wireshark org/review/wireshark

- Push changes to a Gerrit magic ref[2] (e.g.
 HEAD:refs/for/master/convert-packets-to-frozen-custard).

Please be careful about pushing to non-magic, normal Git refs. It
*shouldn't* be possible to do so but if it does happen it could result
in a merge conflict.

I'm mirroring the Gerrit repository directly from the current git
repository, i.e. behind Gerrit's back. This is non-standard but *should*
be safe as long as no commits are done on the Gerrit side.

Most of the buildbots now check out source code using git. I'll probably
have them all migrated in the next day or so.

The weekly automatic number update script has been migrated to git. It
successfully pushed to the test repository and should push to the live
repository this upcoming Sunday.

The data for the OUI lookup tool
(http://www.wireshark.org/tools/oui-lookup.html) now comes from git.


Next steps:

- Update make-version.pl.

- Update the web site and wiki documentation.

- Further Buildbot integration. We should be able to do test builds
 as part of the review process but that will likely have to wait
 until after the migration.


Questions:

When should we schedule flag day? Is two weeks from now (Jan 28) too
soon? I don't want to stretch the migration out too long but I also want
to give everyone time to get set up and settled in.

Is it safe to redirect Git repositories served over HTTP? If so I'll
likely redirect http://code.wireshark.org/git/wireshark to
https://code.wireshark.org/review/wireshark after the migration.


Links:

[1]: http://test.code.wireshark.org/review/Documentation/intro-quick.html

[2]:
http://test.code.wireshark.org/review/Documentation/user-upload.html#push_create
___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev () wireshark org>
Archives:    http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
            mailto:wireshark-dev-request () wireshark org?subject=unsubscribe
___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev () wireshark org>
Archives:    http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
            mailto:wireshark-dev-request () wireshark org?subject=unsubscribe

-- 
Joerg Mayer                                           <jmayer () loplof de>
We are stuck with technology when what we really want is just stuff that
works. Some say that should read Microsoft instead of technology.
___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev () wireshark org>
Archives:    http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
            mailto:wireshark-dev-request () wireshark org?subject=unsubscribe

___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev () wireshark org>
Archives:    http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request () wireshark org?subject=unsubscribe


  By Date           By Thread  

Current thread:
[ Nmap | Sec Tools | Mailing Lists | Site News | About/Contact | Advertising | Privacy ]