{"thread":{"id":"3508","subject":"Problems with using git","startedAt":"2006-03-02T00:25:32Z","lastAt":"2006-03-08T02:16:08Z","messageCount":11,"participants":["Joseph Wakeling","Linus Torvalds","Andreas Ericsson","Greg KH","Junio C Hamano","Mark Wooding"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"16997","messageId":"44063B7C.40609@webdrake.net","threadId":"3508","inReplyTo":null,"subject":"Problems with using git","fromName":"Joseph Wakeling","fromEmail":"joseph.wakeling@webdrake.net","sentAt":"2006-03-02T00:25:32Z","receivedAt":"2006-03-02T00:25:32Z","isPatch":false,"sender":{"key":"joseph.wakeling@webdrake.net","avatar":null},"body":"Hello all,\n\nI'm a physics PhD student, not much experienced in serious software\nwriting, but I've got to the point where I felt learning to use a\nversion control system would be worthwhile.  I decided to go for git\nrather than CVS or Subversion because I felt a distributed VCS would\nhave more potential for future projects.\n\nHowever, I've been experiencing some difficulties with using git, with\nthe results of commands not always being what the tutorial\n<http://www.kernel.org/pub/software/scm/git/docs/tutorial.html> says it\nshould be.  So, I'm hoping someone here can advise me!\n\nI'm using openSUSE 10.0 and the package installed is git-core version\n0.99.3git20050905-2.\n\nThe problem is to do with branches.  Wanting to make some trial\nrevisions, I typed,\n\n    git branch trial\n\nto create an appropriate branch.  However, typing \"git branch\"\nafterwards results in an error message: \"git branch: I want a branch\nname\".  No list of branches as the tutorial suggests!\n\nHowever, I can use git checkout trial, make edits, and then go back to\ngit checkout master, and switch between the two, with the revisions in\none but not in the other.  So the branches do seem to exist, and I can\nmodify them separately as one should be able to.\n\nNow, having played around with the changes and found that they really\nwork very well, I'd like to merge the changes in the trial branch back\ninto the master.  So, as per the tutorial, I type, git pull trial; and\nam told, \"No such remote branch: trial\".  I've also tried, git pull .\ntrial, which has the result, \"No such remote branch: .\".\n\nI also note that when I'm in the master branch, having used git checkout\nmaster, if I go into gitk, it does not show the existence of the trial\nbranch: but if I go into git checkout trial, it does.  But the two\nappear to be shown as completely separate entities.\n\nJust as a test, I tried creating a throwaway branch,\n\n    git branch silly\n\nwhich I then tried to delete with git branch -D silly.  However, this\ndidn't delete the silly branch: it created a new one called -D (and both\nof these *did* show up in gitk under the master branch).  Using\ngit-branch instead of git branch results in an error message: \"bash:\ngit-branch: command not found\".\n\nThe result is that I'm kind of confused.  I'd like to understand why the\ncommands I've tried from the tutorial haven't produced the results the\ntutorial claims they will; but I'd also like to solve the original\nproblem: how just to merge the stuff in my trial branch back into the\nmaster.\n\nI suspect this might be simply that the SUSE package has some problems. \nFor example, it doesn't appear to have any man pages included. :-(\n\nThanks for any advice,\n\nBest wishes,\n\n        -- Joe\n"},{"id":"17001","messageId":"Pine.LNX.4.64.0603011651240.22647@g5.osdl.org","threadId":"3508","inReplyTo":"44063B7C.40609@webdrake.net","subject":"Re: Problems with using git","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2006-03-02T00:52:56Z","receivedAt":"2006-03-02T00:52:56Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Thu, 2 Mar 2006, Joseph Wakeling wrote:\n> \n> I'm using openSUSE 10.0 and the package installed is git-core version\n> 0.99.3git20050905-2.\n\nI think your problems are just related to the fact that the tutorial is \nnewer than your git version.\n\nJust fetch a newer version of git first (0.99.3 should be new enough to \nhappily fetch a newer version using git itself, but it might be easier to \njust get a tar-ball), and you'll have an easier time at it.\n\n\t\tLinus\n"},{"id":"17003","messageId":"4406493E.3000701@op5.se","threadId":"3508","inReplyTo":"Pine.LNX.4.64.0603011651240.22647@g5.osdl.org","subject":"Re: Problems with using git","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2006-03-02T01:24:14Z","receivedAt":"2006-03-02T01:24:14Z","isPatch":false,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Linus Torvalds wrote:\n> \n> On Thu, 2 Mar 2006, Joseph Wakeling wrote:\n> \n>>I'm using openSUSE 10.0 and the package installed is git-core version\n>>0.99.3git20050905-2.\n> \n> \n> I think your problems are just related to the fact that the tutorial is \n> newer than your git version.\n> \n> Just fetch a newer version of git first (0.99.3 should be new enough to \n> happily fetch a newer version using git itself, but it might be easier to \n> just get a tar-ball), and you'll have an easier time at it.\n> \n\n... and the way to fetch and install that repo with your current git is:\n\n\t$ git clone git://git.kernel.org/pub/scm/git/git.git git\n\t$ cd git && make all strip install\n\nThere are 2215 commits since 0.99.3, so I think you'll find much has \nchanged since then.\n\n-- \nAndreas Ericsson                   andreas.ericsson@op5.se\nOP5 AB                             www.op5.se\nTel: +46 8-230225                  Fax: +46 8-230231\n"},{"id":"17034","messageId":"4406F8B1.9050303@webdrake.net","threadId":"3508","inReplyTo":"Pine.LNX.4.64.0603011651240.22647@g5.osdl.org","subject":"Re: Problems with using git","fromName":"Joseph Wakeling","fromEmail":"joseph.wakeling@webdrake.net","sentAt":"2006-03-02T13:52:49Z","receivedAt":"2006-03-02T13:52:49Z","isPatch":false,"sender":{"key":"joseph.wakeling@webdrake.net","avatar":null},"body":"Thanks very much to all who offered advice on this. :-)\n\nUnfortunately openSUSE is somewhat out of sync not just with git but in\nlibraries necessary to install the latest version (libcrypto.so.4,\nlibssl.so.4).  The openssl (0.9.7g-2.4) and openssl-devel (0.9.7g-2)\npackages don't contain these but rather contain libcrypto.so.0.9.7 and\nlibssl.0.9.7.  Just in case it's important to future git development.\n\nBest wishes & thanks again,\n\n          -- Joe\n"},{"id":"17035","messageId":"4406FA46.7080608@op5.se","threadId":"3508","inReplyTo":"4406F8B1.9050303@webdrake.net","subject":"Re: Problems with using git","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2006-03-02T13:59:34Z","receivedAt":"2006-03-02T13:59:34Z","isPatch":false,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Joseph Wakeling wrote:\n> Thanks very much to all who offered advice on this. :-)\n> \n> Unfortunately openSUSE is somewhat out of sync not just with git but in\n> libraries necessary to install the latest version (libcrypto.so.4,\n> libssl.so.4).  The openssl (0.9.7g-2.4) and openssl-devel (0.9.7g-2)\n> packages don't contain these but rather contain libcrypto.so.0.9.7 and\n> libssl.0.9.7.  Just in case it's important to future git development.\n> \n\nIt might be useful for the openSuSE developers, but for git this is \ntotally irrelevant. If you build from sources yourself they will be \nlinked to whatever libraries you have installed.\n\n-- \nAndreas Ericsson                   andreas.ericsson@op5.se\nOP5 AB                             www.op5.se\nTel: +46 8-230225                  Fax: +46 8-230231\n"},{"id":"17084","messageId":"20060302232151.GA12252@kroah.com","threadId":"3508","inReplyTo":"4406F8B1.9050303@webdrake.net","subject":"Re: Problems with using git","fromName":"Greg KH","fromEmail":"greg@kroah.com","sentAt":"2006-03-02T23:21:51Z","receivedAt":"2006-03-02T23:21:51Z","isPatch":false,"sender":{"key":"greg@kroah.com","avatar":"https://gravatar.com/avatar/5bb5aa0cc2e01c00ec899d11130c07796bc186e465bae57bc34873b13b72c7c8?d=mp&s=160"},"body":"On Thu, Mar 02, 2006 at 01:52:49PM +0000, Joseph Wakeling wrote:\n> Thanks very much to all who offered advice on this. :-)\n> \n> Unfortunately openSUSE is somewhat out of sync not just with git but in\n> libraries necessary to install the latest version (libcrypto.so.4,\n> libssl.so.4).  The openssl (0.9.7g-2.4) and openssl-devel (0.9.7g-2)\n> packages don't contain these but rather contain libcrypto.so.0.9.7 and\n> libssl.0.9.7.  Just in case it's important to future git development.\n\nIf you use the latest openSUSE betas or the FACTORY tree, git 1.1.3 is\navailable there.\n\n10.0 was released six months or so ago, so that is why it contains an\nolder version of git.\n\nthanks,\n\ngreg k-h\n"},{"id":"17085","messageId":"7vr75k5s4y.fsf@assigned-by-dhcp.cox.net","threadId":"3508","inReplyTo":"4406FA46.7080608@op5.se","subject":"Re: Problems with using git","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-03-02T23:44:13Z","receivedAt":"2006-03-02T23:44:13Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andreas Ericsson <ae@op5.se> writes:\n\n> Joseph Wakeling wrote:\n>> Thanks very much to all who offered advice on this. :-)\n>> Unfortunately openSUSE is somewhat out of sync not just with git but\n>> in\n>> libraries necessary to install the latest version (libcrypto.so.4,\n>> libssl.so.4).  The openssl (0.9.7g-2.4) and openssl-devel (0.9.7g-2)\n>> packages don't contain these but rather contain libcrypto.so.0.9.7 and\n>> libssl.0.9.7.  Just in case it's important to future git development.\n>\n> It might be useful for the openSuSE developers, but for git this is\n> totally irrelevant.\n\nTrue, but I had an impression that we had active developers in\ngit community who are close to Suse, and I wonder why this\nhadn't come up earlier.  Maybe our userbase and Suse's userbase\ndo not overlap much?\n"},{"id":"17086","messageId":"20060302235824.GA13436@kroah.com","threadId":"3508","inReplyTo":"7vr75k5s4y.fsf@assigned-by-dhcp.cox.net","subject":"Re: Problems with using git","fromName":"Greg KH","fromEmail":"greg@kroah.com","sentAt":"2006-03-02T23:58:24Z","receivedAt":"2006-03-02T23:58:24Z","isPatch":false,"sender":{"key":"greg@kroah.com","avatar":"https://gravatar.com/avatar/5bb5aa0cc2e01c00ec899d11130c07796bc186e465bae57bc34873b13b72c7c8?d=mp&s=160"},"body":"On Thu, Mar 02, 2006 at 03:44:13PM -0800, Junio C Hamano wrote:\n> Andreas Ericsson <ae@op5.se> writes:\n> \n> > Joseph Wakeling wrote:\n> >> Thanks very much to all who offered advice on this. :-)\n> >> Unfortunately openSUSE is somewhat out of sync not just with git but\n> >> in\n> >> libraries necessary to install the latest version (libcrypto.so.4,\n> >> libssl.so.4).  The openssl (0.9.7g-2.4) and openssl-devel (0.9.7g-2)\n> >> packages don't contain these but rather contain libcrypto.so.0.9.7 and\n> >> libssl.0.9.7.  Just in case it's important to future git development.\n> >\n> > It might be useful for the openSuSE developers, but for git this is\n> > totally irrelevant.\n> \n> True, but I had an impression that we had active developers in\n> git community who are close to Suse, and I wonder why this\n> hadn't come up earlier.  Maybe our userbase and Suse's userbase\n> do not overlap much?\n\nYes, some of us are quite close to SuSE :)\n\nAnyway, the issue is that 10.0 was released about 6 months ago, and\ncontains the version of git at that time.  The latest development tree,\nand the latest public betas contain 1.1.3.  If you think this should be\nnewer, I can easily go poke the proper people...\n\nthanks,\n\ngreg k-h\n"},{"id":"17142","messageId":"slrne0isi9.fr9.mdw@metalzone.distorted.org.uk","threadId":"3508","inReplyTo":"20060302235824.GA13436@kroah.com","subject":"Re: Problems with using git","fromName":"Mark Wooding","fromEmail":"mdw@distorted.org.uk","sentAt":"2006-03-04T10:56:09Z","receivedAt":"2006-03-04T10:56:09Z","isPatch":false,"sender":{"key":"mdw@distorted.org.uk","avatar":null},"body":"Greg KH <greg@kroah.com> wrote:\n\n> The latest development tree, and the latest public betas contain\n> 1.1.3.  If you think this should be newer, I can easily go poke the\n> proper people...\n\nGiven that there's a security issue which got fixed in 1.1.5, I think\nthis is really a bit poor.\n\nI notice, by contrast, that Debian had managed to repackage and release\na new GIT the day after Junio fixed the bug in the first place.  That\nwas more than a month ago.\n\n-- [mdw]\n"},{"id":"17155","messageId":"20060304222557.GA24628@kroah.com","threadId":"3508","inReplyTo":"slrne0isi9.fr9.mdw@metalzone.distorted.org.uk","subject":"Re: Problems with using git","fromName":"Greg KH","fromEmail":"greg@kroah.com","sentAt":"2006-03-04T22:25:57Z","receivedAt":"2006-03-04T22:25:57Z","isPatch":false,"sender":{"key":"greg@kroah.com","avatar":"https://gravatar.com/avatar/5bb5aa0cc2e01c00ec899d11130c07796bc186e465bae57bc34873b13b72c7c8?d=mp&s=160"},"body":"On Sat, Mar 04, 2006 at 10:56:09AM +0000, Mark Wooding wrote:\n> Greg KH <greg@kroah.com> wrote:\n> \n> > The latest development tree, and the latest public betas contain\n> > 1.1.3.  If you think this should be newer, I can easily go poke the\n> > proper people...\n> \n> Given that there's a security issue which got fixed in 1.1.5, I think\n> this is really a bit poor.\n> \n> I notice, by contrast, that Debian had managed to repackage and release\n> a new GIT the day after Junio fixed the bug in the first place.  That\n> was more than a month ago.\n\nFair enough, I'll go poke the proper people now...\n\nthanks,\n\ngreg k-h\n"},{"id":"17322","messageId":"20060308021608.GA26634@kroah.com","threadId":"3508","inReplyTo":"20060304222557.GA24628@kroah.com","subject":"Re: Problems with using git","fromName":"Greg KH","fromEmail":"greg@kroah.com","sentAt":"2006-03-08T02:16:08Z","receivedAt":"2006-03-08T02:16:08Z","isPatch":false,"sender":{"key":"greg@kroah.com","avatar":"https://gravatar.com/avatar/5bb5aa0cc2e01c00ec899d11130c07796bc186e465bae57bc34873b13b72c7c8?d=mp&s=160"},"body":"On Sat, Mar 04, 2006 at 02:25:57PM -0800, Greg KH wrote:\n> On Sat, Mar 04, 2006 at 10:56:09AM +0000, Mark Wooding wrote:\n> > Greg KH <greg@kroah.com> wrote:\n> > \n> > > The latest development tree, and the latest public betas contain\n> > > 1.1.3.  If you think this should be newer, I can easily go poke the\n> > > proper people...\n> > \n> > Given that there's a security issue which got fixed in 1.1.5, I think\n> > this is really a bit poor.\n> > \n> > I notice, by contrast, that Debian had managed to repackage and release\n> > a new GIT the day after Junio fixed the bug in the first place.  That\n> > was more than a month ago.\n> \n> Fair enough, I'll go poke the proper people now...\n\nThey jumped and the cogito and git should be updated to the latest\nversion in the next update.\n\nthanks,\n\ngreg k-h\n"}]}