| 2020-03-26 |
| → tiin57 joined | 00:03 |
| ← xelxebar left | 00:04 |
| → haasn` joined | 00:04 |
| → Dirak joined | 00:05 |
| → zanetti joined | 00:05 |
| → mat001 joined | 00:07 |
| ← xco left | 00:09 |
| → xelxebar joined | 00:09 |
| ← haasn` left | 00:10 |
| → PyDon joined | 00:12 |
|
PyDon
| hi | 00:12 |
| ← mat001 left | 00:13 |
| ← dartmouthed left | 00:15 |
|
nedbat
| PyDon: hey there | 00:15 |
|
PyDon
| hey nedbat, you are also everywhere :-D | 00:15 |
| ← omnireq left | 00:18 |
| → omnireq joined | 00:18 |
|
PyDon
| can anyone help me? Given the following example: https://nopaste.linux-dev.org/?1295383 | 00:20 |
|
| Why does $ git add link/file | 00:20 |
|
| fail with: fatal: pathspec 'link/orig' is beyond a symbolic link | 00:20 |
|
| but $ git add . | 00:20 |
|
| is fine? | 00:20 |
| → omnireq_ joined | 00:21 |
| → haasn` joined | 00:21 |
| → Wetmelon joined | 00:22 |
| ← dedowsdi left | 00:23 |
| ← Dirak left | 00:23 |
| ← omnireq left | 00:23 |
| → buckworst joined | 00:26 |
| ← tiin57 left | 00:29 |
| ← vdamewood left | 00:32 |
|
str
| rafasc, OK, if I git-filter-repo --path=myPath it will delete everything BUT myPath, which is OK, BUT, I want myPath to be the root folder of the repo | 00:32 |
|
| What am I missing? | 00:33 |
| → tiin57 joined | 00:33 |
|
rafasc
| str: you are missing the subdirectory filter: https://github.com/newren/git-filter-repo#solving-this-with-filter-repo | 00:34 |
| → roadie joined | 00:36 |
|
str
| rafasc, AWESOME! | 00:37 |
|
| rafasc, now, if I review the log in gitk, I see some blue-ish labels "replace/$hash" like here in this screenshot: https://i.imgur.com/2YiYUxJ.png | 00:38 |
|
| What are those? | 00:38 |
|
rafasc
| man git replace | 00:39 |
|
gitinfo
| the git-replace manpage is available at https://gitirc.eu/git-replace.html | 00:39 |
|
rafasc
| git has a mechanism for object replacement, that's probably a map that link each commit to their source commit. | 00:39 |
| ← PyDon left | 00:40 |
| ← roadie left | 00:41 |
| → PyDon joined | 00:42 |
|
str
| ... it's like a log | 00:42 |
|
| BUT I can get rid of them, right? | 00:42 |
|
| Or I can even create the new repo without them, right? | 00:42 |
| → mat001 joined | 00:43 |
|
rafasc
| see --replace-refs | 00:46 |
|
str
| rafasc, MAN! YOU ARE THE BEST! | 00:48 |
| ← mat001 left | 00:48 |
|
str
| Thank you a lot | 00:48 |
| → libertyprime joined | 00:50 |
| → jstimm joined | 00:52 |
| → dedowsdi joined | 00:52 |
| ← cdown left | 00:54 |
| → cdown joined | 00:55 |
| ← mescalinum left | 00:56 |
| ← str left | 00:57 |
| ← Brainium left | 00:59 |
| ← tiin57 left | 00:59 |
| ← omnireq_ left | 01:00 |
| ← _Warl0ck left | 01:00 |
| → mescalinum joined | 01:00 |
| ← dumb_moth left | 01:00 |
| zanetti → Zanetti | 01:01 |
| → omnireq_ joined | 01:01 |
| → _Warl0ck joined | 01:01 |
| Zanetti → zanetti | 01:02 |
| → tiin57 joined | 01:03 |
| → dumb_moth joined | 01:03 |
| ← zanetti left | 01:03 |
| ← zlogan left | 01:04 |
| → zanetti joined | 01:05 |
| ← cbreak left | 01:07 |
| ← jstimm left | 01:07 |
| → cbreak joined | 01:08 |
| ← NODE left | 01:08 |
| → NODE joined | 01:10 |
| → zlogan joined | 01:12 |
| → oriba joined | 01:18 |
| ← bitnoize left | 01:19 |
| ← cliluw left | 01:24 |
| ← is_null left | 01:27 |
| ← m0viefreak left | 01:27 |
| ← tiin57 left | 01:30 |
| → stenno joined | 01:30 |
| → roadie joined | 01:30 |
| ← ferdna left | 01:32 |
| → tiin57 joined | 01:33 |
| ← roadie left | 01:35 |
| → split_horizon joined | 01:38 |
| → tmz joined | 01:39 |
| → anderson joined | 01:41 |
| → bttf joined | 01:41 |
| → AppleGaming joined | 01:41 |
| → is_null joined | 01:43 |
| → Giant81 joined | 01:49 |
| ← foul_owl left | 01:50 |
| → foul_owl joined | 01:52 |
| ← PyDon left | 01:56 |
| ← g4570n left | 01:58 |
| ← rafasc left | 01:59 |
| ← tiin57 left | 01:59 |
| ← tafa2 left | 02:00 |
| → twb joined | 02:02 |
|
twb
| "git clone https://bitbucket.org/cowan/r7rs-wg1-infra/" ==> "remote: Mercurial (hg) is required to use this repository." | 02:03 |
|
| Is it saying I can still use git, I just need some kind of hg thing like git-svn? | 02:03 |
|
| Or is it saying "you have to use hg directly" | 02:03 |
| → tiin57 joined | 02:03 |
| ← stenno left | 02:03 |
|
twb
| There's a "mercurial-git" package to let hg talk to git servers, but I can't see a tool to let git talk to hg servers. | 02:04 |
|
| Ah, git-remote-hg | 02:05 |
| ← kupi left | 02:06 |
| ← zanetti left | 02:10 |
| → zanetti joined | 02:10 |
| ← F0rTex left | 02:10 |
| ← Es0teric left | 02:11 |
| → F0rTex joined | 02:11 |
| → cpplearner joined | 02:16 |
| ← smichel17 left | 02:27 |
| ← tiin57 left | 02:30 |
| ← Sasazuka left | 02:31 |
| → tiin57 joined | 02:33 |
| ← oriba left | 02:37 |
| ← navidr left | 02:50 |
| ← is_null left | 02:56 |
| ← tiin57 left | 02:59 |
| ← Narrat left | 03:00 |
| → is_null joined | 03:02 |
| → tiin57 joined | 03:03 |
| ← thiago left | 03:09 |
| → caterfxo joined | 03:09 |
| ← lagothrix left | 03:09 |
| → lagothrix joined | 03:09 |
| → Es0teric joined | 03:11 |
| ← caterfxo left | 03:18 |
| → Beam_Inn joined | 03:23 |
| ← bvdw left | 03:25 |
| → bvdw joined | 03:26 |
| ← Beam_Inn left | 03:28 |
| ← EdFletcher left | 03:29 |
| ← tiin57 left | 03:30 |
| → EdFletcher joined | 03:30 |
| → FH_thecat joined | 03:31 |
| ← libertyprime left | 03:32 |
| → tiin57 joined | 03:33 |
| → rzanetti joined | 03:34 |
| ← zanetti left | 03:34 |
| → Goplat joined | 03:37 |
| ← inkbottle left | 03:39 |
| ← Es0teric left | 03:42 |
| → libertyprime joined | 03:44 |
| → zebrag joined | 03:44 |
| → Es0teric joined | 03:45 |
| ← omnireq_ left | 03:46 |
| → omnireq_ joined | 03:49 |
| ← Cabanossi left | 03:50 |
| → waveclaw joined | 03:54 |
| → yitz joined | 03:56 |
| → Cabanossi joined | 03:57 |
| ← tiin57 left | 03:59 |
| → tiin57 joined | 04:03 |
| ← AppleGaming left | 04:04 |
| ← libertyprime left | 04:04 |
| ← ojdo left | 04:06 |
| → libertyprime joined | 04:06 |
| ← _0xDEADBEEF left | 04:08 |
| → _0xDEADBEEF joined | 04:08 |
| ← FH_thecat left | 04:13 |
| → ojdo joined | 04:13 |
| ← Khisanth left | 04:15 |
| ← Wetmelon left | 04:18 |
| ← omnireq_ left | 04:19 |
| ← vicfred left | 04:20 |
| → omnireq joined | 04:23 |
| → Khisanth joined | 04:29 |
| ← tiin57 left | 04:30 |
| → tiin57 joined | 04:32 |
| ← rzanetti left | 04:33 |
| ← duderonomy left | 04:33 |
| ← maxwilliamson left | 04:40 |
| → caterfxo joined | 04:40 |
| → maxwilliamson joined | 04:40 |
| → cruxeternus joined | 04:43 |
| ← dedowsdi left | 04:44 |
| → nickodd joined | 04:49 |
| ← wildlander_ left | 04:51 |
| → vicfred joined | 04:53 |
| → Industrial joined | 04:59 |
| ← tiin57 left | 04:59 |
| → Phylock joined | 05:00 |
| → pks_ joined | 05:02 |
| → dedowsdi joined | 05:03 |
| → tiin57 joined | 05:03 |
| ← pks left | 05:03 |
| pks_ → pks | 05:03 |
| ← clime left | 05:06 |
| ← caterfxo left | 05:08 |
| ← buckworst left | 05:10 |
| → xco joined | 05:13 |
| → caterfxo joined | 05:22 |
| ← dmc left | 05:22 |
| → DarthRadar joined | 05:23 |
| ← caterfxo left | 05:23 |
| → caterfxo joined | 05:24 |
| ← tiin57 left | 05:29 |
| → tiin57 joined | 05:33 |
| → sauvin joined | 05:35 |
| ← omnireq left | 05:38 |
| → omnireq joined | 05:38 |
| → g00s joined | 05:40 |
| ← Technodrome left | 05:42 |
| ← vicfred left | 05:48 |
| ← diverger left | 05:51 |
| ← causasui left | 05:54 |
| → diverger joined | 05:55 |
| → gschanuel joined | 05:58 |
| ← sidetrack left | 05:58 |
| ← tiin57 left | 06:00 |
| → tiin57 joined | 06:03 |
| → settermjd joined | 06:05 |
| ← Betal left | 06:09 |
| → Wetmelon joined | 06:11 |
| → markopasha joined | 06:13 |
| ← Industrial left | 06:15 |
| → nabil_ joined | 06:16 |
| ← nabil_ left | 06:16 |
| → nabil_ joined | 06:17 |
| ← Wetmelon left | 06:17 |
| ← nabil left | 06:18 |
|
markopasha
| So I've got two files in the project which I edit everytime after pull. I edit them due to my computer settings then I create a different branch and work on it. These file can get updated so I cant completely ignore them. What is the better way to deal with this | 06:20 |
| ← warthog9 left | 06:21 |
| → YuGiOhJCJ joined | 06:22 |
|
twb
| markopasha: split it into two files, one ignored, one edited? | 06:24 |
| ← gschanuel left | 06:24 |
| ← xco left | 06:25 |
| → gschanuel joined | 06:26 |
|
markopasha
| Would my changes be shown in history? Because one has couple of credentantials twb | 06:28 |
|
twb
| it sounds like you have file like ./config.php | 06:29 |
|
| and it contains myhostname = "supercoolserver.com" and database_password = "swordfish" | 06:29 |
| ← kjartan left | 06:29 |
| ← tiin57 left | 06:29 |
|
twb
| So like split that into config.php with the default settings (version controlled), and config.local.php (not version controlled) | 06:30 |
| → kjartan joined | 06:30 |
|
osse
| markopasha: !config | 06:30 |
|
gitinfo
| markopasha: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas | 06:30 |
| → warthog9 joined | 06:31 |
|
markopasha
| yea i have Gemfile and config/database.yml | 06:31 |
|
| twb, osse gitinfo thank you | 06:32 |
|
gitinfo
| markopasha: you're welcome, but please note that I'm a bot. I'm not programmed to care. | 06:32 |
|
markopasha
| hahah:D | 06:33 |
|
twb
| Also if your database and app run on the same server, use socket auth and not f*cking passwords | 06:33 |
| → tiin57 joined | 06:33 |
|
twb
| passwords are the worst | 06:33 |
|
markopasha
| it is as environmental variables | 06:34 |
|
| is that bad too | 06:35 |
|
twb
| that's just changing how you read the password | 06:35 |
|
| but you're still using password-based authentication | 06:35 |
|
markopasha
| twb, yea true. | 06:36 |
|
twb
| With socket auth, the database just goes "hey kernel, what unix user connected to me? Oh, it was avahi-daemon? OK, then I'll use my GRANT rules for avahi-daemon" | 06:36 |
| → karab44 joined | 06:36 |
| ← Goplat left | 06:37 |
| → _leb joined | 06:39 |
| → pandakekok9 joined | 06:39 |
| ← cbreak left | 06:40 |
| → cbreak joined | 06:41 |
| → Forlorn_ joined | 06:42 |
| ← warthog9 left | 06:43 |
| → warthog9 joined | 06:44 |
| → xco joined | 06:46 |
|
markopasha
| :D i see | 06:50 |
| ← _leb left | 06:50 |
| → leb joined | 06:52 |
| ← leb left | 06:52 |
| ← omnireq left | 06:53 |
| → omnireq joined | 06:54 |
| ← foul_owl left | 06:55 |
| → mat001 joined | 06:59 |
| ← tiin57 left | 06:59 |
| ← mat001 left | 06:59 |
| → mat001 joined | 07:00 |
| → tiin57 joined | 07:02 |
| → dmc joined | 07:04 |
| ← dmc left | 07:04 |
| → foul_owl joined | 07:09 |
| ← ephemera_ left | 07:17 |
| ← NightStrike left | 07:19 |
| ← Phylock left | 07:22 |
| ← g00s left | 07:22 |
| → ephemera_ joined | 07:23 |
| → Noti joined | 07:25 |
| → noodle joined | 07:26 |
| ← tiin57 left | 07:29 |
| → stitched_unicorn joined | 07:32 |
| → tiin57 joined | 07:33 |
| → funkatronixxx joined | 07:37 |
| → oxymoron93 joined | 07:46 |
| → Jackneill joined | 07:47 |
| → g00s joined | 07:48 |
| → loganlee joined | 07:55 |
| → feriman joined | 07:55 |
| → fstd_ joined | 07:55 |
|
loganlee
| https://git-scm.com/book/en/v2/Git-Branching-Rebasing hello on figure 47 it says, "If you run a git log when your history looks like this, you’ll see two commits that have the same author, date, and message, which will be confusing. " which two commits are those? | 07:55 |
| → Industrial joined | 07:56 |
| ← mat001 left | 07:56 |
|
loganlee
| is it C4' and C6? | 07:57 |
|
osse
| I would guess C4 and C4' | 07:57 |
| ← fstd left | 07:59 |
| fstd_ → fstd | 07:59 |
|
osse
| this was an overly complicated explanation in my opinion' | 07:59 |
| ← tiin57 left | 07:59 |
|
osse
| but i am fairly confident it's C4 and C4' | 08:00 |
| → dviola joined | 08:00 |
|
osse
| because it is the guy who merged and pushed who is doing the rewriting so that C4 appears after C5 instead of parallel to it | 08:01 |
| → Naptra joined | 08:01 |
| → tiin57 joined | 08:03 |
| ← funkatronixxx left | 08:04 |
| → ilogger2 joined | 08:06 |
| → kent\n joined | 08:06 |
| → Nizumzen joined | 08:06 |
| → altendky joined | 08:06 |
| → mgsk joined | 08:06 |
| → Soni joined | 08:06 |
| → miklcct joined | 08:06 |
| → de-vri-es joined | 08:06 |
| → Tk55 joined | 08:06 |
| → T4cC0re joined | 08:07 |
| → ncdulo joined | 08:07 |
| → uebera|| joined | 08:07 |
| → dysfigured joined | 08:07 |
| → orgg joined | 08:07 |
| → kashike joined | 08:07 |
| → fructose joined | 08:07 |
| → nikivi joined | 08:07 |
| → hexnewbie joined | 08:07 |
| → NitrousPG joined | 08:07 |
| → FFY00 joined | 08:07 |
| → Habbie joined | 08:07 |
| → shabius joined | 08:07 |
| → TomyLobo joined | 08:07 |
| → POQDavid joined | 08:08 |
| → n-st joined | 08:08 |
| → iloop joined | 08:08 |
| → NODE joined | 08:08 |
| → Kamilion joined | 08:08 |
| → causasui joined | 08:08 |
| → Dirak joined | 08:09 |
| → net_wayfarer joined | 08:09 |
|
loganlee
| osse, i agree that it is C4 and C4' | 08:09 |
| → saidelike joined | 08:10 |
| → arooni joined | 08:11 |
| → dmc joined | 08:15 |
| → Celelibi joined | 08:16 |
| → HumanGeek joined | 08:19 |
|
loganlee
| when i was out of caffeine and i read a sentence it made no sense to me. then i just drank coffee mixed in cold milk, and now i read again and it makes sense now | 08:22 |
|
cpplearner
| I'm trying to rebase my forked 'develop' branch to the original 'devleop' | 08:24 |
|
| branch, but thers' a conflict. | 08:25 |
|
| So, I'm trying to add another branch, and pull updates there, and rebase mine to this branch. | 08:25 |
|
| Does it sound good? | 08:25 |
|
| Or, is there any better way? | 08:25 |
|
osse
| You will get conflicts either way | 08:26 |
|
cpplearner
| Oh, yeah. Sorry. | 08:26 |
|
osse
| unless you mean you want to rebase your branch on something other than develop | 08:26 |
|
| say, master or stable or whatever | 08:26 |
|
cpplearner
| I want to first apply the original repo's updates, and rebase mine to this one, and fianlly make a PR. | 08:28 |
|
| As you said, of course I should resolve the conflict. | 08:28 |
|
| But, I'm not sure it's the desirable way. | 08:28 |
|
| Maybe, another good solution? | 08:28 |
|
osse
| without knowing more specifics it's hard to say | 08:29 |
|
| Why don't you think that's desirable? | 08:29 |
|
cpplearner
| Hmm, I might break something, so I want to be careful. ='( | 08:30 |
|
osse
| how can you break anything? | 08:31 |
|
cpplearner
| Uhh, I'm a total newbie, so I'm just saying. But, can I ask you one more quesiton? | 08:33 |
| → baako joined | 08:33 |
|
cpplearner
| Is it possible to pull som specific branch from the original repo to my local branch whose name is different from the former? | 08:33 |
| → tiin57 joined | 08:33 |
| → dedowsdi joined | 08:34 |
| → funkatronixxx joined | 08:37 |
| → wootehfoot joined | 08:37 |
| ← funkatronixxx left | 08:39 |
|
osse
| yes | 08:39 |
| → ryzokuken joined | 08:40 |
| → TomyWork joined | 08:41 |
| → mobidrop joined | 08:43 |
|
osse
| git pull origin branchname | 08:43 |
|
cpplearner
| osse: Thanks you! I got it working by git pull origin source-branch:destination-branch! =) | 08:44 |
| → chele joined | 08:45 |
| → clime joined | 08:46 |
| → Borkr joined | 08:50 |
| → makaveli7 joined | 08:51 |
| ← TomyLobo left | 08:54 |
| → shored joined | 08:57 |
| ← tiin57 left | 09:00 |
| → tiin57 joined | 09:03 |
| ← nikivi left | 09:14 |
| → nikivi joined | 09:14 |
| → sgn joined | 09:18 |
| → funkatronixxx joined | 09:24 |
| → bvdw joined | 09:25 |
| → fitzgerald1337 joined | 09:29 |
| ← tiin57 left | 09:29 |
| ← funkatronixxx left | 09:31 |
| → tiin57 joined | 09:33 |
| → bitnoize joined | 09:38 |
| → bdeshi joined | 09:42 |
| → funkatronixxx joined | 09:45 |
| ← funkatronixxx left | 09:46 |
| → maczor joined | 09:48 |
|
maczor
| Hi I've run into an issue when checking out a branch that contains a submodule with update=none while submodule.recurse is set to true that I was hoping to get some opinions on. | 09:51 |
|
| When I do this I get a fatal error as git detects that there is no submodule repository present (due to the update=none) however because of the recurse=true it tries to checkout the referenced commit in this submodule. | 09:52 |
|
| With GIT_TRACE=1 I get this output: | 09:53 |
|
| 19:20:18.129343 run-command.c:663 trace: run_command: cd | 09:53 |
|
| no-update-submodule; unset GIT_PREFIX; GIT_DIR=.git git | 09:53 |
|
| --super-prefix= no-update-submodule/ read-tree -u --reset | 09:53 |
|
| 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | 09:53 |
|
| fatal: not a git repository: ../.git/modules/no-update-submodule | 09:53 |
|
| fatal: could not reset submodule index | 09:53 |
|
| It's possible to workaround this issue by deiniting the submodules before checking out the branch. However this is non-ideal | 09:55 |
| → dartmouthed joined | 09:55 |
|
maczor
| However this seems like a bug? | 09:56 |
| → Phylock joined | 09:57 |
| → scarcry joined | 09:59 |
| ← tiin57 left | 09:59 |
| → tiin57 joined | 10:03 |
| ← clime left | 10:03 |
| → clime joined | 10:03 |
| → funkatronixxx joined | 10:03 |
| ← funkatronixxx left | 10:07 |
| → funkatronixxx joined | 10:11 |
| → fassl joined | 10:11 |
| → libertyprime joined | 10:17 |
| ← funkatronixxx left | 10:18 |
| ← causasui left | 10:19 |
| → giorgian joined | 10:22 |
| ← Dirak left | 10:23 |
| → albel727 joined | 10:23 |
| → raven-au_ joined | 10:28 |
|
osse
| maczor: if there's a submodule don't you need to run submodule init regardless of whether update=none or not? | 10:28 |
| ← tiin57 left | 10:29 |
|
maczor
| osse: the full reproduction steps are: | 10:31 |
|
| The reproduction steps are to: | 10:31 |
|
| - Clone the repo | 10:31 |
|
| - Checkout a branch containing submodules that are set with | 10:31 |
|
| update=none (git checkout branch-name) | 10:31 |
|
| - Update and init submodules (git submodule update --init) | 10:31 |
|
| - Attempt to switch to a different branch (git checkout other-branch) | 10:31 |
|
| Uploaded file: https://uploads.kiwiirc.com/files/1ef06a0d080695398ece32fdd5837ed3/pasted.txt | 10:31 |
|
| If I do this when submodule.recurse is set to true, git tries to switch to a specific commit for that submodule despite it not being there and throws the fatal error. | 10:33 |
|
giorgian
| Hi. If I do `git stash -u` where there are only untracked files, git stash show gives no output, even with -v. Is this a bug? | 10:33 |
| → tiin57 joined | 10:33 |
|
osse
| maczor: and this only happens if update=none? | 10:34 |
|
| sounds like it should happen always | 10:34 |
|
maczor
| osse: it only happens when update=none and submodules.recurse=true. There are no issues for submodules without update=none. I also tried without submodules.recurse=false and I don't see the fatal error | 10:35 |
|
osse
| I don't know enough about submodule config to be sure, but it sounds like a bug | 10:36 |
| → antoine joined | 10:38 |
| ← POQDavid left | 10:46 |
| → POQDavid joined | 10:47 |
| → DelPhyinf joined | 10:47 |
| ← makaveli7 left | 10:48 |
| → ghost43 joined | 10:48 |
| → makaveli7 joined | 10:53 |
| ← Habbie left | 10:53 |
| → Habbie joined | 10:55 |
| → PacKetSlayer joined | 10:56 |
| ← NODE left | 10:56 |
| ← fitzgerald1337 left | 10:58 |
|
maczor
| Thanks osse. Me too. | 10:59 |
| → NODE joined | 10:59 |
| ← tiin57 left | 10:59 |
| → staafl_r19 joined | 11:02 |
| → tiin57 joined | 11:03 |
| ← ghost43 left | 11:04 |
| → Brainium joined | 11:04 |
| ← baako left | 11:04 |
| → Hello71 joined | 11:05 |
| → opal joined | 11:06 |
| → andreas31 joined | 11:07 |
| → chiastre joined | 11:07 |
| → xelxebar joined | 11:07 |
| → gxt joined | 11:08 |
| → tryte joined | 11:10 |
| ← maczor left | 11:10 |
| ← POQDavid left | 11:17 |
| → POQDavid joined | 11:17 |
| → iNs joined | 11:20 |
| → ghost43 joined | 11:20 |
| → justanotheruser joined | 11:23 |
| ← nikivi left | 11:23 |
| → nikivi joined | 11:23 |
| ← ghost43 left | 11:25 |
| ← bitnoize left | 11:26 |
| → ghost43 joined | 11:26 |
| → bitnoize joined | 11:27 |
| ← giorgian left | 11:28 |
| ← tiin57 left | 11:29 |
| → funkatronixxx joined | 11:31 |
| → thiago joined | 11:32 |
| → tiin57 joined | 11:33 |
| → def_jam joined | 11:35 |
| → eblip joined | 11:35 |
| ← funkatronixxx left | 11:36 |
| → stenno joined | 11:38 |
| → mescalinum joined | 11:38 |
| ← dedowsdi left | 11:38 |
| → rosco_y joined | 11:40 |
| → dedowsdi joined | 11:41 |
|
rosco_y
| I'm currently in my master, and have made a number of changes and realize that the changes would have fit nicely in a new branch. Is it safe for me to create a new branch at this time, and check my changes into the new branch? | 11:41 |
|
pandem
| yes | 11:42 |
| ← libertyprime left | 11:42 |
|
jast
| I do that all the time | 11:42 |
|
rosco_y
| thank you pandem :) | 11:42 |
|
jast
| though I often forget to create and switch to the new branch before committing, so then I have the extra step of cleaning up master | 11:43 |
| ← chiastre left | 11:44 |
| → chiastre joined | 11:44 |
| → _0xDEADBEEF joined | 11:45 |
| ← wootehfoot left | 11:45 |
| ← iNs left | 11:45 |
| → Kaivo joined | 11:45 |
| → iNs joined | 11:46 |
|
scorphus
| @rosco_y and @jast, I have a handy git command for exactly that: https://github.com/scorphus/scorphiles/blob/master/bin/rtomayko/git-cut-branch | 11:49 |
|
jast
| cool... I think it can be simplified a lot, though :) | 11:50 |
| → nabil__ joined | 11:51 |
|
jast
| the bare essentials of it is this: git branch <new name>; git reset --hard '@{u}'; git checkout <new name> | 11:51 |
|
| (as always, --hard is a potentially destructive operation, so don't use this unless you know what you're doing :)) | 11:52 |
| → hyperair joined | 11:52 |
| ← nikivi left | 11:56 |
| → nikivi joined | 11:56 |
|
jast
| a safer alternative that avoids destroying uncommitted changes: old=$(git symbolic-ref --short HEAD); git checkout -b $new; git push -f . $old@{u}:$old | 11:57 |
|
| add some error handling and sanity checks and you end up with a ~15 line script | 11:57 |
| → Technodrome joined | 11:58 |
| → buckworst joined | 11:59 |
| ← tiin57 left | 11:59 |
|
jast
| for a friendlier reflog entry on the source branch: old="$(git symbolic-ref HEAD)"; git checkout -b "$new"; git update-ref -m "cut branch $new" "$old" "${old#refs/heads/}@{u}" | 12:01 |
| ← ghost43 left | 12:02 |
| → tiin57 joined | 12:03 |
| → ghost43 joined | 12:03 |
| ← dedowsdi left | 12:03 |
| ← POQDavid left | 12:04 |
| → POQDavid joined | 12:04 |
| → aw1 joined | 12:05 |
|
jast
| some more hints: | 12:05 |
|
| to unambiguously abbreviate an object ID: git rev-parse --abrev-ref <sha1> | 12:06 |
| → CodeSlingerPaul joined | 12:06 |
|
jast
| to strip the refs prefix from a shell variable: current="${ref#refs/heads/}" (avoids an echo/sed pipe) | 12:07 |
| ← thiago left | 12:09 |
| → Lucas_Gray joined | 12:09 |
| ← mescalinum left | 12:09 |
| → mowcat joined | 12:11 |
|
jast
| to look up a branch's upstream: git for-each-ref --format='%(upstream)' refs/heads/foo | 12:11 |
| → mescalinum joined | 12:12 |
|
jast
| that's all I can think of for now | 12:12 |
| → ChrisLane joined | 12:14 |
| → thiago joined | 12:21 |
| ← ghost43 left | 12:22 |
| ← nikivi left | 12:22 |
| → ghost43 joined | 12:22 |
| → nikivi joined | 12:22 |
| → snakeice joined | 12:22 |
| ← NODE left | 12:23 |
| ← ChrisLane left | 12:24 |
| → NODE joined | 12:25 |
| → ChrisLane joined | 12:25 |
| ← Lucas_Gray left | 12:26 |
| ← NODE left | 12:26 |
| → NODE joined | 12:28 |
| → Maxattax joined | 12:29 |
| → graingert joined | 12:29 |
| ← tiin57 left | 12:29 |
| ← NODE left | 12:29 |
|
graingert
| how does $XDG_CONFIG_HOME/git/ignore work on windows? https://git-scm.com/docs/gitignore | 12:30 |
| → NODE joined | 12:31 |
|
jast
| from the manpage: If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore is used instead. | 12:32 |
| → tiin57 joined | 12:32 |
|
graingert
| jast: does windows have $HOME? | 12:33 |
|
osse
| graingert: echo $HOME in Git Bash | 12:34 |
| → Betal joined | 12:34 |
| ← buckworst left | 12:34 |
|
jast
| seems to use Windows's $USERPROFILE | 12:34 |
|
graingert
| you mean %USERPROFILE% | 12:35 |
|
jast
| that's just syntax differences depending on which shell you use | 12:35 |
|
graingert
| so if I put ignore lines in here they will be ignored globally? %USERPROFILE%\.config\git\ignore | 12:36 |
|
jast
| well, it seems likely :) | 12:36 |
| → AppleGaming joined | 12:37 |
|
osse
| ttps://github.com/git/git/blob/2f268890c2cd2f115424936bbee27f8269080e5e/compat/mingw.c#L2524-L2546 | 12:39 |
|
| goddammit | 12:39 |
|
| https://github.com/git/git/blob/2f268890c2cd2f115424936bbee27f8269080e5e/compat/mingw.c#L2524-L2546 | 12:39 |
|
| I wonder why this code is in git itself and not the git-for-windows repo | 12:39 |
|
jast
| hysterical raisins I bet :) | 12:42 |
|
_ikke_
| yum | 12:43 |
|
jast
| Welcome to #git, home of the best breakfast foods | 12:46 |
| → Lucas_Gray joined | 12:46 |
| ← _0xDEADBEEF left | 12:48 |
| ← andreas31 left | 12:50 |
| → libertyprime joined | 12:52 |
| → andreas31 joined | 12:53 |
| → blowry joined | 12:54 |
| → jayr joined | 12:57 |
| → maxwilliamson joined | 12:57 |
| ← tiin57 left | 12:59 |
| → mauz555 joined | 13:01 |
| ← mauz555 left | 13:01 |
| → mauz555 joined | 13:02 |
| → tiin57 joined | 13:03 |
| → crose joined | 13:04 |
| → wootehfoot joined | 13:05 |
| ← mescalinum left | 13:08 |
| → mescalinum joined | 13:08 |
| ← mauz555 left | 13:09 |
| → mauz555 joined | 13:10 |
| → cdown_ joined | 13:10 |
| → cyberpear joined | 13:12 |
| cdown_ → cdown | 13:13 |
| → silverwhitefish joined | 13:14 |
| ← POQDavid left | 13:25 |
| → POQDavid joined | 13:25 |
| → irrgit joined | 13:26 |
| ← gxt left | 13:26 |
| → gxt joined | 13:27 |
| ← tiin57 left | 13:30 |
| ← POQDavid left | 13:31 |
| → POQDavid joined | 13:32 |
| → mat001 joined | 13:32 |
| → oriba joined | 13:32 |
| → tiin57 joined | 13:33 |
| ← POQDavid left | 13:40 |
| → POQDavid joined | 13:41 |
| → lucasb joined | 13:42 |
| → _0xDEADBEEF joined | 13:43 |
| → duderonomy joined | 13:44 |
| ← libertyprime left | 13:46 |
| → g4570n joined | 13:47 |
| ← nikivi left | 13:49 |
| → nikivi joined | 13:49 |
| ← bvdw left | 13:50 |
| → bvdw joined | 13:51 |
| → Fernando-Basso[m joined | 13:53 |
|
Fernando-Basso[m
| In an Ubuntu system, ‘git diff -R’ display whitespace changes. On another computer running Arch Linux, ‘git diff -W’ (not ‘-R’) displays whitespace changes. Reading the help, I couldn't see any thing that would hint that either ‘-R’ or ‘-W’ would display whitespace changes. | 13:53 |
|
_ikke_
| diff -R is reverse diff | 13:55 |
|
Fernando-Basso[m
| -R: Swap two inputs; that is, show differences from index or on-disk file to tree contents. | 13:55 |
|
| -W, --function-context: Show whole surrounding functions of changes. | 13:55 |
|
| From git diff --help | 13:55 |
|
| “Show whole surrounding functions of changes.” <-- what does that mean? | 13:56 |
| → Wetmelon joined | 13:56 |
| ← thiago left | 13:56 |
|
_ikke_
| It means that it tries to show the complete function, not just 3 lines before and after | 13:56 |
|
Fernando-Basso[m
| yeah, but what does it have to do with visually displaying whitespace changes? What does “function” mean here? | 13:57 |
| ← mowcat left | 13:57 |
|
_ikke_
| it should not | 13:57 |
|
| (have an influence) | 13:58 |
| → pupsikov joined | 13:59 |
| ← tiin57 left | 13:59 |
| → tiin57 joined | 14:03 |
| → thiago joined | 14:04 |
| ← POQDavid left | 14:11 |
| → POQDavid joined | 14:12 |
| ← Lucas_Gray left | 14:13 |
| → scde joined | 14:17 |
| → Guy1524 joined | 14:18 |
| ← chele left | 14:21 |
| → nickodd joined | 14:24 |
| → nabil_ joined | 14:27 |
| → akem_ joined | 14:27 |
| → katie_- joined | 14:29 |
| → chele joined | 14:29 |
| → Aaeriele joined | 14:29 |
| ← tiin57 left | 14:29 |
| → mooasaurus joined | 14:29 |
| → diverger joined | 14:30 |
| ← nabil__ left | 14:30 |
| ← Guy1524 left | 14:30 |
| → doug16k joined | 14:30 |
| → cjohnson joined | 14:30 |
| → berndj joined | 14:30 |
| → luis joined | 14:31 |
| → th_ joined | 14:31 |
| → timewalker joined | 14:31 |
| → jetchisel joined | 14:31 |
| → sjohnson joined | 14:32 |
| ← mat001 left | 14:32 |
| → mat001_ joined | 14:32 |
| → sbeyer joined | 14:32 |
| → fitzgerald1337 joined | 14:33 |
| → tiin57 joined | 14:33 |
| → fahadash joined | 14:33 |
| → Dougie187 joined | 14:33 |
| → ExeciN joined | 14:34 |
| ← _0xDEADBEEF left | 14:37 |
| → cfoch joined | 14:39 |
| → ojdo joined | 14:40 |
|
jayr
| Fernando-Basso[m: are the git-configs different on the two systems? | 14:40 |
| → rustyshackleford joined | 14:40 |
| → Kobaz joined | 14:43 |
|
Kobaz
| is there a way to have fully automatic remote tracking branches, like subversion nested repos sort of thing | 14:43 |
|
| ie: when you git clone, the whole thing comes down | 14:43 |
|
osse
| when you clone the whole thing does come down | 14:44 |
|
| all the things you see when you run git branch -r are in fact local | 14:44 |
|
| however, updating them aftewards isn't automatic. git fetch does that. | 14:45 |
|
Kobaz
| it's not a branch in the same repo, it's another repo | 14:45 |
|
| like nested repos | 14:45 |
|
| that's what i meant actually | 14:45 |
|
| i kind of set it up a while ago but i don't think it's quite right | 14:46 |
|
| it involved a lot of messy merging | 14:46 |
|
| ah submodules | 14:46 |
| → rhinojunior joined | 14:46 |
| → ribasushi joined | 14:46 |
|
Kobaz
| and subtree merging | 14:47 |
|
| so here's the situation... i want to split code from updates... so we have an update/deploy system that tracks changes pushed to each customer, and i don't think that belongs in the main repo | 14:48 |
|
| so someone could choose to check out only the code, and not the built-updates based on the code | 14:48 |
|
| because i have 500 megs of deployment files right now and there's only a few dozen releases tracked right now | 14:49 |
| ← jayr left | 14:50 |
|
Kobaz
| oooooh, i have a better idea... put the deployment on nfs and don't git that. Everyone would use the same deployment mount so we keep versioning in sync | 14:50 |
|
| deployment is heavily human-coordinated so there's no locking issues or that sort of thing | 14:51 |
|
| osse: thanks, you're a genius! | 14:51 |
| ← makaveli7 left | 14:52 |
| ← nikivi left | 14:52 |
| → nikivi joined | 14:52 |
| → sidetrack joined | 14:55 |
|
osse
| i find that hard to believe | 14:55 |
| ← NODE left | 14:56 |
| → libertyprime joined | 14:58 |
| → NODE joined | 14:58 |
| ← tiin57 left | 14:59 |
| ← sidetrack left | 14:59 |
| → tiin57 joined | 15:03 |
| ← thiago left | 15:04 |
| → thiago joined | 15:04 |
| → dhollinger joined | 15:07 |
| ← mat001_ left | 15:09 |
| → yonder joined | 15:09 |
| → xcm joined | 15:10 |
| → mat001 joined | 15:11 |
| ← nikivi left | 15:11 |
| → nikivi joined | 15:12 |
| → R2robot joined | 15:17 |
| ← libertyprime left | 15:20 |
| → paul424 joined | 15:20 |
| → roadie joined | 15:22 |
| → libertyprime joined | 15:26 |
| ← scde left | 15:26 |
| → makaveli7 joined | 15:27 |
| → mowcat joined | 15:27 |
| ← tiin57 left | 15:29 |
| ← POQDavid left | 15:32 |
| → POQDavid joined | 15:33 |
| → tiin57 joined | 15:33 |
| → vdl joined | 15:35 |
| → nuala joined | 15:36 |
| → causasui joined | 15:38 |
|
Kobaz
| osse: hah, i solve half my problems just talking through them to my dog | 15:39 |
| ← justanotheruser left | 15:39 |
|
osse
| dog, eh | 15:40 |
|
Kobaz
| he helps me code | 15:40 |
|
osse
| i guess it's like a rubber dock, except it's got four legs, no wings, and is made of flesh | 15:40 |
|
| *duck | 15:40 |
| ← POQDavid left | 15:44 |
| → POQDavid joined | 15:44 |
| ← hexnewbie left | 15:46 |
| → hexnewbie joined | 15:46 |
| ← nikivi left | 15:49 |
| → nikivi joined | 15:49 |
| ← mowcat left | 15:50 |
|
parsnip
| was the solution a frisbee? | 15:54 |
| ← mescalinum left | 15:55 |
| → justanotheruser joined | 15:55 |
| ← ghost43 left | 15:55 |
| ← thiago left | 15:55 |
| → ghost43 joined | 15:55 |
| → thiago joined | 15:56 |
|
Kobaz
| yes | 15:57 |
| → NightStrike joined | 15:57 |
| ← xcm left | 15:59 |
| ← tiin57 left | 15:59 |
| → xcm joined | 16:00 |
| → tiin57 joined | 16:03 |
| ← mobidrop left | 16:07 |
| → syr joined | 16:10 |
| ← opal left | 16:12 |
| ← nuala left | 16:12 |
| ← ghost43 left | 16:15 |
| → ghost43 joined | 16:16 |
| ← HumanGeek left | 16:19 |
| → HumanGeek joined | 16:20 |
| ← chele left | 16:28 |
| ← tiin57 left | 16:29 |
| → feriman joined | 16:32 |
| → tiin57 joined | 16:33 |
| → multiproc joined | 16:36 |
| → tonyj joined | 16:37 |
| ← thiago left | 16:38 |
| → eb0t joined | 16:40 |
| ← eblip left | 16:40 |
| → eb0t_ joined | 16:41 |
| ← def_jam left | 16:41 |
| → cek joined | 16:46 |
| → thiago joined | 16:49 |
| → troulouliou_div2 joined | 16:54 |
| → faceface_ joined | 16:59 |
| ← tiin57 left | 16:59 |
|
faceface_
| this may be dumb, but my server is running on git controlled files, I want to ff a different branch, and then rebase my current branch on top of that | 17:00 |
|
| git branch # REL1_33 / * REL1_33-gero | 17:00 |
| ← troulouliou_div2 left | 17:01 |
|
faceface_
| I want to ff REL1_33 because it's behind origin, then rebase REL1_33-gero on REL1_33 without switching to REL1_33... impossible? | 17:01 |
| → tiin57 joined | 17:03 |
| → axisys joined | 17:08 |
| ← cdown left | 17:08 |
| → g00s joined | 17:09 |
| ← andreas31 left | 17:10 |
| → caterfxo joined | 17:11 |
| → mingdao joined | 17:14 |
| → troulouliou_div2 joined | 17:14 |
| → andreas31 joined | 17:15 |
| → pinkisntwell joined | 17:16 |
|
pinkisntwell
| Sometimes when doing merges on yaml files I get conflicts even though what happened is someone added a bunch of lines, I added another bunch of lines but those two sets of lines have common subsets. Git thinks that those common subsets means they are somehow related, even though they are not. | 17:17 |
|
| How do I get git to just put one bunch above the other and move on? | 17:17 |
| → tango_ joined | 17:19 |
| ← libertyprime left | 17:21 |
| → karoshi joined | 17:23 |
| → karab44 joined | 17:23 |
| → scde joined | 17:25 |
| ← karab44 left | 17:25 |
| → rafasc joined | 17:27 |
| ← tiin57 left | 17:29 |
| → tiin57 joined | 17:33 |
| ← thiago left | 17:34 |
| → thiago joined | 17:35 |
|
celphi
| How do i remove all unmerged files | 17:36 |
| ← oriba left | 17:42 |
| → fflam joined | 17:42 |
| ← nikivi left | 17:45 |
| → nikivi joined | 17:45 |
| → omnireq joined | 17:48 |
| ← thiago left | 17:48 |
| → thiago joined | 17:49 |
|
Fernando-Basso[m
| jayr: Besides different git versions on ubuntu and arch linux, nothing else was explicitly changed than the defaults, which I can't check right now. | 17:50 |
| ← mauz555 left | 17:51 |
| ← nikivi left | 17:58 |
| → nikivi joined | 17:59 |
| ← tiin57 left | 17:59 |
| → Jackneill joined | 18:01 |
| ← nikivi left | 18:02 |
| → tiin57 joined | 18:02 |
| → nikivi joined | 18:02 |
| → mescalinum joined | 18:03 |
| → meejah joined | 18:04 |
| ← nickodd left | 18:07 |
| ← nikivi left | 18:08 |
| → nikivi joined | 18:08 |
| → Giant81 joined | 18:08 |
| → diogenese joined | 18:09 |
| ← TomyWork left | 18:09 |
| ← omnireq left | 18:10 |
| → omnireq_ joined | 18:10 |
| → funkatronixxx joined | 18:10 |
| → xco joined | 18:11 |
| ← troulouliou_div2 left | 18:11 |
|
meejah
| celphi: what was your git question from #python? | 18:12 |
| ← tango_ left | 18:14 |
| → tango_ joined | 18:15 |
| → vicfred joined | 18:16 |
| → Jck_true joined | 18:16 |
| ← multiproc left | 18:17 |
| ← nikivi left | 18:23 |
| → nikivi joined | 18:24 |
| → m0viefreak joined | 18:24 |
| ← scde left | 18:27 |
| ← tiin57 left | 18:29 |
| ← omnireq_ left | 18:31 |
| → omnireq_ joined | 18:31 |
| → tiin57 joined | 18:33 |
| → shush joined | 18:42 |
|
shush
| Hello, so I fucked up on something. I created a copy of a remote branch locally, merged (with fast-forward), then pushed. | 18:43 |
|
| I need to to undo that | 18:43 |
| → jfindlay joined | 18:43 |
|
jfindlay
| another developer has a branch with a submodule update, but that submodule update is not part of any commit on that branch. It seems to be treated in a floating unstaged state attached to the branch head. He pushed the branch to the remote and I fetched it from the remote and see the same behavior | 18:46 |
| ← silverwhitefish left | 18:46 |
|
jfindlay
| checking out the branch results in an unstaged change to the submodule hash | 18:46 |
|
| if I `git submodule update --init`, the submodule update is gone, but git thinks there is no difference between the local and remote copies of the branch | 18:47 |
| → silverwhitefish joined | 18:47 |
| → cliluw joined | 18:49 |
| ← cliluw left | 18:49 |
| → cliluw joined | 18:49 |
|
EdFletcher
| shush: you can do that with `reset`, but since you've pushed already you must force-push the `reset`ed remote branch now | 18:51 |
|
shush
| How do I know which commit the previous one is? | 18:51 |
| ← omnireq_ left | 18:52 |
| → omnireq_ joined | 18:52 |
| ← mescalinum left | 18:52 |
|
osse
| git reflog branchname | 18:53 |
|
| or git reflog origin/branchname since that's the thing you need to push --forcev | 18:53 |
| ← paul424 left | 18:55 |
|
jfindlay
| so the question is, where is the submodule update being stored if not in a commit? | 18:55 |
|
osse
| jfindlay: nowhere. it's stored in commits | 18:56 |
|
jfindlay
| it is not in any commit | 18:56 |
| ← cliluw left | 18:56 |
|
osse
| jfindlay: when you checkout a different branch submodules aren't automatically updated | 18:56 |
|
jfindlay
| it appears only as an unstaged change when you checkout the branch | 18:56 |
|
osse
| exactly | 18:56 |
|
| because the submodule is still in its old state (before the checkout) | 18:57 |
| → paul424 joined | 18:57 |
|
osse
| so you need to run git submodule update after checkout | 18:57 |
| → cliluw joined | 18:59 |
|
jfindlay
| so the submodule is holding onto the state from the last time it was updated, and the only time there is a discrepancy is because you switch between branches with different submodule states? | 18:59 |
| ← tiin57 left | 18:59 |
|
jfindlay
| assuming you don't have some kind of hook to auto update submodules on branch change | 18:59 |
|
osse
| there can also be a discrepancy if you go in there and make changes yourself | 18:59 |
|
jfindlay
| right | 18:59 |
|
osse
| but yes, that's right | 19:00 |
|
| there is the possibility of a post-checkout hook in which you can run 'git submodule update' | 19:00 |
|
| i'm not sure why that's not just the default | 19:00 |
|
jfindlay
| so how do I update the remote branch? It is in pull request and shows the submodule hash change | 19:01 |
|
osse
| push, I guess? | 19:01 |
| → tiin57 joined | 19:03 |
| ← paul424 left | 19:03 |
| ← duderonomy left | 19:04 |
|
jfindlay
| if I checkout the branch locally and then `git submodule update ; git push origin the_branch`, I get `Everything up-to-date` | 19:04 |
|
osse
| then the remote branch is up to date | 19:04 |
| → mescalinum joined | 19:04 |
|
osse
| you have to clarify what you want | 19:04 |
| → duderonomy joined | 19:05 |
| → Dirak joined | 19:12 |
|
jfindlay
| so the branch is in pull request on the remote. The submodule change appears in the pull request for a different reason: the branch and the target branch have different submodule hashes | 19:12 |
|
| thanks for the help | 19:13 |
| → aw1_ joined | 19:13 |
|
osse
| ne nada | 19:13 |
|
| sounds like things are as they should be | 19:14 |
|
jfindlay
| yes | 19:14 |
| → Apple joined | 19:14 |
| ← aw1 left | 19:14 |
| → Narrat joined | 19:15 |
| Apple → Guest38430 | 19:15 |
| ← AppleGaming left | 19:16 |
| → Noti joined | 19:19 |
| → multiproc joined | 19:20 |
| ← funkatronixxx left | 19:21 |
| → xSke joined | 19:25 |
| ← aw1_ left | 19:25 |
| ← tiin57 left | 19:29 |
| → funkatronixxx joined | 19:30 |
| → Codaraxis joined | 19:33 |
| → tiin57 joined | 19:33 |
| → sidetrack joined | 19:33 |
| → qgTG joined | 19:33 |
| → g00s_ joined | 19:36 |
| ← g00s left | 19:39 |
| ← shush left | 19:43 |
| → manj-gnome joined | 19:49 |
| ← bvdw left | 19:50 |
| → bvdw joined | 19:51 |
| → smichel17 joined | 19:52 |
| ← fahadash left | 19:53 |
| → troulouliou_dev joined | 19:54 |
| → dre_ joined | 19:55 |
| → chandoo joined | 19:57 |
| → midnight joined | 19:59 |
| ← tiin57 left | 19:59 |
| → tiin57 joined | 20:03 |
| ← Borkr left | 20:07 |
| ← cliluw left | 20:10 |
| → cliluw joined | 20:10 |
| → cdown joined | 20:11 |
| ← multiproc left | 20:12 |
| → Sasazuka joined | 20:13 |
| ← cdown left | 20:18 |
| → shush joined | 20:19 |
| ← shush left | 20:19 |
| → shush joined | 20:19 |
|
shush
| osse: I did the reflog command, and I see something like this:... | 20:20 |
|
| aebdff80c accolades-redesign-components@{1}: branch: Created from HEAD | 20:21 |
|
| Is that hash (aebdff80c) the commit? | 20:21 |
|
osse
| yes | 20:21 |
|
shush
| So I just run `git reset --hard accolades-redesign-components@{1}` and that should move it back for me? | 20:22 |
|
| Then I do push --force | 20:22 |
| ← caterfxo left | 20:22 |
|
osse
| eys | 20:23 |
| ← makaveli7 left | 20:24 |
| → scde joined | 20:24 |
| ← manj-gnome left | 20:24 |
| → mauz555 joined | 20:25 |
| ← jetchisel left | 20:25 |
| ← mescalinum left | 20:25 |
| → jetchisel joined | 20:26 |
| ← Maxattax left | 20:28 |
| ← silverwhitefish left | 20:28 |
| ← tiin57 left | 20:29 |
| → inkbottle joined | 20:30 |
| → tiin57 joined | 20:33 |
| → caterfxo joined | 20:33 |
| → Tawonga joined | 20:37 |
| ← Noti left | 20:37 |
| → jim joined | 20:39 |
| → silverwhitefish joined | 20:40 |
| → Ploppz joined | 20:52 |
|
shush
| What does @{1} mean? | 20:53 |
| g00s_ → g00s | 20:53 |
|
_ikke_
| 2nd reflog entry of HEAD | 20:54 |
|
j416
| shush: the knowledge you seek is buried somewhere deep at man gitrevisions | 20:54 |
|
gitinfo
| shush: the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html | 20:54 |
|
j416
| in fact not so deep. | 20:55 |
| ← scde left | 20:56 |
|
j416
| shush: to phrase it like the docs do, the nth prior value of HEAD, in this case 1 prior, so what HEAD was before what it is now | 20:56 |
|
shush
| So not _one commit_ behind, but rather _one ref log_ behind? | 20:57 |
|
j416
| yes | 20:57 |
| → tafa2 joined | 20:58 |
| → kleisli__ joined | 20:59 |
|
j416
| trying this out it looks very much like I'm wrong though. | 20:59 |
| ← tiin57 left | 20:59 |
|
j416
| @{1} means currentbranch@{1}, not HEAD@{1}. | 21:00 |
|
| _ikke_: ^ | 21:00 |
|
| so, if you were on master, @{1} would be where master pointed to before what it points to now | 21:01 |
|
| whereas if HEAD is detached (not on any branch), @{1} would I think mean HEAD@{1}. | 21:01 |
| ← caterfxo left | 21:02 |
|
j416
| shush: ^ | 21:02 |
|
osse
| I'm 83% sure you're wrong | 21:02 |
|
_ikke_
| I'm 97.3% sure | 21:02 |
|
j416
| from the man page: | 21:02 |
|
| > You can use the @ construct with an empty ref part to get at a reflog entry of the current branch. For example, if you are on branch blabla then @{1} means the same as blabla@{1}. | 21:02 |
|
nedbat
| shush: i interpreted shush's question as, "what does the suffix @{1} mean?" | 21:02 |
| → tiin57 joined | 21:03 |
| → caterfxo joined | 21:03 |
|
shush
| 102% unsure of 42% of this | 21:04 |
|
j416
| I'd be happy to learn if I got this wrong; please do enlighten. | 21:04 |
|
| also, what nedbat says is relevent. Since shush has the ref prefix, it's what accolades-redesign-components was one reflog entry prior. | 21:05 |
|
| just to get that clear. | 21:05 |
|
osse
| Looks like you're right | 21:05 |
|
j416
| \^^/ | 21:06 |
|
| at least 17% right, I would like to think. | 21:06 |
|
osse
| How have I not noticed. | 21:06 |
| ← chandoo left | 21:06 |
|
j416
| I was also quite sure it was HEAD, until today. | 21:07 |
|
| but not 100% | 21:07 |
|
osse
| Maybe it changed ten minutes ago | 21:07 |
|
shush
| I would hope you guys would use fractions for your confidence estimates 1/37th of the time | 21:07 |
|
j416
| I think so | 21:07 |
|
| fractions are fake | 21:07 |
|
shush
| They're only fake by a factor of 0.134 | 21:08 |
| → chandoo joined | 21:10 |
| → warthog9 joined | 21:11 |
| ← pupsikov left | 21:14 |
| ← chandoo left | 21:22 |
| ← cek left | 21:26 |
| → andrybak joined | 21:26 |
| ← tiin57 left | 21:29 |
| → multiproc joined | 21:29 |
| → tiin57 joined | 21:33 |
| → chandoo joined | 21:36 |
| → sunrunner20 joined | 21:37 |
| → fitzgerald1337_ joined | 21:38 |
| → zulutango joined | 21:38 |
| ← Dougie187 left | 21:38 |
| ← tafa2 left | 21:39 |
| ← shored left | 21:39 |
| ← fitzgerald1337 left | 21:40 |
| → shored joined | 21:40 |
| → irc_user joined | 21:48 |
| → tafa2 joined | 21:48 |
| ← silverwhitefish left | 21:51 |
| ← tiin57 left | 21:59 |
| ← tafa2 left | 22:00 |
| → tafa2 joined | 22:01 |
| → tiin57 joined | 22:03 |
| ← dre_ left | 22:04 |
| ← Ploppz left | 22:07 |
| ← Jackneill left | 22:07 |
| ← albel727 left | 22:10 |
| ← dmc left | 22:11 |
| → ferdna joined | 22:11 |
| → kantlivelong joined | 22:13 |
| ← CodeSlingerPaul left | 22:13 |
| ← caterfxo left | 22:13 |
| ← POQDavid left | 22:14 |
| ← nikivi left | 22:14 |
| → pikapika joined | 22:15 |
| → devster joined | 22:15 |
| ← funkatronixxx left | 22:16 |
| → POQDavid joined | 22:16 |
| → nikivi joined | 22:16 |
|
rafasc
| HEAD@{n} should be equivalent to @{-n} | 22:16 |
|
| er, maybe not. | 22:16 |
| → caterfxo joined | 22:17 |
|
j416
| I think that's checkouts | 22:17 |
|
| i.e. not counting resets or such | 22:17 |
|
| could be wrong | 22:17 |
| ← pikapika left | 22:17 |
|
j416
| hm wait, isn't "-" short for @{-1} or something | 22:17 |
| ← meejah left | 22:17 |
|
j416
| I use - all the time but I forget what it's short for | 22:17 |
|
rafasc
| I think you're right, only for checkouts. | 22:17 |
| → orbitex joined | 22:18 |
|
j416
| oh, yeah, - for checkouts of course (I was thinking, it works for detached HEAD, so it must be also for resets, but obviously I'm too tired to even be typing this) | 22:18 |
| → pikapika joined | 22:19 |
| ← tafa2 left | 22:22 |
| ← stenno left | 22:22 |
| → magic_ninja_work joined | 22:22 |
| ← snakeice left | 22:23 |
| fitzgerald1337_ → fitzgerald1337 | 22:25 |
| ← DelPhyinf left | 22:25 |
| ← multiproc left | 22:26 |
| ← wootehfoot left | 22:29 |
| → multiproc joined | 22:29 |
| ← tiin57 left | 22:29 |
| ← mauz555 left | 22:30 |
| → mauz555 joined | 22:30 |
| → tiin57 joined | 22:33 |
| → tafa2 joined | 22:34 |
| ← mauz555 left | 22:35 |
| ← feriman left | 22:35 |
| → cbreak joined | 22:40 |
| ← chandoo left | 22:41 |
| ← tafa2 left | 22:41 |
| ← shush left | 22:44 |
| → shush joined | 22:44 |
| → vdamewood joined | 22:45 |
| ← shush left | 22:49 |
| ← ephemer0l_ left | 22:49 |
| → shush joined | 22:50 |
| → ephemer0l joined | 22:51 |
| → butterthebuddha joined | 22:55 |
| → mauz555 joined | 22:56 |
| ← tiin57 left | 22:59 |
| ← mauz555 left | 23:01 |
| ← lucasb left | 23:02 |
| → tiin57 joined | 23:02 |
| → scde joined | 23:05 |
| ← Dirak left | 23:09 |
| ← omnireq_ left | 23:09 |
| → jstein joined | 23:10 |
| → Dirak joined | 23:13 |
| → omnireq joined | 23:13 |
| ← multiproc left | 23:15 |
| → dmc joined | 23:22 |
| ← omnireq left | 23:23 |
| ← sbeyer left | 23:23 |
| ← cliluw left | 23:27 |
| → cliluw joined | 23:28 |
| ← justanotheruser left | 23:28 |
| ← tiin57 left | 23:29 |
| → tiin57 joined | 23:33 |
| → CryptoDavid joined | 23:40 |
| → justanotheruser joined | 23:45 |
| → prak2 joined | 23:45 |
| → oriba joined | 23:46 |
| ← fitzgerald1337 left | 23:47 |
| ← Phylock left | 23:48 |
| → omnireq joined | 23:48 |
| ← Guest38430 left | 23:53 |
| → buckworst joined | 23:54 |
| ← andrybak left | 23:55 |
| → mescalinum joined | 23:55 |
| ← scde left | 23:56 |
| → omnireq_ joined | 23:57 |
| ← NightStrike left | 23:57 |
| ← omnireq left | 23:57 |
| ← tiin57 left | 23:59 |