[M3devel] Fwd: Re: github rename question
Rodney M. Bates
rodney_bates at lcwb.coop
Wed Nov 19 19:28:07 CET 2014
-------- Original Message --------
Subject: Re: [M3devel] github rename question
Date: Wed, 19 Nov 2014 09:28:44 -0600
From: Rodney M. Bates <rodney_bates at lcwb.coop>
Reply-To: rodney.m.bates at acm.org
To: Antony Hosking <hosking at purdue.edu>
CC: m3devel <m3devel at elegosoft.com>, Dragiša Durić <dragisha at m3w.org>
On 11/18/2014 01:57 PM, Antony Hosking wrote:
> Scratch that.
> It looks like the right code is there.
> I think you did the same as I was doing before I got a fresh clone, in which a merge event ends up in the history.
> I’m hoping Dragisha or someone can let us know how to fix it.
This seems very confusing to me. I have only cloned once, and it would
have been github.com/dragisha/cm3. This is apparently stored locally,
though I don't know how to find and change it:
-------------------------------------------------------------------------------------
rodney at allegheny:~/proj/m3/git/cm3$ git config -l
user.name=Rodney Bates
user.email=rodney.m.bates at acm.org
credential.helper=cache --timeout=40000
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
remote.origin.url=https://github.com/dragisha/cm3.git
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
branch.master.remote=origin
branch.master.merge=refs/heads/master
rodney at allegheny:~/proj/m3/git/cm3$
-------------------------------------------------------------------------------------
My pull command didn't name the repository explicitly, and it tells me it did the
pull from what I had cloned:
-------------------------------------------------------------------------------------
rodney at allegheny:~/proj/m3/git/cm3$ git pull
From https://github.com/dragisha/cm3
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ d97d794...554adee master -> origin/master (forced update)
fab06be..626f74c trunk -> origin/trunk
* [new tag] verification-release-mavericks -> verification-release-mavericks
Merge made by the 'recursive' strategy.
.gitignore | 1 +
m3-libs/m3core/src/Csupport/m3makefile | 4 ----
m3-libs/m3core/src/m3core.h | 4 ++++
m3-libs/m3core/src/thread/PTHREAD/ThreadApple.c | 6 +++---
m3-libs/m3core/src/thread/PTHREAD/ThreadPThread.i3 | 2 +-
m3-libs/m3core/src/thread/PTHREAD/ThreadPThread.m3 | 58 ++++++++++++++++++++++++++--------------------------------
m3-libs/m3core/src/thread/PTHREAD/ThreadPThreadC.c | 24 +++++++++++++++++++++++-
m3-sys/cminstall/src/config-no-install/AMD64_DARWIN | 4 ++++
m3-sys/cminstall/src/config-no-install/Darwin.common | 2 +-
m3-sys/m3cc/gcc/gcc/m3cg/parse.c | 6 +++---
scripts/make-bin-dist-min.sh | 8 +++++---
11 files changed, 71 insertions(+), 48 deletions(-)
create mode 100644 .gitignore
-------------------------------------------------------------------------------------
But when I did my push, it somehow knew that github.com/modula3/cm3 was involved
in some way. But what did it actually do? And when should I add the ".git" at
the end of the URL and when not?
-------------------------------------------------------------------------------------
rodney at allegheny:~/proj/m3/git/cm3$ git push origin master
Username for 'https://github.com': RodneyBates
Password for 'https://RodneyBates@github.com':
Counting objects: 3327, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (677/677), done.
Writing objects: 100% (2524/2524), 342.06 KiB | 0 bytes/s, done.
Total 2524 (delta 2065), reused 2244 (delta 1820)
remote: This repository moved. Please use the new location:
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
remote: https://github.com/modula3/cm3.git
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
To https://github.com/dragisha/cm3.git
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
554adee..7a2dd48 master -> master
rodney at allegheny:~/proj/m3/git/cm3$
-------------------------------------------------------------------------------------
If I do a fresh clone of github.com/modula3/cm3, I will no doubt have to manually
locate and copy my not-yet-added/committed edits into it.
-------------------------------------------------------------------------------------
rodney at allegheny:~/proj/m3/git/cm3$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 8543 commits.
# (use "git push" to publish your local commits)
#
# Changes not staged for commit:
# (use "git add/rm <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: m3-libs/libm3/src/rw/Wr.i3
# modified: m3-libs/libm3/tests/fmtlex/fmt/src/Makefile
# modified: m3-libs/libm3/tests/fmtlex/fmt/src/m3makefile
# modified: m3-libs/libm3/tests/fmtlex/fmt/src/run-tests
# modified: m3-libs/libunicode/src/UniWr.m3
# modified: m3-libs/libunicode/src/UnsafeUniWr.m3
# modified: m3-libs/m3core/src/text/Text.i3
# modified: m3-libs/ordsets/ordsets/src/OrdSets.mg
# modified: m3-sys/cm3/src/Builder.m3
# deleted: m3-sys/m3gdb/gdb/bfd/doc/bfd.info
# modified: scripts/pkginfo.txt
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
(snip: ...... Lots of irrelevant stuff, including build directories, etc. )
# It took 2.29 seconds to enumerate untracked files. 'status -uno'
# may speed it up, but you have to be careful not to forget to add
# new files yourself (see 'git help status').
no changes added to commit (use "git add" and/or "git commit -a")
rodney at allegheny:~/proj/m3/git/cm3$
-------------------------------------------------------------------------------------
>
>> On Nov 18, 2014, at 2:42 PM, Antony Hosking <hosking at purdue.edu> wrote:
>>
>> It looks like your commit backdated to old code.
>> I see reversions of the thread fixes I made a few months back.
>>
>> Can anyone help Rodney undo?
>> I’d try, but my git foo is pretty weak.
>>
>>> On Nov 18, 2014, at 2:35 PM, Antony Hosking <hosking at purdue.edu> wrote:
>>>
>>> I had a similar problem because I was using an outdated clone.
>>> I don’t recall what the fix was. Can someone out there help?
>>>
>>> But what you need to do is to reclone form https://github.com/modula3/cm3 and make sure to use that in future.
>>>
>>> Antony Hosking | Associate Professor | Computer Science | Purdue University
>>> 305 N. University Street | West Lafayette | IN 47907 | USA
>>> Mobile +1 765 427 5484
>>>
>>>
>>>
>>>> On Nov 18, 2014, at 2:30 PM, Antony Hosking <hosking at purdue.edu> wrote:
>>>>
>>>> PS https://github.com/modula3/cm3
>>>>
>>>> dragisha is a different repo!
>>>>
>>>> Antony Hosking | Associate Professor | Computer Science | Purdue University
>>>> 305 N. University Street | West Lafayette | IN 47907 | USA
>>>> Mobile +1 765 427 5484
>>>>
>>>>
>>>>
>>>>> On Nov 18, 2014, at 2:06 PM, Rodney M. Bates <rodney_bates at lcwb.coop> wrote:
>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>> Is https://github.com/modula3/cm3 just a rename of https://github.com/dragisha/cm3?
>>>>> Or a different repository? I seem to have the latter name stored somewhere in my local
>>>>> repository, as its origin, and am seeing worrisome messages about the different names.
>>>>>
>>>>> I did a fetch and merge in my local repo, which appeared to work as expected, but said
>>>>> it was merging from dragisha. Then at the end, it told me the name had changed. Later,
>>>>> I did a push, with several local commits waiting. Now, github shows _my_ merge as a
>>>>> commit in _its_ repo, which seems very odd. Could this have backdated things to
>>>>> an outdated repo?
>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> Rodney Bates
>>>>> rodney.m.bates at acm.org
>>>>>
>>>>>
>>>>
>>>
>>
>
>
--
Rodney Bates
rodney.m.bates at acm.org
More information about the M3devel
mailing list