Re: It gits on my nerves
Hi Ben, * Ben Pfaff wrote on Sat, Nov 24, 2007 at 10:36:30PM CET: Recently, I discovered the fairly new command git rebase --interactive, which can sometimes be even easier. You might check it out, if you are not already aware of it. Thanks for the pointer! No, I wasn't aware of that, the git version I used did not have it. Cheers, Ralf
It gits on my nerves
I have been fighting with git for almost two hours to put my patches in order and to apply them upstream. I wish I could have spent some time on the patches themselves, but I guess it'll come once I understand how git works :( I'm stuck here, and I'm tired of it. I can't seem to be able to do what I want with a single repo, so I checkout zillions of repos, I'll see later how git can really space, I just want to be able to check this in. Any help (*simple* help, I don't need a lecture, I just want to type what's needed for this to work and enjoy my weekend) appreciated! 117 git clone git://git.sv.gnu.org/automake.git 118 git branch ws master 119 ls 120 cd automake 121 git branch ws master 122 git diff 123 git commit 124 git commit -a 125git checkout master 126 history 127 git pull 128 git show 129 git rebase master 130 git merge ws 131 git show 132 git push [EMAIL PROTECTED] ~/src/wd/automake $ git push 10:11:43 fatal: The remote end hung up unexpectedly error: failed to push to 'git://git.sv.gnu.org/automake.git' Thanks!
Re: It gits on my nerves
Le 24 nov. 07 à 10:18, Akim Demaille a écrit : [EMAIL PROTECTED] ~/src/wd/automake $ git push 10:11:43 fatal: The remote end hung up unexpectedly error: failed to push to 'git://git.sv.gnu.org/automake.git' I have found pages reporting that this message is related to permissions. I suggest that the Automake page [1] make it clearer that one should not use git:// to get write permissions. Pointing to Savannah's page about Git [2] would be very useful. [EMAIL PROTECTED] ~/src/wd/automake $ git config remote.origin.url ssh://[EMAIL PROTECTED]/automake.git [EMAIL PROTECTED] ~/src/wd/automake $ git push fatal: '/automake.git': unable to chdir or not a git archive fatal: The remote end hung up unexpectedly error: failed to push to 'ssh://[EMAIL PROTECTED]/automake.git' The problem is now that I don't seem to have write permissions on Automake [3]. Could someone add me please? Thanks in advance. [1] http://sources.redhat.com/automake/ [2] http://savannah.gnu.org/maintenance/UsingGit [3] http://savannah.gnu.org/project/memberlist.php?group=automake
Re: It gits on my nerves
Le 24 nov. 07 à 10:58, Akim Demaille a écrit : [EMAIL PROTECTED] ~/src/wd/automake $ git config remote.origin.url ssh://[EMAIL PROTECTED]/automake.git Fixed. [EMAIL PROTECTED] ~/src/wd/automake $ git config remote.origin.url ssh://[EMAIL PROTECTED]/srv/git/automake.git [EMAIL PROTECTED] ~/src/wd/automake $ git push 11:00:47 updating 'refs/heads/master' from 88d1f07e102807518eef06b1ff5279bb40eb2202 to 1d0c65c8894d499ad034c9cc189808d4ecd3db5c Also local refs/remotes/origin/master Generating pack... Done counting 4 objects. Deltifying 4 objects... 100% (4/4) done Writing 4 objects... 100% (4/4) done Total 4 (delta 0), reused 0 (delta 0) error: unable to create temporary sha1 filename ./objects/ tmp_obj_OVLl9H: Permission denied fatal: failed to write object unpack unpacker exited with error code ng refs/heads/master n/a (unpacker error) error: failed to push to 'ssh://[EMAIL PROTECTED]/srv/git/automake.git' Someone seems to have added me though (thanks!).
Re: It gits on my nerves
Akim Demaille [EMAIL PROTECTED] wrote: The problem is now that I don't seem to have write permissions on Automake [3]. Could someone add me please? Thanks in advance. Hi Akim, I've just added you.
Re: It gits on my nerves
Hello Akim, * Akim Demaille wrote on Sat, Nov 24, 2007 at 10:18:30AM CET: I have been fighting with git for almost two hours to put my patches in order and to apply them upstream. I'm really sorry it's so much trouble for you. 117 git clone git://git.sv.gnu.org/automake.git This is a read-only checkout. You need to use the git+ssh protocol in order to do writes: git clone ssh://[EMAIL PROTECTED]/srv/git/automake.git (assuming akim is your login). http://savannah.gnu.org/maintenance/UsingGit explains it. 118 git branch ws master OK, here you needed to `cd automake' first. 119 ls 120 cd automake 121 git branch ws master This creates branch ws but still leaves your current tree showing master. [...] Maybe it helps if I show how I work: - doing some work # first, create a feature branch and check it out: git checkout -b my-work-branch master # Now, hack away: while $not_done; do $edit git add changed-files git commit done - getting third-party changes into my tree: # ensure your current tree is clean (all changes committed etc)... # then, go back to master: git checkout master # get changes from upstream: git pull # now rebase my feature branch upon the new upstream tree: git checkout my-work-branch # (this may require multiple merging steps, read the output): git rebase master - publishing my finished changes: # first, ensure my master is up to date wrt. upstream (see above). # then, merge feature branch into master branch: git checkout master git merge my-work-branch # (if you rebased the branch, then this should be a fast-forward.) # now, finally publish: git push Hope that helps a bit. Again, I'm happy to apply patches for you if you like. Cheers, Ralf
Re: It gits on my nerves
* Akim Demaille wrote on Sat, Nov 24, 2007 at 10:58:02AM CET: Le 24 nov. 07 à 10:18, Akim Demaille a écrit : [EMAIL PROTECTED] ~/src/wd/automake $ git push 10:11:43 fatal: The remote end hung up unexpectedly error: failed to push to 'git://git.sv.gnu.org/automake.git' I have found pages reporting that this message is related to permissions. I suggest that the Automake page [1] make it clearer that one should not use git:// to get write permissions. Pointing to Savannah's page about Git [2] would be very useful. Done, thanks! Cheers, Ralf
Re: It gits on my nerves
Le 24 nov. 07 à 11:03, Ralf Wildenhues a écrit : Hello Akim, * Akim Demaille wrote on Sat, Nov 24, 2007 at 10:18:30AM CET: I have been fighting with git for almost two hours to put my patches in order and to apply them upstream. I'm really sorry it's so much trouble for you. It's because I'd like to use it without taking the time to RTFM, so of course I'm inefficient, wasting not only my time, but yours too :( Sorry about this. Thanks for the help! Maybe it helps if I show how I work: What I have been trying to do is making many changes in single tree, and them checking them in in different branches, sort of a mixture between my usual svn method (several changes, and svn ci FILES to select how I serialize them) and git (making branches). But I couldn't find how to go back to the remote master except by cloning several times. I'm try to be more gitty from now on, and stop being svnish.
Re: It gits on my nerves
* Akim Demaille wrote on Sat, Nov 24, 2007 at 11:16:57AM CET: What I have been trying to do is making many changes in single tree, and them checking them in in different branches, sort of a mixture between my usual svn method (several changes, and svn ci FILES to select how I serialize them) and git (making branches). I work roughly similar. I hack away on a branch that contains all kinds of ugly and unfinished changes. Then to get more organized, I create another branch (off of master) and merge or cherry-pick the changes from the other branch. The git manual describes this in the creating the perfect patch series chapter. But I couldn't find how to go back to the remote master except by cloning several times. Hmm. Do you mean something like git checkout [-b newbranch] origin/master ? I'm try to be more gitty from now on, and stop being svnish. ;-) Cheers, Ralf
Re: It gits on my nerves
Ralf Wildenhues [EMAIL PROTECTED] writes: I work roughly similar. I hack away on a branch that contains all kinds of ugly and unfinished changes. Then to get more organized, I create another branch (off of master) and merge or cherry-pick the changes from the other branch. The git manual describes this in the creating the perfect patch series chapter. This works just fine, of course. Recently, I discovered the fairly new command git rebase --interactive, which can sometimes be even easier. You might check it out, if you are not already aware of it. -- Ben Pfaff http://benpfaff.org
