[Insight-developers] can't push to gerrit
Marcus D. Hanwell
marcus.hanwell at kitware.com
Tue Mar 1 18:19:12 EST 2011
I would suggest you look at your .git/config file, the gerrit remote.
You should check that the username is correct, and the URL is correct
git fetch -v gerrit
Would show you the location it is using, and whether a basic fetch
works. You can run the SetupForDevelopment.sh script a second time in
order to correct a bad username for example. Is this Windows, or
Linux? I think running the latest script would be a good idea to check
you have an up to date setup.
I could take a look at your .git/config if you send it to me off-list,
it sounds like something is possibly broken in there. Most of the time
running the setup script again will correct issues there.
Marcus
On Tue, Mar 1, 2011 at 5:43 PM, Mark Roden <mmroden at gmail.com> wrote:
> Here's the result of the git log -1 command:
>
> git log -1
> commit 413102b25d1c9eee60eace2585c2f857ad564a67
> Author: Mark Roden <mmroden at gmail.com>
> Date: Tue Mar 1 12:42:32 2011 -0800
>
> COMP: attempts to fix gdcm function hiding warnings
>
>
> On Tue, Mar 1, 2011 at 2:17 PM, David Cole <david.cole at kitware.com> wrote:
>> So ssh connectivity looks good.
>>
>> I'm afraid I'm at the end of my helpfulness for the day... (because I lack
>> the knowledge... not because I've run out of helpfulness)
>>
>> Hopefully somebody else picks it from here for you. Sorry this is so
>> frustrating.
>>
>> Is there anything funky about the commit? What's the commit message like?
>>
>> Send along the output of:
>>
>> git log -1
>>
>> Maybe something in the commit message is unparseable by the helper
>> scripts....?
>>
>>
>> On Tue, Mar 1, 2011 at 5:11 PM, Mark Roden <mmroden at gmail.com> wrote:
>>>
>>> OpenSSH_5.2p1, OpenSSL 0.9.8l 5 Nov 2009
>>> debug1: Reading configuration data /etc/ssh_config
>>> debug1: Connecting to review.source.kitware.com [66.162.65.213] port 22.
>>> debug1: Connection established.
>>> debug1: identity file /Users/mmroden/.ssh/identity type -1
>>> debug1: identity file /Users/mmroden/.ssh/id_rsa type 1
>>> debug1: identity file /Users/mmroden/.ssh/id_dsa type -1
>>> debug1: Remote protocol version 2.0, remote software version
>>> GerritCodeReview_2.1.6.1 (SSHD-CORE-0.5.1-R1033260)
>>> debug1: no match: GerritCodeReview_2.1.6.1 (SSHD-CORE-0.5.1-R1033260)
>>> debug1: Enabling compatibility mode for protocol 2.0
>>> debug1: Local version string SSH-2.0-OpenSSH_5.2
>>> debug1: SSH2_MSG_KEXINIT sent
>>> debug1: SSH2_MSG_KEXINIT received
>>> debug1: kex: server->client aes128-cbc hmac-md5 none
>>> debug1: kex: client->server aes128-cbc hmac-md5 none
>>> debug1: sending SSH2_MSG_KEXDH_INIT
>>> debug1: expecting SSH2_MSG_KEXDH_REPLY
>>> debug1: Host 'review.source.kitware.com' is known and matches the RSA host
>>> key.
>>> debug1: Found key in /Users/mmroden/.ssh/known_hosts:4
>>> debug1: ssh_rsa_verify: signature correct
>>> debug1: SSH2_MSG_NEWKEYS sent
>>> debug1: expecting SSH2_MSG_NEWKEYS
>>> debug1: SSH2_MSG_NEWKEYS received
>>> debug1: SSH2_MSG_SERVICE_REQUEST sent
>>> debug1: SSH2_MSG_SERVICE_ACCEPT received
>>> debug1: Authentications that can continue: publickey
>>> debug1: Next authentication method: publickey
>>> debug1: Offering public key: /Users/mmroden/.ssh/id_rsa
>>> debug1: Server accepts key: pkalg ssh-rsa blen 277
>>> debug1: Authentication succeeded (publickey).
>>> debug1: channel 0: new [client-session]
>>> debug1: Entering interactive session.
>>> debug1: client_input_channel_req: channel 0 rtype exit-status reply 0
>>>
>>> **** Welcome to Gerrit Code Review ****
>>>
>>> Hi Mark Roden, you have successfully connected over SSH.
>>>
>>> Unfortunately, interactive shells are disabled.
>>> To clone a hosted Git repository, use:
>>>
>>> git clone
>>> ssh://mmroden@review.source.kitware.com:29418/REPOSITORY_NAME.git
>>>
>>> debug1: channel 0: free: client-session, nchannels 1
>>> Connection to review.source.kitware.com closed.
>>> Transferred: sent 2552, received 2208 bytes, in 0.3 seconds
>>> Bytes per second: sent 8761.2, received 7580.2
>>> debug1: Exit status 127
>>>
>>>
>>> On Tue, Mar 1, 2011 at 2:03 PM, David Cole <david.cole at kitware.com> wrote:
>>> > What is the output of running "ssh -v user at review.source.kitware.com"?
>>> >
>>> > (Where "user" is your gerrit user name...)
>>> >
>>> >
>>> > On Tue, Mar 1, 2011 at 4:51 PM, Mark Roden <mmroden at gmail.com> wrote:
>>> >>
>>> >> Gotcha.
>>> >>
>>> >> OK, I've reset the master branch to origin/master with --hard, then
>>> >> switched to the new branch.
>>> >>
>>> >> git gerrit-push
>>> >> still produces
>>> >> ^Cfatal: Failed to run 'sh -c "git push gerrit
>>> >> HEAD:refs/for/master/$(git symbolic-ref HEAD | sed -e
>>> >> 's|^refs/heads/||')"' when expanding alias 'gerrit-push'
>>> >>
>>> >> when broken, and seems to freeze otherwise.
>>> >>
>>> >> On Tue, Mar 1, 2011 at 1:44 PM, David Cole <david.cole at kitware.com>
>>> >> wrote:
>>> >> > Does "git log -1" report the same commit on each branch?
>>> >> >
>>> >> > git checkout master
>>> >> > git log -1
>>> >> >
>>> >> > git checkout GDCMHiddenFunctionWarnings
>>> >> > git log -1
>>> >> >
>>> >> > If you do a "gitk" does "master" and "GDCMHiddenFunctionWarnings"
>>> >> > point
>>> >> > to
>>> >> > the same commit?
>>> >> >
>>> >> > If so, then you're safe.
>>> >> >
>>> >> > The "ahead by 1 commit" message means that you have (locally) one
>>> >> > more
>>> >> > commit than the branch you're tracking. (master compared to
>>> >> > "origin/master",
>>> >> > NOT master compared to your topic branch...)
>>> >> >
>>> >> >
>>> >> > HTH,
>>> >> > David
>>> >> >
>>> >> >
>>> >> > On Tue, Mar 1, 2011 at 4:37 PM, Mark Roden <mmroden at gmail.com> wrote:
>>> >> >>
>>> >> >> The new branch does not contain the commit, that's what I'm saying.
>>> >> >> The master branch remains ahead by 1 commit. Git status on the new
>>> >> >> branch returns:
>>> >> >> # On branch GDCMHiddenFunctionWarnings
>>> >> >> # Untracked files:
>>> >> >> # (use "git add <file>..." to include in what will be committed)
>>> >> >> #
>>> >> >> # .DS_Store
>>> >> >> # ITK_Osirix_Test_Data/
>>> >> >> nothing added to commit but untracked files present (use "git add"
>>> >> >> to
>>> >> >> track)
>>> >> >>
>>> >> >> So I'd rather not reset the master until the commit is safe.
>>> >> >>
>>> >> >> On Tue, Mar 1, 2011 at 1:33 PM, David Cole <david.cole at kitware.com>
>>> >> >> wrote:
>>> >> >> > After you have the new branch, containing the commit, it's safe to
>>> >> >> > do:
>>> >> >> >
>>> >> >> > git checkout master
>>> >> >> > git reset --hard origin/master
>>> >> >> >
>>> >> >> > That will put your local master back to the same state as what's
>>> >> >> > on
>>> >> >> > origin,
>>> >> >> > and then your commit will "only" be on the topic branch.
>>> >> >> >
>>> >> >> > Commits may be "reached" from many different branches with git.
>>> >> >> >
>>> >> >> >
>>> >> >> > On Tue, Mar 1, 2011 at 4:30 PM, Mark Roden <mmroden at gmail.com>
>>> >> >> > wrote:
>>> >> >> >>
>>> >> >> >> Hi Marcus,
>>> >> >> >>
>>> >> >> >> git checkout -b my-topic is making a new branch, but the commit
>>> >> >> >> remains in the master branch. Is this a git version thing,
>>> >> >> >> possibly?
>>> >> >> >>
>>> >> >> >> Mark
>>> >> >> >>
>>> >> >> >> On Tue, Mar 1, 2011 at 1:16 PM, Marcus D. Hanwell
>>> >> >> >> <marcus.hanwell at kitware.com> wrote:
>>> >> >> >> > If you are on your master, you can simply do a,
>>> >> >> >> >
>>> >> >> >> > git checkout -b my-topic
>>> >> >> >> >
>>> >> >> >> > That will give you a new topic branch with the commits from
>>> >> >> >> > your
>>> >> >> >> > local
>>> >> >> >> > master. At some point you will want to reset your local master,
>>> >> >> >> > warning - if you don't make a topic branch as described above
>>> >> >> >> > you
>>> >> >> >> > could lose some commits.
>>> >> >> >> >
>>> >> >> >> > git checkout master
>>> >> >> >> > git reset --hard origin/master
>>> >> >> >> >
>>> >> >> >> > The wiki page for developers,
>>> >> >> >> > http://www.itk.org/Wiki/ITK/Git/Develop
>>> >> >> >> > will give more details. If you are having trouble with the push
>>> >> >> >> > then
>>> >> >> >> > you can test authentication using the SetupForDevelopment.sh
>>> >> >> >> > script.
>>> >> >> >> > A
>>> >> >> >> > quick 'ssh -v review.source.kitware.com' would test
>>> >> >> >> > authentication/firewall issues - it should print out a message
>>> >> >> >> > telling
>>> >> >> >> > you how to clone if you authenticated.
>>> >> >> >> >
>>> >> >> >> > Hope that helps,
>>> >> >> >> >
>>> >> >> >> > Marcus
>>> >> >> >> >
>>> >> >> >> > On Tue, Mar 1, 2011 at 4:11 PM, Mark Roden <mmroden at gmail.com>
>>> >> >> >> > wrote:
>>> >> >> >> >> Ah, so I have to be on a branch now to do this?
>>> >> >> >> >>
>>> >> >> >> >> That should probably be part of the hooks then, because I was
>>> >> >> >> >> able
>>> >> >> >> >> to
>>> >> >> >> >> do it from master before (and was doing it from master
>>> >> >> >> >> before).
>>> >> >> >> >>
>>> >> >> >> >> How can I move my commit from master to some other branch to
>>> >> >> >> >> do
>>> >> >> >> >> the
>>> >> >> >> >> checkin?
>>> >> >> >> >>
>>> >> >> >> >> On Tue, Mar 1, 2011 at 1:04 PM, David Cole
>>> >> >> >> >> <david.cole at kitware.com>
>>> >> >> >> >> wrote:
>>> >> >> >> >>> The HEAD:refs/for/master/MyCommitMessage is supposed to
>>> >> >> >> >>> reference a
>>> >> >> >> >>> topic branch name...
>>> >> >> >> >>>
>>> >> >> >> >>> What is the name of your current branch?
>>> >> >> >> >>>
>>> >> >> >> >>> git branch
>>> >> >> >> >>>
>>> >> >> >> >>> (branch name with the * next to it is current...)
>>> >> >> >> >>>
>>> >> >> >> >>>
>>> >> >> >> >>>
>>> >> >> >> >>> On Tue, Mar 1, 2011 at 3:55 PM, David Cole
>>> >> >> >> >>> <david.cole at kitware.com>
>>> >> >> >> >>> wrote:
>>> >> >> >> >>>> Do you get the same result with the simpler?
>>> >> >> >> >>>>
>>> >> >> >> >>>> git gerrit-push
>>> >> >> >> >>>>
>>> >> >> >> >>>>
>>> >> >> >> >>>> On Tue, Mar 1, 2011 at 3:52 PM, Mark Roden
>>> >> >> >> >>>> <mmroden at gmail.com>
>>> >> >> >> >>>> wrote:
>>> >> >> >> >>>>> Hi all,
>>> >> >> >> >>>>>
>>> >> >> >> >>>>> So I think I've solved some of the gdcm warnings, but can't
>>> >> >> >> >>>>> push
>>> >> >> >> >>>>> to
>>> >> >> >> >>>>> gerrit. What's changed here?
>>> >> >> >> >>>>>
>>> >> >> >> >>>>> I've followed the ./Utilities/Setup etc script.
>>> >> >> >> >>>>>
>>> >> >> >> >>>>> I do
>>> >> >> >> >>>>> git commit -a -m "COMP: My Commit Message"
>>> >> >> >> >>>>> then
>>> >> >> >> >>>>> git push gerrit HEAD:refs/for/master/MyCommitMessage
>>> >> >> >> >>>>>
>>> >> >> >> >>>>> And nothing happens, the command line just freezes. My id
>>> >> >> >> >>>>> is
>>> >> >> >> >>>>> set
>>> >> >> >> >>>>> to
>>> >> >> >> >>>>> mmroden at gmail.com, and my ssh key is in gerrit, and I can
>>> >> >> >> >>>>> log
>>> >> >> >> >>>>> in
>>> >> >> >> >>>>> to
>>> >> >> >> >>>>> the gerrit website.
>>> >> >> >> >>>>>
>>> >> >> >> >>>>> I was following the instructions here:
>>> >> >> >> >>>>> http://www.visualizationtoolkit.org/Wiki/ITK/Gerrit
>>> >> >> >> >>>>>
>>> >> >> >> >>>>> Please help,
>>> >> >> >> >>>>> Mark
>>> >> >> >> >>>>> _______________________________________________
>>> >> >> >> >>>>> Powered by www.kitware.com
>>> >> >> >> >>>>>
>>> >> >> >> >>>>> Visit other Kitware open-source projects at
>>> >> >> >> >>>>> http://www.kitware.com/opensource/opensource.html
>>> >> >> >> >>>>>
>>> >> >> >> >>>>> Kitware offers ITK Training Courses, for more information
>>> >> >> >> >>>>> visit:
>>> >> >> >> >>>>> http://kitware.com/products/protraining.html
>>> >> >> >> >>>>>
>>> >> >> >> >>>>> Please keep messages on-topic and check the ITK FAQ at:
>>> >> >> >> >>>>> http://www.itk.org/Wiki/ITK_FAQ
>>> >> >> >> >>>>>
>>> >> >> >> >>>>> Follow this link to subscribe/unsubscribe:
>>> >> >> >> >>>>> http://www.itk.org/mailman/listinfo/insight-developers
>>> >> >> >> >>>>>
>>> >> >> >> >>>>
>>> >> >> >> >>>
>>> >> >> >> >> _______________________________________________
>>> >> >> >> >> Powered by www.kitware.com
>>> >> >> >> >>
>>> >> >> >> >> Visit other Kitware open-source projects at
>>> >> >> >> >> http://www.kitware.com/opensource/opensource.html
>>> >> >> >> >>
>>> >> >> >> >> Kitware offers ITK Training Courses, for more information
>>> >> >> >> >> visit:
>>> >> >> >> >> http://kitware.com/products/protraining.html
>>> >> >> >> >>
>>> >> >> >> >> Please keep messages on-topic and check the ITK FAQ at:
>>> >> >> >> >> http://www.itk.org/Wiki/ITK_FAQ
>>> >> >> >> >>
>>> >> >> >> >> Follow this link to subscribe/unsubscribe:
>>> >> >> >> >> http://www.itk.org/mailman/listinfo/insight-developers
>>> >> >> >> >>
>>> >> >> >> >
>>> >> >> >
>>> >> >> >
>>> >> >
>>> >> >
>>> >
>>> >
>>
>>
>
More information about the Insight-developers
mailing list