how to update a git repository?
I had previously downloaded the git lib2geom repository using the command: git clone git://git.launchpad.net/lib2geom
Now I saw that there was a recent commit yesterday, so I decided to update. I ran the command : git pull git://git.launchpad.net/lib2geom and got the response:
From git://git.launchpad.net/lib2geom
* branch HEAD -> FETCH_HEAD Already up-to-date.
However, I know that my copy is not uptodate, despite what the message says. Any ideas as to how to do a pull?
Also, is there any way of knowing which rev my local repository is currently on? Something equivalent to 'bzr revno' or 'bzr version-info'? I have tried 'git log', but unfortunately it generates an infinite loop from which I cannot escape, so it is not very helpful. I have tried about a dozen varieties of the command 'git log <revision range>' but none of them work. The git help files, unfortunately, are no help because they do not contain any working examples.
Also, will I need to implement a SSH key to make changes? I previously did this for launchpad on Windows using Pageant and Putty, but am not sure how to apply that procedure to git, and also I lost my notes from that trial, which was in 2009.
any help would be appreciated. tia, Alvin
-- View this message in context: http://inkscape.13.x6.nabble.com/how-to-update-a-git-repository-tp4975817.ht... Sent from the Inkscape - Dev mailing list archive at Nabble.com.
On Fri, Mar 04, 2016 at 02:14:14PM -0800, alvinpenner wrote:
I had previously downloaded the git lib2geom repository using the command: git clone git://git.launchpad.net/lib2geom
Now I saw that there was a recent commit yesterday, so I decided to update. I ran the command : git pull git://git.launchpad.net/lib2geom and got the response:
From git://git.launchpad.net/lib2geom
- branch HEAD -> FETCH_HEAD
Already up-to-date.
However, I know that my copy is not uptodate, despite what the message says. Any ideas as to how to do a pull?
Last change shown in that branch is 2/10:
"Remove FindBoost.cmake, since it should be shipped with CMake itself."
If `git log` shows that commit at the top then you are indeed up to date.
Perhaps doublecheck where you saw the commit yesterday; perhaps it was to a different branch or something?
Also, is there any way of knowing which rev my local repository is currently on? Something equivalent to 'bzr revno' or 'bzr version-info'?
`git status` typically is adequate for indicating if you're up to date and if not generally what's missing.
`git show HEAD` will display the current patch you're on; `git show --summary HEAD` shows just the commit message; `git show --oneline --summary HEAD | cat` gives a terse one line summary
I have tried 'git log', but unfortunately it generates an infinite loop from which I cannot escape, so it is not very helpful. I have tried about a dozen varieties of the command 'git log <revision range>' but none of them work. The git help files, unfortunately, are no help because they do not contain any working examples.
Also, will I need to implement a SSH key to make changes? I previously did this for launchpad on Windows using Pageant and Putty, but am not sure how to apply that procedure to git, and also I lost my notes from that trial, which was in 2009.
Presumably launchpad's git uses the same ssh keys you set up before.
In any case, there's ample docs on launchpad to guide you through creating and registering keys if you need to make another one.
Bryce
Hi,
Last change shown in that branch is 2/10:
I was basing my desire to update on the commit made by Liam 22 hours ago, to src/2geom/path-sink.h. "Fix for lp bug 1545489"
https://github.com/inkscape/lib2geom/commit/143bbcf76a89ff1666143ff065a10390...
Thanks for the sample commands, I'll try them out, 'git show head' looks like what I want.
Alvin
-- View this message in context: http://inkscape.13.x6.nabble.com/how-to-update-a-git-repository-tp4975817p49... Sent from the Inkscape - Dev mailing list archive at Nabble.com.
well, this is embarrassing, 'q' seems to work. Previously I would run 'git log', then I would hit 'q' to get out, then I would be back in DOS for a while but then it would revert back to bring in git once again, where I originally was. I could not seem to be able to get out of git permanently. Anyways, now 'q' is working as expected. It quits and it quits permanently as expected. Thanks for the tip.
If I run 'git log | head' I get the response: 'head' is not recognized as an internal or external command, operable program or batch file.
The command 'git log head' appears to be a duplicate of git log. 'git show HEAD' appears to work well, just gives latest rev.
Thanks, Alvin
-- View this message in context: http://inkscape.13.x6.nabble.com/how-to-update-a-git-repository-tp4975817p49... Sent from the Inkscape - Dev mailing list archive at Nabble.com.
Am 05.03.2016 um 00:37 schrieb alvinpenner:
If I run 'git log | head' I get the response: 'head' is not recognized as an internal or external command, operable program or batch file.
- Sorry, Alvin! I didn't take into account that you're on Windows... That's a Unix command.
Maren
no problem, I'm glad to know that 'q' works.
Alvin
-- View this message in context: http://inkscape.13.x6.nabble.com/how-to-update-a-git-repository-tp4975817p49... Sent from the Inkscape - Dev mailing list archive at Nabble.com.
On Mar 4, 2016 17:27, "alvinpenner" <penner@...1856...> wrote:
I had previously downloaded the git lib2geom repository using the command: git clone git://git.launchpad.net/lib2geom
Now I saw that there was a recent commit yesterday, so I decided to
update.
I ran the command : git pull git://git.launchpad.net/lib2geom and got the response:
From git://git.launchpad.net/lib2geom
- branch HEAD -> FETCH_HEAD
Already up-to-date.
However, I know that my copy is not uptodate, despite what the message
says.
Any ideas as to how to do a pull?
Only the 2geom repository on Github was updated; I do not seem to have push access to the Launchpad-based repository.
Only the 2geom repository on Github was updated; I do not seem to have
push access to the Launchpad-based repository. to the best of my knowledge the Launchpad repository of 2geom no longer exists. It is mothballed, or perhaps read-only. My question was, how come I cannot download the latest git rev that you made? When I do a git pull, it tells me that I am uptodate when I clearly am not uptodate.
Alvin
-- View this message in context: http://inkscape.13.x6.nabble.com/how-to-update-a-git-repository-tp4975817p49... Sent from the Inkscape - Dev mailing list archive at Nabble.com.
2016-03-04 21:24 GMT-03:00 alvinpenner <penner@...1856...>:
My question was, how come I cannot download the latest git rev that you made? When I do a git pull, it tells me that I am uptodate when I clearly am not uptodate.
What's the output of `git branch -vv`?
here's the output:
C:\Users\Alvin\AppData\Roaming\lib2geom>git branch -vv * master 8c11486 [origin/master] Remove FindBoost.cmake, since it should be shipped with CMake itself.
- this info is obsolete as far as I know. It is from the previous commit
Alvin
-- View this message in context: http://inkscape.13.x6.nabble.com/how-to-update-a-git-repository-tp4975817p49... Sent from the Inkscape - Dev mailing list archive at Nabble.com.
2016-03-04 21:30 GMT-03:00 alvinpenner <penner@...1856...>:
here's the output:
C:\Users\Alvin\AppData\Roaming\lib2geom>git branch -vv
- master 8c11486 [origin/master] Remove FindBoost.cmake, since it should be
shipped with CMake itself.
Now what's the output of `git remote -v`?
I get: C:\Users\Alvin\AppData\Roaming\lib2geom>git remote -v origin git://git.launchpad.net/lib2geom (fetch) origin git://git.launchpad.net/lib2geom (push)
not sure what that means. When I interrogate git I get the below, which is the same as before
C:\Users\Alvin\AppData\Roaming\lib2geom>git show HEAD commit 8c1148600de95edb26f6d6fd45c849a62ed77b88 Author: Krzysztof Kosinski <tweenk.pl@...400...> Date: Wed Feb 10 23:24:32 2016 -0800
-- View this message in context: http://inkscape.13.x6.nabble.com/how-to-update-a-git-repository-tp4975817p49... Sent from the Inkscape - Dev mailing list archive at Nabble.com.
I tried a git fetch as below, but this does not seem to update anything.
C:\Users\Alvin\AppData\Roaming\lib2geom>git fetch git://git.launchpad.net/lib2geom
From git://git.launchpad.net/lib2geom
* branch HEAD -> FETCH_HEAD
C:\Users\Alvin\AppData\Roaming\lib2geom>git show HEAD commit 8c1148600de95edb26f6d6fd45c849a62ed77b88 Author: Krzysztof Kosinski <tweenk.pl@...400...> Date: Wed Feb 10 23:24:32 2016 -0800
-- View this message in context: http://inkscape.13.x6.nabble.com/how-to-update-a-git-repository-tp4975817p49... Sent from the Inkscape - Dev mailing list archive at Nabble.com.
2016-03-04 21:51 GMT-03:00 alvinpenner <penner@...1856...>:
I get: C:\Users\Alvin\AppData\Roaming\lib2geom>git remote -v origin git://git.launchpad.net/lib2geom (fetch) origin git://git.launchpad.net/lib2geom (push)
not sure what that means. When I interrogate git I get the below, which is the same as before
It means your current branch tracking origin, which is the launchpad repo. So when you're in master and runs `git pull`, it'll try to sync your current branch against the launchpad's master branch.
There are several ways to work around this. My suggestion is to do the following:
git remote set-url origin https://github.com/inkscape/lib2geom.git
This will change the origin remote url to https://github.com/inkscape/lib2geom.git. So when you run git push/pull, git will try the github repo.
thanks, I tried the following sequence, but I don't think anything changed.
C:\Users\Alvin\AppData\Roaming\lib2geom>git remote set-url origin https://github.com/inkscape/lib2geom.git
C:\Users\Alvin\AppData\Roaming\lib2geom>git pull git://git.launchpad.net/lib2geom
From git://git.launchpad.net/lib2geom
* branch HEAD -> FETCH_HEAD Already up-to-date.
C:\Users\Alvin\AppData\Roaming\lib2geom>git show HEAD commit 8c1148600de95edb26f6d6fd45c849a62ed77b88 Author: Krzysztof Kosinski <tweenk.pl@...400...> Date: Wed Feb 10 23:24:32 2016 -0800
Remove FindBoost.cmake, since it should be shipped with CMake itself.
-- View this message in context: http://inkscape.13.x6.nabble.com/how-to-update-a-git-repository-tp4975817p49... Sent from the Inkscape - Dev mailing list archive at Nabble.com.
2016-03-04 22:04 GMT-03:00 alvinpenner <penner@...1856...>:
C:\Users\Alvin\AppData\Roaming\lib2geom>git pull git://git.launchpad.net/lib2geom
Run `git pull`. Do not run `git pull git://git.launchpad.net/lib2geom`.
thanks! I believe that worked! I get the following. It contains the change in path-sink.h which I expected to see, plus extra stuff I did not expect to see. Now if only I could remember this for next time it happens. Anyways, I have to go now, I have a splitting headache.
Thanks for your help. Alvin
C:\Users\Alvin\AppData\Roaming\lib2geom>git pull remote: Counting objects: 43, done. remote: Compressing objects: 100% (5/5), done. lta 19), reused 19 (delta 19), pack-reused 19 Unpacking objects: 100% (43/43), done.
8c11486..143bbcf master -> origin/master * [new branch] travis-ci-test -> origin/travis-ci-test Updating 8c11486..143bbcf Fast-forward .travis.yml | 27 +++++++++++++++++++++++++ README.md | 2 ++ src/2geom/circle.cpp | 8 ++++---- src/2geom/conicsec.cpp | 14 ++++++------- src/2geom/ellipse.cpp | 2 +- src/2geom/line.cpp | 38 +++++++++++++++++------------------ src/2geom/line.h | 41 ++++++++++++++++++++------------------ src/2geom/path-sink.h | 6 ++++-- src/2geom/ray.h | 47 ++++++++++++++++++++++---------------------- src/tests/line-test.cpp | 9 +++++++++ src/toys/conic-6.cpp | 4 ++-- src/toys/find-derivative.cpp | 2 +- src/toys/line-toy.cpp | 2 +- src/toys/rect-toy.cpp | 2 +- 14 files changed, 124 insertions(+), 80 deletions(-) create mode 100644 .travis.yml
-- View this message in context: http://inkscape.13.x6.nabble.com/how-to-update-a-git-repository-tp4975817p49... Sent from the Inkscape - Dev mailing list archive at Nabble.com.
Hello everyone,
Sorry for causing this mess. The Git repository on Launchpad is indeed out of date. I sent an e-mail to the 2Geom mailing list, but should probably also have sent it to the Inkscape list. The authoritative version is on GitHub. I will try to set up an import or delete the Launchpad repo during the weekend.
Best regards, Krzysztof
2016-03-04 17:15 GMT-08:00 alvinpenner <penner@...1856...>:
thanks! I believe that worked! I get the following. It contains the change in path-sink.h which I expected to see, plus extra stuff I did not expect to see. Now if only I could remember this for next time it happens. Anyways, I have to go now, I have a splitting headache.
Thanks for your help. Alvin
C:\Users\Alvin\AppData\Roaming\lib2geom>git pull remote: Counting objects: 43, done. remote: Compressing objects: 100% (5/5), done. lta 19), reused 19 (delta 19), pack-reused 19 Unpacking objects: 100% (43/43), done.
8c11486..143bbcf master -> origin/master
- [new branch] travis-ci-test -> origin/travis-ci-test
Updating 8c11486..143bbcf Fast-forward .travis.yml | 27 +++++++++++++++++++++++++ README.md | 2 ++ src/2geom/circle.cpp | 8 ++++---- src/2geom/conicsec.cpp | 14 ++++++------- src/2geom/ellipse.cpp | 2 +- src/2geom/line.cpp | 38 +++++++++++++++++------------------ src/2geom/line.h | 41 ++++++++++++++++++++------------------ src/2geom/path-sink.h | 6 ++++-- src/2geom/ray.h | 47 ++++++++++++++++++++++---------------------- src/tests/line-test.cpp | 9 +++++++++ src/toys/conic-6.cpp | 4 ++-- src/toys/find-derivative.cpp | 2 +- src/toys/line-toy.cpp | 2 +- src/toys/rect-toy.cpp | 2 +- 14 files changed, 124 insertions(+), 80 deletions(-) create mode 100644 .travis.yml
-- View this message in context: http://inkscape.13.x6.nabble.com/how-to-update-a-git-repository-tp4975817p49... Sent from the Inkscape - Dev mailing list archive at Nabble.com.
Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel
Another update:
I configured a Bazaar import from Github, and removed the Git repo from Launchpad, since there doesn't seem to be a way to configure a Git mirror on Launchpad.
Checking out from Bazaar should work normally. Committing will only work through GitHub. I will send out a separate e-mail to request people's GitHub usernames so that I can give them commit access. (Other board members can also do this.)
Best regards, Krzysztof
2016-03-04 18:16 GMT-08:00 Krzysztof Kosiński <tweenk.pl@...400...>:
Hello everyone,
Sorry for causing this mess. The Git repository on Launchpad is indeed out of date. I sent an e-mail to the 2Geom mailing list, but should probably also have sent it to the Inkscape list. The authoritative version is on GitHub. I will try to set up an import or delete the Launchpad repo during the weekend.
Best regards, Krzysztof
2016-03-04 17:15 GMT-08:00 alvinpenner <penner@...1856...>:
thanks! I believe that worked! I get the following. It contains the change in path-sink.h which I expected to see, plus extra stuff I did not expect to see. Now if only I could remember this for next time it happens. Anyways, I have to go now, I have a splitting headache.
Thanks for your help. Alvin
C:\Users\Alvin\AppData\Roaming\lib2geom>git pull remote: Counting objects: 43, done. remote: Compressing objects: 100% (5/5), done. lta 19), reused 19 (delta 19), pack-reused 19 Unpacking objects: 100% (43/43), done.
8c11486..143bbcf master -> origin/master
- [new branch] travis-ci-test -> origin/travis-ci-test
Updating 8c11486..143bbcf Fast-forward .travis.yml | 27 +++++++++++++++++++++++++ README.md | 2 ++ src/2geom/circle.cpp | 8 ++++---- src/2geom/conicsec.cpp | 14 ++++++------- src/2geom/ellipse.cpp | 2 +- src/2geom/line.cpp | 38 +++++++++++++++++------------------ src/2geom/line.h | 41 ++++++++++++++++++++------------------ src/2geom/path-sink.h | 6 ++++-- src/2geom/ray.h | 47 ++++++++++++++++++++++---------------------- src/tests/line-test.cpp | 9 +++++++++ src/toys/conic-6.cpp | 4 ++-- src/toys/find-derivative.cpp | 2 +- src/toys/line-toy.cpp | 2 +- src/toys/rect-toy.cpp | 2 +- 14 files changed, 124 insertions(+), 80 deletions(-) create mode 100644 .travis.yml
-- View this message in context: http://inkscape.13.x6.nabble.com/how-to-update-a-git-repository-tp4975817p49... Sent from the Inkscape - Dev mailing list archive at Nabble.com.
Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel
Another update:
I added a Bazaar import from Github, and removed the Git repo from Launchpad, since there doesn't seem to be a way to configure a Git mirror on Launchpad.
I also wrote a small cheat sheet for translating Bazaar commands to Git commands here: http://wiki.inkscape.org/wiki/index.php/Working_with_Git
Suggestions on how to write the general material that does not assume knowledge of Bazaar are welcome.
Best regards, Krzysztof
2016-03-04 18:16 GMT-08:00 Krzysztof Kosiński <tweenk.pl@...400...>:
Hello everyone,
Sorry for causing this mess. The Git repository on Launchpad is indeed out of date. I sent an e-mail to the 2Geom mailing list, but should probably also have sent it to the Inkscape list. The authoritative version is on GitHub. I will try to set up an import or delete the Launchpad repo during the weekend.
Best regards, Krzysztof
2016-03-04 17:15 GMT-08:00 alvinpenner <penner@...1856...>:
thanks! I believe that worked! I get the following. It contains the change in path-sink.h which I expected to see, plus extra stuff I did not expect to see. Now if only I could remember this for next time it happens. Anyways, I have to go now, I have a splitting headache.
Thanks for your help. Alvin
C:\Users\Alvin\AppData\Roaming\lib2geom>git pull remote: Counting objects: 43, done. remote: Compressing objects: 100% (5/5), done. lta 19), reused 19 (delta 19), pack-reused 19 Unpacking objects: 100% (43/43), done.
8c11486..143bbcf master -> origin/master
- [new branch] travis-ci-test -> origin/travis-ci-test
Updating 8c11486..143bbcf Fast-forward .travis.yml | 27 +++++++++++++++++++++++++ README.md | 2 ++ src/2geom/circle.cpp | 8 ++++---- src/2geom/conicsec.cpp | 14 ++++++------- src/2geom/ellipse.cpp | 2 +- src/2geom/line.cpp | 38 +++++++++++++++++------------------ src/2geom/line.h | 41 ++++++++++++++++++++------------------ src/2geom/path-sink.h | 6 ++++-- src/2geom/ray.h | 47 ++++++++++++++++++++++---------------------- src/tests/line-test.cpp | 9 +++++++++ src/toys/conic-6.cpp | 4 ++-- src/toys/find-derivative.cpp | 2 +- src/toys/line-toy.cpp | 2 +- src/toys/rect-toy.cpp | 2 +- 14 files changed, 124 insertions(+), 80 deletions(-) create mode 100644 .travis.yml
-- View this message in context: http://inkscape.13.x6.nabble.com/how-to-update-a-git-repository-tp4975817p49... Sent from the Inkscape - Dev mailing list archive at Nabble.com.
Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel
thanks, that will be very helpful. I have one more problem that is confusing me. I don't know how to apply my Launchpad SSH key to github. I use Pageant and Putty on Windows, so I have a file called bzrlaunchpad.ppk with a private key that I open with Putty to start the session, and I have a file called bzrlaunchpad.public with a public key. Both files created by me in Dec 2009. I assume that I have to apply these to the github site somehow, but have completely forgotten how to do this. Are there any instructions on the github website for how to do this?
thanks, Alvin
-- View this message in context: http://inkscape.13.x6.nabble.com/how-to-update-a-git-repository-tp4975817p49... Sent from the Inkscape - Dev mailing list archive at Nabble.com.
sorry for the noise, I think I just found something, will read it and see if it works
https://help.github.com/articles/generating-an-ssh-key/
Alvin
-- View this message in context: http://inkscape.13.x6.nabble.com/how-to-update-a-git-repository-tp4975817p49... Sent from the Inkscape - Dev mailing list archive at Nabble.com.
2016-03-05 15:03 GMT-03:00 alvinpenner <penner@...1856...>:
I assume that I have to apply these to the github site somehow, but have completely forgotten how to do this. Are there any instructions on the github website for how to do this?
Private keys MUST NEVER be shared with other parties. NEVER. Do not ever let others know your private keys.
Follow this page to add your public SSH key to github: https://github.com/settings/ssh
thanks, I believe that worked!
Alvin
-- View this message in context: http://inkscape.13.x6.nabble.com/how-to-update-a-git-repository-tp4975817p49... Sent from the Inkscape - Dev mailing list archive at Nabble.com.
On Sat, 2016-03-05 at 10:03 -0800, alvinpenner wrote:
I assume that I have to apply these to the github site somehow,but have completely forgotten how to do this. Are there any instructions on the github website for how to do this?
https://help.github.com/articles/generating-an-ssh-key/
You should see the link to review your ssh keys from there, the help pages aren't great though.
Best Regards, Martin Owens
participants (7)
-
alvinpenner -
Bryce Harrington -
Krzysztof Kosiński -
Liam White -
Maren Hachmann -
Martin Owens -
Vinícius dos Santos Oliveira