{"thread":{"id":"47472","subject":"Usability outrage as far as I am concerned","startedAt":"2017-12-20T16:40:12Z","lastAt":"2017-12-23T12:22:57Z","messageCount":7,"participants":["Cristian Achim","Ævar Arnfjörð Bjarmason","Jacob Keller","Anatolii Borodin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"335089","messageId":"CAEW+b659_v02v8z_dgWzVayb8ArBOD+O_Oky-F50JbJSP8vCKQ@mail.gmail.com","threadId":"47472","inReplyTo":null,"subject":"Usability outrage as far as I am concerned","fromName":"Cristian Achim","fromEmail":"brancoliticus@gmail.com","sentAt":"2017-12-20T16:40:05Z","receivedAt":"2017-12-20T16:40:12Z","isPatch":false,"sender":{"key":"brancoliticus@gmail.com","avatar":null},"body":"All I will do is paste the stackoverflow question below. It covers the\ncommands I made in chronological order and the way I would have\nexpected git to behave differently.\n\nSo I did\n\ngit pull home_subfolder\n\nwhile in usb_subfolder. Can't remember the immediate output, but it\nincluded a part about two repos having no commits in common. Would\nhave been wiser for git to just error out with a message that in one\nof the folders there is not git repository.\n\nAt all times\n\ngit status\n\nin home_subfolder gives\n\nbranch master\nWorking directory clean\n\nThis is so stupid considering the circumstances.\n\nDoing again\n\ngit pull home_subfolder\n\nat all times from usb_folder now returns U in front of 2 files in\nhome_folder and A in front of another file and then says\n\nPull is not possible because you have unmerged files\n\nHad the bright idea to do\n\ngit clone home_subfolder\n\nfrom the usb_subfolder because of my worries going away when\n\ngit status\n\nin home_subfolder conforted me that there must be nothing bad about\nthe situation. Therefore I suspect that now doing\n\ngit pull usb_subfolder\n\nfrom home_subfolder will do the same broken result as above.\n\nI do not want to resolve merge conflicts because git doesn't error out\nwith a sane message of the situation when it should. I just want to\nget the home_subfolder and usb_subfolder repositories state to where\nit was before my breakage generating git pull and git clone commands.\n\nUbuntu 14.04 64 bit, git 1.9.1.\n\nThank you for your time.\n"},{"id":"335115","messageId":"CACBZZX7N+8yt2MsFJ7xsAQEMNkJvutX47VOED0SumsOzQK9tbg@mail.gmail.com","threadId":"47472","inReplyTo":"CAEW+b659_v02v8z_dgWzVayb8ArBOD+O_Oky-F50JbJSP8vCKQ@mail.gmail.com","subject":"Re: Usability outrage as far as I am concerned","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2017-12-20T22:21:36Z","receivedAt":"2017-12-20T22:22:02Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Wed, Dec 20, 2017 at 5:40 PM, Cristian Achim <brancoliticus@gmail.com> wrote:\n> All I will do is paste the stackoverflow question below. It covers the\n> commands I made in chronological order and the way I would have\n> expected git to behave differently.\n>\n> So I did\n>\n> git pull home_subfolder\n>\n> while in usb_subfolder. Can't remember the immediate output, but it\n> included a part about two repos having no commits in common. Would\n> have been wiser for git to just error out with a message that in one\n> of the folders there is not git repository.\n>\n> At all times\n>\n> git status\n>\n> in home_subfolder gives\n>\n> branch master\n> Working directory clean\n>\n> This is so stupid considering the circumstances.\n>\n> Doing again\n>\n> git pull home_subfolder\n>\n> at all times from usb_folder now returns U in front of 2 files in\n> home_folder and A in front of another file and then says\n>\n> Pull is not possible because you have unmerged files\n>\n> Had the bright idea to do\n>\n> git clone home_subfolder\n>\n> from the usb_subfolder because of my worries going away when\n>\n> git status\n>\n> in home_subfolder conforted me that there must be nothing bad about\n> the situation. Therefore I suspect that now doing\n>\n> git pull usb_subfolder\n>\n> from home_subfolder will do the same broken result as above.\n>\n> I do not want to resolve merge conflicts because git doesn't error out\n> with a sane message of the situation when it should. I just want to\n> get the home_subfolder and usb_subfolder repositories state to where\n> it was before my breakage generating git pull and git clone commands.\n>\n> Ubuntu 14.04 64 bit, git 1.9.1.\n\nHi. While I'm sure you'll still find some fault with git's UI could you please:\n\n1) Try to see if the latest git version (or some approximation) fixes\nsome of this, as you said you're on 1.9.1 which was released in 2014,\nthere's been a lot of UI work since then, including some that by my\nreading of your mail should address some of your concerns\n\n2) It would be really useful if you could distill the complaints you\nhave down to some sequence of commands to run, preferably just a small\nshellscript with comments saying \"the message at this point is bad for\nsuch-and-such a reason\". I may have just misread what you said (or\nmaybe it's since been fixed), but per my reading we're already doing\nsome of what you've pointed out we should be doing, and if not maybe\nthat's because I'm not imagining how you're running git exactly, a\nreproducible recipe would really help.\n\nThanks.\n"},{"id":"335118","messageId":"CA+P7+xojknncFrP5qCB4EKG0MAoTUqFWS5g3Bj+Jq2_RO0fA3A@mail.gmail.com","threadId":"47472","inReplyTo":"CAEW+b659_v02v8z_dgWzVayb8ArBOD+O_Oky-F50JbJSP8vCKQ@mail.gmail.com","subject":"Re: Usability outrage as far as I am concerned","fromName":"Jacob Keller","fromEmail":"jacob.keller@gmail.com","sentAt":"2017-12-21T02:29:47Z","receivedAt":"2017-12-21T02:30:15Z","isPatch":false,"sender":{"key":"jacob.keller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/874719?v=4"},"body":"On Wed, Dec 20, 2017 at 8:40 AM, Cristian Achim <brancoliticus@gmail.com> wrote:\n> All I will do is paste the stackoverflow question below. It covers the\n> commands I made in chronological order and the way I would have\n> expected git to behave differently.\n>\n> So I did\n>\n> git pull home_subfolder\n>\n\nThis by itself should be attempting to pull from a remote named\nhome_subfolder. Can you show the output of \"git remote\" and also\nclearly explain with details the layout of what the folders are and\nwhat is or is not a repository? I can't really make heads or tails of\nyour problem without more details.\n\n> I do not want to resolve merge conflicts because git doesn't error out\n> with a sane message of the situation when it should. I just want to\n> get the home_subfolder and usb_subfolder repositories state to where\n> it was before my breakage generating git pull and git clone commands.\n>\n> Ubuntu 14.04 64 bit, git 1.9.1.\n>\n> Thank you for your time.\n\nSo you have home_subfolder and usb_subfolder which are repositories?\nAre they submodules within a parent project? Are they simply folders?\nWere you trying to merge the two together?\n\nWithout knowing more of what you intended to do, vs what you did, and\nwithout more information about the setup it's not really possible to\nunderstand the situation or what broke.\n\nFrom the looks of it, I think you might have tried to do something\nlike try to pull from usb_subfolder directly into the home_subfolder.\n\nAre these two repositories nested? ie: you have \"home_subfolder\" as\n\"/home/subfolder\" and you have usb_subfolder as\n\"/home/subfolder/usb/subfolder\"?\n\nThat might explain why git pull would interpret such a command as a\npath from which to do a file based pull...\n\nThanks,\nJake\n"},{"id":"335170","messageId":"CAEW+b66pCqTBz6o_aTK0byyKsDc8HRfHuqKf64Ob6pBtL9w2Lw@mail.gmail.com","threadId":"47472","inReplyTo":"CA+P7+xojknncFrP5qCB4EKG0MAoTUqFWS5g3Bj+Jq2_RO0fA3A@mail.gmail.com","subject":"Re: Usability outrage as far as I am concerned","fromName":"Cristian Achim","fromEmail":"brancoliticus@gmail.com","sentAt":"2017-12-22T15:57:03Z","receivedAt":"2017-12-22T15:57:11Z","isPatch":false,"sender":{"key":"brancoliticus@gmail.com","avatar":null},"body":"> Can you show the output of \"git remote\"\n\n# in usb_subfolder\n$git remote\norigin\n$\n\n#in home_subfolder\n$git remote\n$\n\n> and also\n> clearly explain with details the layout of what the folders are and\n> what is or is not a repository?\n\nTake the following update into consideration and then reread my first\nemail hopefully with improved clarity:\n\n'home_subfolder' is the path on disk inside my user account home\nfolder in the 'home' root folder to the initial repo from which I\nmeant to do a backup.\n\n'usb_subfolder' is the path on disk in the 'media' root folder to the\ninitial empty folder into which I wanted to do the backup above that\npoints into a usb stick I mounted in the default Kubuntu KDE file\nmanager way of mounting usb stick folder hierarchies.\n\nCurrent situation is that 'git log' in both home_subfolder and\nusb_subfolder show the same hash with only one branch in both. From\nusb_subfolder 'git pull home_subfolder' is broken as in the original\nmessage.\n"},{"id":"335202","messageId":"CA+P7+xpt1cW-uokayYFJ5cr88FKBcn_RT3v7iLHyu7kZaS=wbg@mail.gmail.com","threadId":"47472","inReplyTo":"CAEW+b66pCqTBz6o_aTK0byyKsDc8HRfHuqKf64Ob6pBtL9w2Lw@mail.gmail.com","subject":"Re: Usability outrage as far as I am concerned","fromName":"Jacob Keller","fromEmail":"jacob.keller@gmail.com","sentAt":"2017-12-22T23:05:54Z","receivedAt":"2017-12-22T23:06:20Z","isPatch":false,"sender":{"key":"jacob.keller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/874719?v=4"},"body":"On Fri, Dec 22, 2017 at 7:57 AM, Cristian Achim <brancoliticus@gmail.com> wrote:\n>> Can you show the output of \"git remote\"\n>\n> # in usb_subfolder\n> $git remote\n> origin\n> $\n>\n> #in home_subfolder\n> $git remote\n> $\n>\n\nWith the -v switch you can see where each remote points to (tho your\nhome local repo has no remote which is fine).\n\n>> and also\n>> clearly explain with details the layout of what the folders are and\n>> what is or is not a repository?\n>\n> Take the following update into consideration and then reread my first\n> email hopefully with improved clarity:\n>\n> 'home_subfolder' is the path on disk inside my user account home\n> folder in the 'home' root folder to the initial repo from which I\n> meant to do a backup.\n>\n> 'usb_subfolder' is the path on disk in the 'media' root folder to the\n> initial empty folder into which I wanted to do the backup above that\n> points into a usb stick I mounted in the default Kubuntu KDE file\n> manager way of mounting usb stick folder hierarchies.\n>\n> Current situation is that 'git log' in both home_subfolder and\n> usb_subfolder show the same hash with only one branch in both. From\n> usb_subfolder 'git pull home_subfolder' is broken as in the original\n> message.\n\nOk. So you have a repository inside your home directory which you wish\nto copy into the USB stick?\n\nSo what steps did you take to setup the repository usb_subfolder initially?\n\nYou're basically trying to create a backup copy of what's in\nhome_subfolder into your USB stick?\n\nIf you're confident that home_subfolder is accurate right now, (ie:\nyou inspect its contents with git log, git status, and regaulr\ncommands to check that everything is as you expect), here's what I\nwould do:\n\ncd to your usb stick, then run\ngit clone /path/to/home_subfolder\n\nthis will create an initial clone.\n\nIf you wish to update it later, you can mount hte usb stick, and then\njust run git pull from inside the new subfolder. Note that you do\n*not* run \"git pull home_subfolder\", as git pull expects the name of a\nremote, which in this case is just origin (since the default remote\nname you clone from is origin)\n\nI'm still not certain what state you got in, but I believe based on\nyour commands that the home_subfolder is fine, and you somehow\nincorrectly setup the usb_subfolder.\n\nThanks,\nJake\n\nPS/Tangent:\n\nIf you never need the checked out files on the USB disk, and only wish\nto keep history saved, then you can actually do \"git clone --mirror\n<path>\" in order to make a bare copy which is a complete mirror of all\nrefs in the original repository.\n\nThen you can update it with just git fetch, or git remote update.\n(tho, keep in mind this clone would not have any working tree, but\nmerely a bare repository contents). (You can, ofcourse, recover the\nfiles by simply cloning to somewhere else, or adding a new work tree\nor similar.\n"},{"id":"335217","messageId":"CACNzp2mdEmAj_6an-4is6_1LnqAZs=huakJhUQrJ+DxyJWY0mA@mail.gmail.com","threadId":"47472","inReplyTo":"CA+P7+xpt1cW-uokayYFJ5cr88FKBcn_RT3v7iLHyu7kZaS=wbg@mail.gmail.com","subject":"Re: Usability outrage as far as I am concerned","fromName":"Anatolii Borodin","fromEmail":"anatoly.borodin@gmail.com","sentAt":"2017-12-23T03:15:05Z","receivedAt":"2017-12-23T03:15:30Z","isPatch":false,"sender":{"key":"anatoly.borodin@gmail.com","avatar":"https://gravatar.com/avatar/59f11f1f45cf5ebb7bcca8da94b43cfe5f596d91c0a3e27ad0d2a861cc2bbce7?d=mp&s=160"},"body":"Hi Jacob,\n\nOn Sat, Dec 23, 2017 at 12:05 AM, Jacob Keller <jacob.keller@gmail.com> wrote:\n> If you wish to update it later, you can mount hte usb stick, and then\n> just run git pull from inside the new subfolder. Note that you do\n> *not* run \"git pull home_subfolder\", as git pull expects the name of a\n> remote, which in this case is just origin (since the default remote\n> name you clone from is origin)\n\nFrom git-fetch(8):\n\n       <repository>\n           The \"remote\" repository that is the source of a fetch or\npull operation.\n           This parameter can be either a URL (see the section GIT URLS below)\n           or the name of a remote (see the section REMOTES below).\n\nYou can run git fetch / git pull with a URL or a local path to a\nrepository, not only origin etc.\n\n\n-- \nMit freundlichen Grüßen,\nAnatolii Borodin\n"},{"id":"335221","messageId":"CAEW+b64=CiUg97xJN2k_hvxYf9coo+VfPZ+REEyj0bR6x1nprA@mail.gmail.com","threadId":"47472","inReplyTo":"CACNzp2mdEmAj_6an-4is6_1LnqAZs=huakJhUQrJ+DxyJWY0mA@mail.gmail.com","subject":"Re: Usability outrage as far as I am concerned","fromName":"Cristian Achim","fromEmail":"brancoliticus@gmail.com","sentAt":"2017-12-23T12:22:51Z","receivedAt":"2017-12-23T12:22:57Z","isPatch":false,"sender":{"key":"brancoliticus@gmail.com","avatar":null},"body":"Basically somehow at the point when I investigated stuff on the usb\nstick I found the repository at the top level of the usb folder\nhierarchy. Therefore git got confused by what I was doing at\nusb_subfolder which is lower in the folder hierarchy and that is way\nit was having amasement inducing reports when trying to do a pull\nsaying that pull is not possible because of unmerged and newly added\nfiles.\n\nThank you to all that replied.\n"}]}