{"thread":{"id":"48090","subject":"Potential git bug","startedAt":"2018-03-19T19:13:30Z","lastAt":"2018-03-19T20:17:12Z","messageCount":3,"participants":["Nick Hunt","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"342231","messageId":"CAJ-HmiZFpGbe_kLUFoOibMgc2dtf=n5VXb=ReZjN2wNsja1Lrw@mail.gmail.com","threadId":"48090","inReplyTo":null,"subject":"Potential git bug","fromName":"Nick Hunt","fromEmail":"nhunt11@gmail.com","sentAt":"2018-03-19T19:13:20Z","receivedAt":"2018-03-19T19:13:30Z","isPatch":false,"sender":{"key":"nhunt11@gmail.com","avatar":null},"body":"i committed my changes, then ran\ngit reset --soft HEAD^\nat this point everything is fine\nthen i switched branches, and all of my changes vaporized into thin\nair. uhhh, is this supposed to happen?\n\nanyway, thank god intellij saves my work for me as i go, so i didn't\nhave to re-write all my code.\n\nmy bash/zsh commands are attached.\n\nthanks for the help! :)\n\n\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   master ●  gst\nOn branch master\nYour branch is behind 'origin/master' by 50 commits, and can be fast-forwarded.\n  (use \"git pull\" to update your local branch)\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git checkout -- <file>...\" to discard changes in working directory)\n\n\tmodified:   ../cnn/services.js\n\tmodified:   ../resources/vendor/quark-filters/.bower.json\n\tmodified:   ../resources/vendor/quark-filters/README.md\n\tmodified:   ../resources/vendor/quark-filters/dist/quark-filters.min.js\n\tmodified:   ../resources/vendor/quark-filters/dist/quark-filters.min.js.map\n\tmodified:   ../resources/vendor/quark-filters/src/quark-filters.js\n\tmodified:   js/videomonitor-page.js\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   master ●  git add -u\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   master ✚  gst\nOn branch master\nYour branch is behind 'origin/master' by 50 commits, and can be fast-forwarded.\n  (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n  (use \"git reset HEAD <file>...\" to unstage)\n\n\tmodified:   ../cnn/services.js\n\tmodified:   ../resources/vendor/quark-filters/.bower.json\n\tmodified:   ../resources/vendor/quark-filters/README.md\n\tmodified:   ../resources/vendor/quark-filters/dist/quark-filters.min.js\n\tmodified:   ../resources/vendor/quark-filters/dist/quark-filters.min.js.map\n\tmodified:   ../resources/vendor/quark-filters/src/quark-filters.js\n\tmodified:   js/videomonitor-page.js\n\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   master ✚  git reset -- ../cnn/services.js\nUnstaged changes after reset:\nM\tcnn/services.js\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   master ●✚  gst\nOn branch master\nYour branch is behind 'origin/master' by 50 commits, and can be fast-forwarded.\n  (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n  (use \"git reset HEAD <file>...\" to unstage)\n\n\tmodified:   ../resources/vendor/quark-filters/.bower.json\n\tmodified:   ../resources/vendor/quark-filters/README.md\n\tmodified:   ../resources/vendor/quark-filters/dist/quark-filters.min.js\n\tmodified:   ../resources/vendor/quark-filters/dist/quark-filters.min.js.map\n\tmodified:   ../resources/vendor/quark-filters/src/quark-filters.js\n\tmodified:   js/videomonitor-page.js\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git checkout -- <file>...\" to discard changes in working directory)\n\n\tmodified:   ../cnn/services.js\n\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   master ●✚  git commit -m \"MCI-515: initial commit: speeding up load time of the monitor page by defaulting the date filter to 12 hours instead of 'all time', b/c all time doesn't actually represent all time and b/c no users actually look at all time anyway\"\n[master 23942d272] MCI-515: initial commit: speeding up load time of the monitor page by defaulting the date filter to 12 hours instead of 'all time', b/c all time doesn't actually represent all time and b/c no users actually look at all time anyway\n 6 files changed, 349 insertions(+), 276 deletions(-)\n rewrite resources/vendor/quark-filters/dist/quark-filters.min.js.map (95%)\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   master ●  gst\nOn branch master\nYour branch and 'origin/master' have diverged,\nand have 1 and 50 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git checkout -- <file>...\" to discard changes in working directory)\n\n\tmodified:   ../cnn/services.js\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   master ●  git push\nNo user exists for uid 501\nfatal: Could not read from remote repository.\n\nPlease make sure you have the correct access rights\nand the repository exists.\n ✘ nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   master ●  gco -b MCI-515\nM\tcnn/services.js\nSwitched to a new branch 'MCI-515'\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   MCI-515 ●  gst\nOn branch MCI-515\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git checkout -- <file>...\" to discard changes in working directory)\n\n\tmodified:   ../cnn/services.js\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   MCI-515 ●  gco master\nM\tcnn/services.js\nSwitched to branch 'master'\nYour branch and 'origin/master' have diverged,\nand have 1 and 50 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   master ●  git reset --soft HEAD^\nzsh: no matches found: HEAD^\n ✘ nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   master ●  git reset --soft HEAD^\nzsh: no matches found: HEAD^\n ✘ nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   master ●  git reset --soft HEAD\\^\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   master ●✚  gst\nOn branch master\nYour branch is behind 'origin/master' by 50 commits, and can be fast-forwarded.\n  (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n  (use \"git reset HEAD <file>...\" to unstage)\n\n\tmodified:   ../resources/vendor/quark-filters/.bower.json\n\tmodified:   ../resources/vendor/quark-filters/README.md\n\tmodified:   ../resources/vendor/quark-filters/dist/quark-filters.min.js\n\tmodified:   ../resources/vendor/quark-filters/dist/quark-filters.min.js.map\n\tmodified:   ../resources/vendor/quark-filters/src/quark-filters.js\n\tmodified:   js/videomonitor-page.js\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git checkout -- <file>...\" to discard changes in working directory)\n\n\tmodified:   ../cnn/services.js\n\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   master ●✚  gco MCI-515\nM\tcnn/services.js\nSwitched to branch 'MCI-515'\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   MCI-515 ●  gst\nOn branch MCI-515\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git checkout -- <file>...\" to discard changes in working directory)\n\n\tmodified:   ../cnn/services.js\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   MCI-515 ●  gst\nOn branch MCI-515\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git checkout -- <file>...\" to discard changes in working directory)\n\n\tmodified:   ../cnn/services.js\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   MCI-515 ●  gco master\nM\tcnn/services.js\nSwitched to branch 'master'\nYour branch is behind 'origin/master' by 50 commits, and can be fast-forwarded.\n  (use \"git pull\" to update your local branch)\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   master ●  gst\nOn branch master\nYour branch is behind 'origin/master' by 50 commits, and can be fast-forwarded.\n  (use \"git pull\" to update your local branch)\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git checkout -- <file>...\" to discard changes in working directory)\n\n\tmodified:   ../cnn/services.js\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n nhunt@nicks-mbp  ~/Turner/newstron_client/newstron/videoingest   master ●  gst\nOn branch master\nYour branch is behind 'origin/master' by 50 commits, and can be fast-forwarded.\n  (use \"git pull\" to update your local branch)\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git checkout -- <file>...\" to discard changes in working directory)\n\n\tmodified:   ../cnn/services.js\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")"},{"id":"342246","messageId":"CAJ-HmiZtHZ0qR9KdZ5mxzok18Ad6R8zLd3xwrvt+GQHu-qDrGQ@mail.gmail.com","threadId":"48090","inReplyTo":"CAJ-HmiZFpGbe_kLUFoOibMgc2dtf=n5VXb=ReZjN2wNsja1Lrw@mail.gmail.com","subject":"Re: Potential git bug","fromName":"Nick Hunt","fromEmail":"nhunt11@gmail.com","sentAt":"2018-03-19T20:14:31Z","receivedAt":"2018-03-19T20:14:43Z","isPatch":false,"sender":{"key":"nhunt11@gmail.com","avatar":null},"body":"oh, wait, switching branches didn't vaporize my changes, it auto-committed them.\nwhich is still weird and possibly a bug?\nNick Hunt\nnhunt11@gmail.com\n404-988-1845\n\n\nOn Mon, Mar 19, 2018 at 3:13 PM, Nick Hunt <nhunt11@gmail.com> wrote:\n> i committed my changes, then ran\n> git reset --soft HEAD^\n> at this point everything is fine\n> then i switched branches, and all of my changes vaporized into thin\n> air. uhhh, is this supposed to happen?\n>\n> anyway, thank god intellij saves my work for me as i go, so i didn't\n> have to re-write all my code.\n>\n> my bash/zsh commands are attached.\n>\n> thanks for the help! :)\n"},{"id":"342247","messageId":"20180319201644.GA25618@sigill.intra.peff.net","threadId":"48090","inReplyTo":"CAJ-HmiZtHZ0qR9KdZ5mxzok18Ad6R8zLd3xwrvt+GQHu-qDrGQ@mail.gmail.com","subject":"Re: Potential git bug","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2018-03-19T20:16:44Z","receivedAt":"2018-03-19T20:17:12Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Mar 19, 2018 at 04:14:31PM -0400, Nick Hunt wrote:\n\n> oh, wait, switching branches didn't vaporize my changes, it auto-committed them.\n> which is still weird and possibly a bug?\n\nAre you sure that the changes were not already present on the\nswitched-to branch?\n\n-Peff\n"}]}