{"thread":{"id":"13707","subject":"git-gui clone differs from command line","startedAt":"2008-05-28T15:21:40Z","lastAt":"2008-05-29T13:40:55Z","messageCount":4,"participants":["Barry Roberts","Shawn O. Pearce","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"77941","messageId":"483D7884.2050407@robertsr.us","threadId":"13707","inReplyTo":null,"subject":"git-gui clone differs from command line","fromName":"Barry Roberts","fromEmail":"blr@robertsr.us","sentAt":"2008-05-28T15:21:40Z","receivedAt":"2008-05-28T15:21:40Z","isPatch":false,"sender":{"key":"blr@robertsr.us","avatar":null},"body":"After much mis-directed research, I finally figured out that cloning a \nrepo (ssh://) with git-gui doesn't work exactly like 'git clone' from \nthe command line.  The main difference is that 'git pull' doesn't work \non master.  I get the error below.  Is that intentional, or are we doing \nsomething wrong?\n\n\n From ssh://blr@cvs2/var/git/iv\n = [up to date]      master     -> origin/master\n = [up to date]      mbn/xtol   -> origin/mbn/xtol\n = [up to date]      sprint2    -> origin/sprint2\n = [up to date]      sprint3    -> origin/sprint3\n = [up to date]      sprint4    -> origin/sprint4\n = [up to date]      xtol       -> origin/xtol\nYou asked me to pull without telling me which branch you\nwant to merge with, and 'branch.master.merge' in\nyour configuration file does not tell me either.  Please\nname which branch you want to merge on the command line and\ntry again (e.g. 'git pull <repository> <refspec>').\nSee git-pull(1) for details on the refspec.\n\nIf you often merge with the same branch, you may want to\nconfigure the following variables in your configuration\nfile:\n\n    branch.master.remote = <nickname>\n    branch.master.merge = <remote-ref>\n    remote.<nickname>.url = <url>\n    remote.<nickname>.fetch = <refspec>\n\nSee git-config(1) for details.\n"},{"id":"77987","messageId":"20080528232324.GM30245@spearce.org","threadId":"13707","inReplyTo":"483D7884.2050407@robertsr.us","subject":"Re: git-gui clone differs from command line","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-05-28T23:23:24Z","receivedAt":"2008-05-28T23:23:24Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Barry Roberts <blr@robertsr.us> wrote:\n> After much mis-directed research, I finally figured out that cloning a \n> repo (ssh://) with git-gui doesn't work exactly like 'git clone' from \n> the command line.  The main difference is that 'git pull' doesn't work \n> on master.  I get the error below.  Is that intentional, or are we doing \n> something wrong?\n\nBug in git-gui.\n\ngit-gui's clone feature isn't implemented in terms of git-clone.\nIts implemented in terms of more primitive actions:\n\n\tgit init\n\tgit remote add origin\n\tgit fetch\n\tgit fetch --tags\n\tgit update-ref refs/heads/master origin/master\n\tgit checkout\n\nhowever it forgets to setup the branch configuration:\n \n> If you often merge with the same branch, you may want to\n> configure the following variables in your configuration\n> file:\n> \n>    branch.master.remote = <nickname>\n>    branch.master.merge = <remote-ref>\n>    remote.<nickname>.url = <url>\n>    remote.<nickname>.fetch = <refspec>\n> \n> See git-config(1) for details.\n\nYea.  That author of git-gui should really check git-config(1)\nfor detais.  *ducks and hides*\n\nI'll try to fix it tonight or tomorrow.\n\n-- \nShawn.\n"},{"id":"78009","messageId":"1212029963.8891.2.camel@gdub.robertsr.us","threadId":"13707","inReplyTo":"20080528232324.GM30245@spearce.org","subject":"Re: git-gui clone differs from command line","fromName":"Barry Roberts","fromEmail":"blr@robertsr.us","sentAt":"2008-05-29T02:59:23Z","receivedAt":"2008-05-29T02:59:23Z","isPatch":false,"sender":{"key":"blr@robertsr.us","avatar":null},"body":"\nOn Wed, 2008-05-28 at 19:23 -0400, Shawn O. Pearce wrote:\n> Barry Roberts <blr@robertsr.us> wrote:\n> > After much mis-directed research, I finally figured out that cloning a \n> > repo (ssh://) with git-gui doesn't work exactly like 'git clone' from \n> > the command line.  The main difference is that 'git pull' doesn't work \n> > on master.  I get the error below.  Is that intentional, or are we doing \n> > something wrong?\n> \n> Bug in git-gui.\n> \n> git-gui's clone feature isn't implemented in terms of git-clone.\n> Its implemented in terms of more primitive actions:\n> \n> \tgit init\n> \tgit remote add origin\n> \tgit fetch\n> \tgit fetch --tags\n> \tgit update-ref refs/heads/master origin/master\n> \tgit checkout\n> \n> however it forgets to setup the branch configuration:\n>  \n> > If you often merge with the same branch, you may want to\n> > configure the following variables in your configuration\n> > file:\n> > \n> >    branch.master.remote = <nickname>\n> >    branch.master.merge = <remote-ref>\n> >    remote.<nickname>.url = <url>\n> >    remote.<nickname>.fetch = <refspec>\n> > \n> > See git-config(1) for details.\n> \n> Yea.  That author of git-gui should really check git-config(1)\n> for detais.  *ducks and hides*\n> \n> I'll try to fix it tonight or tomorrow.\n\nNo worries.  I just e-mailed out a [branch \"master\"] section\nfrom .git/config from a cmd-line clone'd repo and all the Windows users\nare happy.  Oddly, our Linux users never saw this ;-)\n\nThanks,\nBarry\n"},{"id":"78042","messageId":"alpine.DEB.1.00.0805291440160.13507@racer.site.net","threadId":"13707","inReplyTo":"1212029963.8891.2.camel@gdub.robertsr.us","subject":"Re: git-gui clone differs from command line","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-05-29T13:40:55Z","receivedAt":"2008-05-29T13:40:55Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 28 May 2008, Barry Roberts wrote:\n\n> No worries.  I just e-mailed out a [branch \"master\"] section from \n> .git/config from a cmd-line clone'd repo and all the Windows users are \n> happy.  Oddly, our Linux users never saw this ;-)\n\nOf course, it would be even nicer if you patched git-gui yourself.  It's \nnot like Shawn is paid full-time to work on git-gui.\n\nCiao,\nDscho\n"}]}