| 2022-09-05 |
| ← paddymahoney2 left | 00:02 |
| ← Schrostfutz left | 00:04 |
| ← nate1 left | 00:10 |
| ← Soni left | 00:11 |
| → nate1 joined | 00:11 |
| ← g2anj left | 00:14 |
| → nivag joined | 00:16 |
| ← The_Blode_ left | 00:17 |
| ← rgrinberg left | 00:19 |
| ← minimal left | 00:21 |
| → g2anj joined | 00:29 |
| → Soni joined | 00:36 |
| ← FinnElija left | 00:39 |
| ← gxt left | 00:39 |
| → ghost43 joined | 00:39 |
| ← ghost43_ left | 00:40 |
| ← b2j left | 00:40 |
| ← vertreko left | 00:40 |
| ← GNUmoon2 left | 00:40 |
| → b2j joined | 00:40 |
| → vertreko joined | 00:41 |
| → gxt joined | 00:41 |
| → FinnElija joined | 00:42 |
| ← ghost43 left | 00:44 |
| → ghost43 joined | 00:44 |
| ← twb left | 00:45 |
| → dyamito joined | 00:52 |
| → GNUmoon2 joined | 00:53 |
| → lucasta joined | 00:57 |
| ← lucasta left | 00:57 |
| ← xv8 left | 00:58 |
| ← gas51627 left | 00:59 |
| → hamburgler joined | 01:02 |
| → twb joined | 01:06 |
| → rgrinberg joined | 01:12 |
| → Schrostfutz joined | 01:18 |
| ← YellowSuB left | 01:21 |
| ← xx left | 01:30 |
| → gsi_ joined | 01:47 |
|
Soni
| has anyone made a FUSE-based git web interface yet? | 01:49 |
| ← gsi left | 01:50 |
| ← nate1 left | 01:51 |
|
mackerman
| FUSE and web is an interesting combination. Most FUSE APIs are file system based. | 01:54 |
|
dyamito
| i'm working on very large projects recently and finding that git log -S is very slow. are there any suggestions for speeding it up? (other than adding additional filters) | 01:55 |
|
mackerman
| Soni: At least 9 file system interfaces to git have existed: https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools#Filesystem_interfaces | 01:56 |
|
Soni
| mackerman: a webserver is just another filesystem viewer | 01:56 |
| → rama_ joined | 01:58 |
| ← lemonsnicks left | 02:03 |
|
mackerman
| dyamito: Perhaps profile git to find where the limiting factor is for performance. Exactly how is operating system specific. | 02:03 |
|
| Put the repo on the fastest disk you have available. | 02:03 |
|
dyamito
| i'm on an SSD on linux, but given how slow it is i'm thinking it might just be how git is on these size repos. | 02:05 |
|
mackerman
| Text search in files back to the beginning is going to take a while | 02:07 |
| → nate1 joined | 02:08 |
|
nedbat
| dyamito: how large is your repo? | 02:08 |
| ← Visne left | 02:08 |
|
dyamito
| ~150k commits, 350k loc | 02:09 |
| → Visne joined | 02:09 |
|
nedbat
| dyamito: and how long are searches taking? | 02:11 |
|
dyamito
| usually 2-3 mins | 02:12 |
|
mackerman
| That is order of magnitude what I expect for that size of database-like activity | 02:13 |
| ← nate1 left | 02:17 |
| ← rgrinberg left | 02:19 |
| ← ghost43 left | 02:21 |
| → ghost43 joined | 02:21 |
| → lemonsnicks joined | 02:21 |
| → Null_A joined | 02:24 |
| → f451 joined | 02:24 |
| → roadie joined | 02:41 |
| → loulou joined | 02:44 |
| ← loulou left | 02:44 |
| → loulou joined | 02:44 |
| ← keypusher left | 02:46 |
| → keypusher joined | 02:48 |
| ← rama_ left | 02:49 |
| → furrymcg1e joined | 02:51 |
| ← loulou left | 02:51 |
| ← zebrag left | 02:54 |
| ← furrymcgee left | 02:54 |
| → rama joined | 02:55 |
| ← Schrostfutz left | 02:56 |
| ← rama left | 03:00 |
| → nate1 joined | 03:02 |
| ← Night_Wulfe left | 03:03 |
| ← GNUmoon2 left | 03:05 |
| ← vertreko left | 03:05 |
| → GNUmoon2 joined | 03:06 |
| → Guest35 joined | 03:10 |
| → rama joined | 03:12 |
| ← Guest35 left | 03:13 |
| ← Null_A left | 03:14 |
| ← ywnkmn left | 03:15 |
| → ywnkmn joined | 03:15 |
| ← rama left | 03:16 |
| ← ChmEarl left | 03:21 |
| → Night_Wulfe joined | 03:21 |
| ← Night_Wulfe left | 03:21 |
| ← fling left | 03:26 |
| → cdown_ joined | 03:27 |
| → fling joined | 03:27 |
| → Night_Wulfe joined | 03:28 |
| ← cdown left | 03:30 |
| cdown_ → cdown | 03:30 |
| ← Night_Wulfe left | 03:34 |
| → rgrinberg joined | 03:38 |
| → Night_Wulfe joined | 03:38 |
| → agowa joined | 03:40 |
| ← cdown left | 03:43 |
| ← tyson2 left | 03:44 |
| ← agowa338 left | 03:44 |
| → rama joined | 03:44 |
| → FH_thecat joined | 03:45 |
| → Null_A joined | 03:48 |
| ← rama left | 03:48 |
| → cristiioan joined | 03:49 |
| → igemnace joined | 03:50 |
| → sydbarret joined | 03:51 |
|
sydbarret
| how can I check which account im connected in ? | 03:51 |
|
| in the terminal | 03:51 |
|
| im on windows | 03:51 |
| → caveman joined | 03:51 |
|
bookworm
| git remote -v + git config --list or such | 03:52 |
|
| if it's ssh, the ssh config of the host | 03:52 |
|
| there's a bunch of places you can configure creds, so it depends | 03:53 |
| ← skapata left | 03:53 |
| ← cristiioan left | 03:53 |
|
sydbarret
| im getting repository does not exist | 03:54 |
|
| but it does on github | 03:54 |
|
| I have 2 different accounts in github | 03:54 |
|
| so perhaps im still connected to older one | 03:55 |
|
| git remote -v shows correct url | 03:55 |
|
bookworm
| which is what, ssh or https? | 03:55 |
|
sydbarret
| https | 03:55 |
|
bookworm
| and the url has a user part? | 03:55 |
|
| or is it just the normal url? | 03:56 |
|
sydbarret
| it has user name | 03:56 |
| ← Null_A left | 03:58 |
|
sydbarret
| is there a command to disconnect? and then provide the credentials again? | 04:00 |
|
bookworm
| assuming you are using the git credential helper of Microsoft, that ought to be enough https://github.com/GitCredentialManager/git-credential-manager/blob/main/docs/multiple-users.md | 04:00 |
|
| You can check the manpage of the credential helper if there's an easy way to clear the auth | 04:01 |
| → rama joined | 04:01 |
| → cristiioan joined | 04:04 |
|
bookworm
| sydbarret: and just to make sure, by user part I mean that https://employee9999@github.com/big-company/secret-repo.git (the employee9999 is the user, not big-company | 04:10 |
| ← roadie left | 04:11 |
|
sydbarret
| im not clonning but pushing | 04:13 |
| ← rgrinberg left | 04:13 |
|
sydbarret
| i m using that syntax | 04:13 |
|
| but it says | 04:13 |
|
| remote: Support for password authentication was removed on August 14, 2021. | 04:14 |
|
| remote: Please see https://docs.github.com/en/get-started/getting-started-with-git/about-remote-repositories#cloning-with-https-urls for information on currently recommended modes of authentication. | 04:14 |
|
bookworm
| does your url also contain the password? | 04:15 |
|
sydbarret
| they changed to a token | 04:15 |
|
| i have to create a token now i guess | 04:15 |
|
bookworm
| better would be to log in with the cred manager linked above, it can do oauth2 | 04:16 |
|
| set that up according to their readme, remove any token/pw parts from the url and it should pip up an auth prompt the first time you try to access the remote | 04:16 |
|
| or just use ssh, up to you | 04:17 |
| ← _xor left | 04:18 |
|
sydbarret
| it think its better tojust delete the credentials from windows credential manager | 04:18 |
| → Null_A joined | 04:18 |
|
sydbarret
| but its unconfortable to do that everytime i have to change users | 04:18 |
|
bookworm
| if you have a pw part in your url, ypu aren't using it | 04:18 |
|
| git literally asks the cred manager for the pw, it doesn't modify the url | 04:19 |
|
sydbarret
| i dont get it there is no pwd in the url | 04:19 |
| ← Skypl left | 04:19 |
| → roadie joined | 04:20 |
|
bookworm
| then why answer my question if it's there with "it's a token"? | 04:20 |
| → rgrinberg joined | 04:20 |
|
bookworm
| and the cred manager uses the configured user identity, you don't have to log out if you configured all repos with the user part | 04:21 |
|
sydbarret
| cred manager wont install | 04:22 |
|
bookworm
| highly doubtful | 04:22 |
|
| it's literally built for windows first | 04:22 |
|
sydbarret
| Deploying from 'C:\Program Files\Git\mingw64\libexec\git-core' to 'C:\Program Files\Git'. deployment failed. U_U | 04:22 |
|
bookworm
| and comes by default nowdays with the installer | 04:22 |
|
| fix your installation then | 04:23 |
|
sydbarret
| you mean is the same as the one in windows>? | 04:23 |
| → hqdruxn08__ joined | 04:23 |
|
sydbarret
| i have that already opened | 04:23 |
|
bookworm
| eh? | 04:23 |
|
| "git for windows" is a fork of git that allows you to use git on windows | 04:24 |
|
| else you could not use git there | 04:24 |
|
| meaning if you installed git from an exe on your system, fetched from the official website, that was the installer I'm referring to | 04:25 |
| ← ywnkmn left | 04:25 |
|
sydbarret
| we are talking about credentials not git | 04:25 |
| → ywnkmn joined | 04:25 |
|
sydbarret
| let me ask you this, the cred manager link yhou gave me | 04:25 |
|
bookworm
| no shit Sherlock... it is bundled in the installer | 04:25 |
|
sydbarret
| is the one that comes already in windows? | 04:26 |
| → hqdruxn08 joined | 04:26 |
|
bookworm
| windows doesn't ship either git nor the cred manager core | 04:26 |
|
sydbarret
| in windows search I already have a credential manager | 04:26 |
| ← hqdruxn08_ left | 04:27 |
|
sydbarret
| when i open it it has web cred and windows cred tab | 04:27 |
|
bookworm
| yes, assuming you hit all the next buttons on the installer, that's what happens | 04:27 |
|
ikke
| That's the built-in credential manager | 04:28 |
|
sydbarret
| i already have this https://support.microsoft.com/en-us/windows/accessing-credential-manager-1b5c916a-6a16-889f-8581-fc16e8165ac0 | 04:28 |
|
bookworm
| ah, not that one no | 04:28 |
|
| the git cred manager doesn't have a fancy UI last I checked | 04:28 |
| ← hqdruxn08__ left | 04:29 |
|
sydbarret
| well that one wont install | 04:29 |
|
| i sent you the error msg | 04:29 |
|
bookworm
| that's not an install log output is it? As in when you run the installer (the exe)? | 04:29 |
|
| if it is, file a bug | 04:29 |
|
ikke
| bookworm: the credential manager plugin shipped with git-for-windows uses the windows credential manager | 04:31 |
| → manin891 joined | 04:31 |
|
ikke
| (still reading backlog) | 04:31 |
|
bookworm
| that's the pw storage though, the configuration which account to select is still based on the remote url right? | 04:32 |
|
ikke
| That's one option, but not necessary | 04:32 |
|
| credential.username and credential.<url>.username can specify it as well | 04:33 |
| → vdamewood joined | 04:35 |
| ← igemnace left | 04:35 |
| → coldmountain joined | 04:36 |
|
bookworm
| heh, that's missing from the gcm docs | 04:37 |
|
| neither in the multi user nor config docs is any mention of that | 04:37 |
| ← FH_thecat left | 04:38 |
| → kenanmarasli joined | 04:39 |
| → igemnace joined | 04:44 |
| ← zumba_addict left | 04:46 |
| → vyryls joined | 04:47 |
| ← gast0n left | 04:53 |
| → coot joined | 04:54 |
| ← ferdna left | 04:55 |
| ← sydbarret left | 04:55 |
| ← cristiioan left | 04:56 |
| → atrigent joined | 04:56 |
| → madewokherd joined | 05:00 |
| ← rgrinberg left | 05:00 |
| ^vanessa^ → vanessa | 05:01 |
| ← madewokherd` left | 05:04 |
| → Sulky_ joined | 05:05 |
| ← analoq left | 05:06 |
| ← Sulky__ left | 05:07 |
| → analoq joined | 05:08 |
| → paddymahoney2 joined | 05:09 |
| → cristiioan joined | 05:14 |
|
Matt|home
| i have 2 branches.. main with old code and a new one where im doing my current work. i need to do something very different though, so what should i do.. merge the two branches and create a new one? | 05:17 |
| ← cristiioan left | 05:19 |
| → FH_thecat joined | 05:20 |
|
bookworm
| git worktrees / stash / commit with -m 'wip' and then go back to it when you can | 05:26 |
|
| any of those will work | 05:26 |
| ← Null_A left | 05:31 |
| ← paddymahoney2 left | 05:32 |
|
Matt|home
| ty | 05:33 |
| → paddymahoney2 joined | 05:34 |
| ← caveman left | 05:34 |
|
Matt|home
| hm. how do i see the changes that were made before i make a commit | 05:34 |
|
| ah git diff | 05:35 |
|
bookworm
| git status / git diff | 05:35 |
|
Matt|home
| thanks yeah | 05:36 |
| ← sudoforge left | 05:37 |
| → otisolsen70 joined | 05:38 |
| ← otisolsen70 left | 05:39 |
| → otisolsen70 joined | 05:40 |
| ← kenanmarasli left | 05:42 |
| ← paddymahoney2 left | 05:44 |
| → Null_A joined | 05:47 |
| → srinidhi joined | 05:51 |
| → zeenk joined | 05:53 |
| → Jong joined | 06:00 |
| wyre_ → wyre | 06:02 |
| ← YuGiOhJCJ left | 06:07 |
| → dvanloon9 joined | 06:10 |
| → rfuentess joined | 06:12 |
| ← dvanloon left | 06:12 |
| dvanloon9 → dvanloon | 06:12 |
| ← atrigent left | 06:12 |
| → atrigent joined | 06:13 |
| ← nate1 left | 06:15 |
| ← wallabra left | 06:20 |
| → rsx joined | 06:25 |
| ← vyryls left | 06:26 |
| ← hamburgler left | 06:30 |
| ← bigGopher left | 06:32 |
| ← arch-angel left | 06:34 |
| → arch-angel joined | 06:36 |
| → codeDude joined | 06:41 |
|
codeDude
| hello | 06:41 |
|
| I found this https://stackoverflow.com/questions/5126765/how-to-get-rid-of-git-submodules-untracked-status | 06:41 |
| → nate1 joined | 06:41 |
|
codeDude
| I'd like to know if the top answer is correct | 06:41 |
|
| Is this the best practice? | 06:42 |
| → vyryls joined | 06:42 |
| ← rhe left | 06:43 |
| ← codeDude left | 06:45 |
| ← FinnElija left | 06:46 |
| ← fling left | 06:46 |
| ← GNUmoon2 left | 06:46 |
| → FinnElija joined | 06:46 |
| → GNUmoon2 joined | 06:46 |
| → fling joined | 06:46 |
| ← nate1 left | 06:47 |
| → OnkelTem joined | 06:50 |
| ← rama left | 06:52 |
| → feriman joined | 06:55 |
| ← vyryls left | 06:56 |
| ← fling left | 06:59 |
| → fling_ joined | 06:59 |
| → DibbTubberOne joined | 07:02 |
| → Anticom joined | 07:03 |
| → RiFo joined | 07:03 |
| fling_ → fling | 07:07 |
| ← Murr left | 07:08 |
| → Murr joined | 07:09 |
| ← Anticom left | 07:12 |
| → OnkelBlade joined | 07:12 |
| → Anticom joined | 07:13 |
| → nate1 joined | 07:14 |
| ← Anticom left | 07:14 |
| → Anticom joined | 07:14 |
| ← OnkelTem left | 07:15 |
| ← vanessa left | 07:16 |
| → rhe joined | 07:17 |
| ← nate1 left | 07:19 |
| ← pulse left | 07:20 |
| → pulse joined | 07:20 |
| → mexen_ joined | 07:21 |
| ← OnkelBlade left | 07:21 |
| ← nizzan left | 07:22 |
| → jargan joined | 07:22 |
| → nizzan3 joined | 07:22 |
| ← jast left | 07:22 |
| → deepy joined | 07:23 |
| → OnkelBlade joined | 07:23 |
| → carl- joined | 07:24 |
| → Masklin_Gurder joined | 07:25 |
| → hans_ joined | 07:26 |
| ← jazzy left | 07:28 |
| mexen_ → mexen | 07:29 |
| ← mexen left | 07:29 |
| → mexen joined | 07:29 |
| → mncheck joined | 07:30 |
| ← Sulky_ left | 07:30 |
| ← Quietus left | 07:32 |
| → Quietus joined | 07:33 |
| ← erarnitox left | 07:33 |
| → theoceaniscool joined | 07:34 |
| → erarnitox joined | 07:35 |
| ← JanC left | 07:38 |
| → JanC joined | 07:38 |
| → enoq joined | 07:40 |
| → wallabra joined | 07:42 |
| ← roadie left | 07:43 |
| → vanessa joined | 07:43 |
| ← coldmountain left | 07:46 |
| ← Jong left | 07:49 |
| → dionysus69 joined | 07:53 |
| ← feriman left | 07:56 |
| ← bloody left | 07:56 |
| ← Misotauros left | 08:06 |
| → Sulky joined | 08:08 |
| → rkta_ joined | 08:08 |
| ← rkta left | 08:08 |
| → roadie joined | 08:08 |
| ← ywnkmn left | 08:10 |
| → ywnkmn joined | 08:10 |
| ← DibbTubberOne left | 08:11 |
| → remyabel2 joined | 08:11 |
| ← roadie left | 08:14 |
| ← atrigent left | 08:18 |
| ← Null_A left | 08:25 |
| → Null_A joined | 08:26 |
| → feriman joined | 08:30 |
| ← DaTa left | 08:30 |
| ← Anticom left | 08:34 |
| → iamtheranger joined | 08:34 |
| → Anticom joined | 08:34 |
| → jim87 joined | 08:35 |
| ← jim87 left | 08:35 |
| ← austin987 left | 08:35 |
| → roadie joined | 08:38 |
| ← Null_A left | 08:38 |
| → Misotauros joined | 08:38 |
| ← roadie left | 08:46 |
| → nwoob joined | 08:47 |
|
k_sze
| `git stash` seems stuck when I'm trying to stash changes across a few hundred files. What should I do? | 08:47 |
|
| oh, nvm | 08:48 |
|
nwoob
| I have personal access token and in my local repo when I use it to download repo as packages I don't see errors and it works, but in gitlab ci/cd pipeline CI_JOB_TOKEN gives me 404 | 08:48 |
|
osse
| k_sze: if you're on an older git you can consider uprading. git-stash was reimplemented in C and the old shell-based code is legacy | 08:50 |
| → Jong joined | 08:50 |
| ← junebug left | 08:50 |
|
osse
| hmm, that was 2.5 years ago. | 08:51 |
|
| Git 2.22 | 08:51 |
|
k_sze
| osse, I have the latest git. And it wasn't stuck after all. I *thought* it was, but it turns out that the console was not moving at all because I accidentally hit ctrl-enter instead of enter. | 08:51 |
|
geirha
| oh wow, git stash used to be implemented in sh? | 08:51 |
|
nwoob
| being a member of that repo fixes the issue. But why was it working locally when fetching npm packages via npmrc | 08:52 |
|
osse
| geirha: lots of things were | 08:52 |
|
| even git-commit in the earliest days | 08:53 |
|
| git show 86c9cfa0c7a9a6b3b1f9d956084c65164b7b5e4b | 08:55 |
|
ikke
| git::86c9cfa0c7a9a6b3b1f9d956084c65164b7b5e4b | 08:56 |
|
gitinfo
| Git web link: https://github.com/git/git/commit/86c9cfa0c7a9a6b3b1f9d956084c65164b7b5e4b | 08:56 |
|
osse
| rekt | 08:56 |
|
| how to blob | 08:56 |
|
ikke
| oh, it's a blob | 08:56 |
|
osse
| Bob Loblaw | 08:57 |
|
ikke
| I don't think it supports linking to blobs by hash | 08:58 |
|
| the github interface probably does not even support it | 08:58 |
| → KnoP joined | 08:58 |
|
osse
| hmm, no. supports treehash/path | 08:59 |
|
| which I guess gitinfo does too | 08:59 |
|
| git::90bbd502d54fe920356fa9278055dc9c9bfe9a56/contrib/examples/git-commit.sh | 08:59 |
|
gitinfo
| Git web link: https://github.com/git/git/commits/90bbd502d54fe920356fa9278055dc9c9bfe9a56/contrib/examples/git-commit.sh | 08:59 |
|
osse
| hmm | 08:59 |
| ← remyabel2 left | 09:00 |
| ← KnoP left | 09:01 |
|
osse
| git::90bbd502d54fe920356fa9278055dc9c9bfe9a56:contrib/examples/git-commit.sh | 09:02 |
|
gitinfo
| Git web link: https://github.com/git/git/blob/90bbd502d54fe920356fa9278055dc9c9bfe9a56/contrib/examples/git-commit.sh | 09:02 |
|
osse
| there we go | 09:02 |
| ← allison_chains left | 09:04 |
| → allison_chains joined | 09:04 |
| → remyabel2 joined | 09:05 |
|
osse
| geirha: ran it through shellcheck. not bad actually | 09:05 |
| ← Jong left | 09:05 |
|
osse
| but it's been improved a lot after it was deprecated | 09:06 |
| → roadie joined | 09:07 |
| rkta_ → rkta | 09:07 |
|
osse
| ok not that much | 09:08 |
| → DibbTubberOne joined | 09:08 |
| ← Murr left | 09:08 |
| → Murr joined | 09:09 |
| ← nwoob left | 09:09 |
| → nwoob joined | 09:11 |
| ← dyamito left | 09:12 |
| ← roadie left | 09:12 |
| → Jong joined | 09:13 |
|
geirha
| Yeah, it doesn't look that bad. I've seen much worse sh code. If I were to make any changes though, the first would likely be to get rid of those expr calls | 09:18 |
|
ikke
| geirha: note that git has to work on quite some platforms | 09:19 |
|
| So you need to use things that are available broadly | 09:19 |
| → tulpa_ joined | 09:20 |
|
geirha
| sure, and expr is a mine-field | 09:21 |
| → cristiioan joined | 09:22 |
|
geirha
| Without looking at the history at that file, I'd guess it started out as a bourne script and slowly evolved to a posix script | 09:24 |
|
| given that it's using $() now, it'll also have ${param#pattern} and ${param%pattern} available, which will be much simpler and more efficient than $(expr...) | 09:27 |
| ← mbalmer left | 09:28 |
| ← xkoncek left | 09:29 |
| → xkoncek joined | 09:30 |
| ← samuelb left | 09:30 |
| → mbalmer_ joined | 09:31 |
| ← jab416171 left | 09:34 |
| ← mbalmer_ left | 09:36 |
| ← Sulky left | 09:37 |
| → Sulky joined | 09:37 |
|
osse
| git::a3e870f2e2bcacc80d5b81d7b77c15a7928a9082 | 09:39 |
|
gitinfo
| Git web link: https://github.com/git/git/commit/a3e870f2e2bcacc80d5b81d7b77c15a7928a9082 | 09:39 |
| → Rashad joined | 09:39 |
| → jab416171 joined | 09:40 |
|
geirha
| ok, so the bourne style was a ruse | 09:40 |
| → mbalmer_ joined | 09:40 |
| → nwoob_ joined | 09:41 |
| ← k_sze left | 09:41 |
| ← DibbTubberOne left | 09:41 |
| ← Anticom left | 09:44 |
| ← nwoob left | 09:44 |
| → Anticom joined | 09:44 |
| → DrowningElysium joined | 09:45 |
| ← mbalmer_ left | 09:50 |
| ← jinsl left | 09:50 |
| → jinsl joined | 09:50 |
| ← OnkelBlade left | 09:51 |
| → TomyWork joined | 09:54 |
| ← Anticom left | 09:55 |
| → Anticom joined | 09:57 |
| ← remyabel2 left | 09:57 |
| → OnkelBlade joined | 09:58 |
| → john_johnk joined | 10:00 |
| ← Anticom left | 10:01 |
| hayaliali → alip | 10:05 |
| ← vishal left | 10:09 |
| ← FH_thecat left | 10:11 |
| → FH_thecat joined | 10:11 |
| → vishal joined | 10:12 |
| ← FH_thecat left | 10:13 |
| → FH_thecat joined | 10:13 |
| → remyabel2 joined | 10:13 |
| ← FH_thecat left | 10:15 |
| → FH_thecat joined | 10:15 |
| ← FH_thecat left | 10:17 |
| ← EvilDMP left | 10:17 |
| → FH_thecat joined | 10:18 |
| → EvilDMP joined | 10:19 |
| → Swahili joined | 10:20 |
| ← FH_thecat left | 10:20 |
| → roadie joined | 10:24 |
| ← UNIX left | 10:26 |
| → OpenSource joined | 10:28 |
| → robo- joined | 10:34 |
| → zmt01 joined | 10:35 |
| ← roadie left | 10:35 |
| → bodicceaII joined | 10:35 |
| → vinleod joined | 10:36 |
| ← vdamewood left | 10:36 |
| vinleod → vdamewood | 10:36 |
| → johncs7 joined | 10:36 |
| → ninjin_ joined | 10:36 |
| → ddevault_ joined | 10:36 |
| → AndrewYu joined | 10:37 |
| → Tobbi_ joined | 10:37 |
| → finalriposte joined | 10:37 |
| ← ninjin_ left | 10:37 |
| ← ddevault left | 10:37 |
| ddevault_ → ddevault | 10:37 |
| → ninjin_ joined | 10:37 |
| ← john_johnk left | 10:38 |
| → Sulky_ joined | 10:44 |
| ← Swahili left | 10:44 |
| ← nwoob_ left | 10:44 |
| ← jab416171 left | 10:44 |
| ← feriman left | 10:44 |
| ← dionysus69 left | 10:44 |
| ← RiFo left | 10:44 |
| ← zeenk left | 10:44 |
| ← srinidhi left | 10:44 |
| ← analoq left | 10:44 |
| ← hqdruxn08 left | 10:44 |
| ← furrymcg1e left | 10:44 |
| ← f451 left | 10:44 |
| ← twb left | 10:44 |
| ← bremner left | 10:44 |
| ← Raito_Bezarius left | 10:44 |
| ← hexadecagram left | 10:44 |
| ← koolazer left | 10:44 |
| ← sa left | 10:44 |
| ← krushia left | 10:44 |
| ← webstrand left | 10:44 |
| ← elastic_dog left | 10:44 |
| ← donofrio_ left | 10:44 |
| ← hendry left | 10:44 |
| ← flying_sausages left | 10:44 |
| ← nyuszika7h left | 10:44 |
| ← Quack left | 10:44 |
| ← gdd1 left | 10:44 |
| ← jakesyl____ left | 10:44 |
| ← alip left | 10:44 |
| ← zachel_ left | 10:44 |
| ← tonitch_ left | 10:44 |
| ← MrC left | 10:44 |
| ← defjam left | 10:44 |
| ← Teacup left | 10:44 |
| ← ajak left | 10:44 |
| ← shokohsc left | 10:44 |
| ← Noisytoot left | 10:44 |
| ← llh left | 10:44 |
| ← realies left | 10:44 |
| ← farn left | 10:44 |
| ← foul_owl left | 10:44 |
| ← mns left | 10:44 |
| ← robo left | 10:44 |
| ← rewt left | 10:44 |
| ← wolfdale83 left | 10:44 |
| ← phundrak left | 10:44 |
| ← human_g33k left | 10:44 |
| ← bodiccea_ left | 10:44 |
| ← NightMonkey left | 10:44 |
| ← skered left | 10:44 |
| ← m1dnight left | 10:44 |
| ← CAT_S left | 10:44 |
| ← jimklimov left | 10:44 |
| ← HelloShitty left | 10:44 |
| ← Matt|home left | 10:44 |
| ← dharrigan left | 10:44 |
| ← hrberg left | 10:44 |
| ← rapmoc left | 10:44 |
| ← Ajax146 left | 10:44 |
| ← mlaga97 left | 10:44 |
| ← Coop left | 10:44 |
| ← zmt00 left | 10:44 |
| ← Oblomov left | 10:44 |
| ← johncs left | 10:44 |
| ← Andrew left | 10:44 |
| ← frojnd left | 10:44 |
| ← kaichiuchi left | 10:44 |
| ← avar left | 10:44 |
| ← ndim left | 10:44 |
| ← riposte left | 10:44 |
| ← lericson left | 10:44 |
| ← magic_ninja left | 10:44 |
| ← vancz left | 10:44 |
| ← m5zs7k left | 10:44 |
| ← alfredb left | 10:44 |
| ← Tobbi left | 10:44 |
| ← ninjin left | 10:44 |
| ← catern left | 10:44 |
| ← kilobyte_ch left | 10:44 |
| ← leah2 left | 10:44 |
| johncs7 → johncs | 10:44 |
| Tobbi_ → Tobbi | 10:44 |
| AndrewYu → Andrew | 10:44 |
| ← Sulky left | 10:45 |
| → donofrio_ joined | 10:47 |
| → Swahili joined | 10:49 |
| → nwoob_ joined | 10:49 |
| → jab416171 joined | 10:49 |
| → feriman joined | 10:49 |
| → dionysus69 joined | 10:49 |
| → RiFo joined | 10:49 |
| → zeenk joined | 10:49 |
| → srinidhi joined | 10:49 |
| → analoq joined | 10:49 |
| → hqdruxn08 joined | 10:49 |
| → furrymcg1e joined | 10:49 |
| → f451 joined | 10:49 |
| → twb joined | 10:49 |
| → bremner joined | 10:49 |
| → Raito_Bezarius joined | 10:49 |
| → hexadecagram joined | 10:49 |
| → koolazer joined | 10:49 |
| → sa joined | 10:49 |
| → krushia joined | 10:49 |
| → webstrand joined | 10:49 |
| → elastic_dog joined | 10:49 |
| → hendry joined | 10:49 |
| → flying_sausages joined | 10:49 |
| → nyuszika7h joined | 10:49 |
| → Quack joined | 10:49 |
| → gdd1 joined | 10:49 |
| → jakesyl____ joined | 10:49 |
| → zachel_ joined | 10:49 |
| → alip joined | 10:49 |
| → tonitch_ joined | 10:49 |
| → MrC joined | 10:49 |
| → defjam joined | 10:49 |
| → Teacup joined | 10:49 |
| → ajak joined | 10:49 |
| → shokohsc joined | 10:49 |
| → Noisytoot joined | 10:49 |
| → foul_owl joined | 10:49 |
| → llh joined | 10:49 |
| → realies joined | 10:49 |
| → farn joined | 10:49 |
| → mns joined | 10:49 |
| → rewt joined | 10:49 |
| → wolfdale83 joined | 10:49 |
| → phundrak joined | 10:49 |
| → human_g33k joined | 10:49 |
| → NightMonkey joined | 10:49 |
| → skered joined | 10:49 |
| → m1dnight joined | 10:49 |
| → CAT_S joined | 10:49 |
| → jimklimov joined | 10:49 |
| → HelloShitty joined | 10:49 |
| → Matt|home joined | 10:49 |
| → dharrigan joined | 10:49 |
| → hrberg joined | 10:49 |
| → rapmoc joined | 10:49 |
| → Ajax146 joined | 10:49 |
| → mlaga97 joined | 10:49 |
| → Coop joined | 10:49 |
| → Oblomov joined | 10:49 |
| → frojnd joined | 10:49 |
| → kaichiuchi joined | 10:49 |
| → ndim joined | 10:49 |
| → avar joined | 10:49 |
| → lericson joined | 10:49 |
| → magic_ninja joined | 10:49 |
| → vancz joined | 10:49 |
| → m5zs7k joined | 10:49 |
| → alfredb joined | 10:49 |
| → kilobyte_ch joined | 10:49 |
| → leah2 joined | 10:49 |
| → kek_ joined | 10:49 |
|
kek_
| hi | 10:49 |
| ← m5zs7k left | 10:49 |
| ← koolazer left | 10:49 |
| ← defjam left | 10:49 |
| ← gdd1 left | 10:49 |
| ← Noisytoot left | 10:49 |
| ← elastic_dog left | 10:49 |
| ← realies left | 10:49 |
| ← Raito_Bezarius left | 10:49 |
| ← foul_owl left | 10:49 |
| ← hexadecagram left | 10:49 |
| ← llh left | 10:49 |
| → Noisytoot_ joined | 10:49 |
| → m5zs7k_ joined | 10:49 |
| → realies joined | 10:49 |
| → llh joined | 10:49 |
| → defjam joined | 10:49 |
| → foul_owl joined | 10:50 |
|
kek_
| I'm about to start a new project/research paper and I like to make a repo for it. There are three parts to it: 1. Latex/the paper itself 2. some code 3. papers. Do you think it's bad practice to actually add the PDFs of the papers to my git repository? | 10:50 |
| → Anticom joined | 10:50 |
|
selckin
| probably not | 10:51 |
| → gdd1 joined | 10:51 |
| ← sa left | 10:52 |
| ← jakesyl____ left | 10:52 |
| ← hendry left | 10:53 |
| → jakesyl____ joined | 10:53 |
| → sa joined | 10:54 |
| → xx joined | 10:54 |
| → koolazer joined | 10:54 |
| → elastic_dog joined | 10:54 |
|
twb
| kek_: you mean PDFs of other people's papers? | 10:54 |
| → hendry joined | 10:54 |
|
twb
| kek_: why can't you just save the URL (arxiv.org or doi: or whatever0 | 10:55 |
| → tyson2 joined | 10:55 |
|
twb
| Those links would be in your bibtex already, right? | 10:55 |
|
selckin
| always good to have a copy | 10:58 |
| m5zs7k_ → m5zs7k | 10:58 |
|
kek_
| twb, yes - why not? I might edit stuff, highlight things, add notes etc. | 10:59 |
|
twb
| Only the ideological reason that committing build products is a bit shit | 11:00 |
|
| If those PDFs won't change and they're not like 100MB each, it's probably not a big deal in this case | 11:00 |
|
| But I once had someone commit the entire Visual Studio install DVD, because "this project only compiles with this exact compiler"... | 11:01 |
| → vyryls joined | 11:02 |
| ← Misotauros left | 11:03 |
| → csm3105 joined | 11:07 |
| ← Murr left | 11:08 |
| → Murr joined | 11:09 |
| ← ghost43 left | 11:10 |
| → ghost43 joined | 11:11 |
| → hexadecagram joined | 11:14 |
| → Raito_Bezarius joined | 11:16 |
| → nate1 joined | 11:16 |
| → cdown joined | 11:17 |
|
nwoob_
| On my current branch I have only one commit that I pushed. Now I want to revert it, if I do git revert head~1 | 11:19 |
|
| git says ambiguous argument 'head~1': unknown revision or path not in the working tree. | 11:19 |
|
| why is that? | 11:19 |
|
ikke
| HEAD~1 | 11:19 |
| ← Rashad left | 11:19 |
|
nwoob_
| oh, does head has to be in caps? | 11:20 |
| ← nate1 left | 11:20 |
|
ikke
| yes | 11:20 |
|
nwoob_
| ok, thanks ikke | 11:21 |
|
kek_
| twb, haha | 11:21 |
|
| thanks | 11:21 |
| ← kek_ left | 11:22 |
| ← remyabel2 left | 11:25 |
| → nyah joined | 11:27 |
| ← twb left | 11:27 |
| ← Anticom left | 11:29 |
| → Anticom joined | 11:29 |
| → Misotauros joined | 11:30 |
| → DaTa joined | 11:31 |
| ← ninjin_ left | 11:38 |
| → ninjin joined | 11:38 |
| ← madewokherd left | 11:38 |
| jargan → jast | 11:40 |
|
jast
| nwoob_: I don't think that's what you want though :) | 11:40 |
| ← xx left | 11:41 |
| → Assault joined | 11:42 |
|
jast
| what "git revert HEAD~1" does is reverse the effects of the commit at HEAD~1 and create a new commit from that on top | 11:42 |
|
| just to clarify... | 11:42 |
|
| !revert | 11:42 |
|
gitinfo
| That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]? | 11:42 |
| → Rashad joined | 11:43 |
|
Assault
| hi...this is not really a git question, but sort of: I'm trying to write a github cron job that checks out its own repo, appends a line to a text file and then commits and pushes the change back to the repo. Should be possible right? | 11:43 |
|
| but im puzzled about how to do the commit and push part. I was thinking of a bash script like this: https://hastebin.com/uqiquliteg.bash | 11:44 |
|
| but how do I now run this bash file as the last step of my cron job? Do I just simply add -run: myBashScript.sh | 11:45 |
|
| ? | 11:45 |
|
jast
| in principle that looks okay, though "git add ." is a superset of what the "-a" flag for "git commit" does (assuming you're running it from the top level of the repo) | 11:45 |
|
| so you don't need both :) | 11:45 |
|
Assault
| ok ill try | 11:46 |
|
jast
| and I have no idea what "-run" is in the context of cronjobs. do you have some kind of special interface for defining cronjobs that works differently from a traditional crontab? | 11:46 |
| ← LuKaRo left | 11:48 |
|
bremner
| I guess here "github cron job" is a misnomer | 11:49 |
|
| something about github actions? | 11:49 |
| → LuKaRo_ joined | 11:49 |
|
jast
| if it's github actions, you probably won't be able to do this, unless they have some kind of specialized action to do this kind of thing | 11:52 |
|
| that said I've never actually used github actions | 11:52 |
|
mackerman
| Ask ##github channel if it is GitHub actions | 11:53 |
|
jast
| also if you do manage to make it work with actions, I suppose in that context no SSH key with push access might be available, so that's something to figure out potentially | 11:54 |
| ← coot left | 11:59 |
| → roadie joined | 12:00 |
| → ferdna joined | 12:01 |
|
nyuszika7h
| I have a repo called foo and a repo called foo-private both checked out in one directory. I want the local main branch to go to foo/main, and the local private branch to go to foo-private/main. I managed to set it up for pulls, but pushes keep going to foo-private/private instead. how do I fix this? | 12:02 |
|
| I've done `git branch --set-upstream-to=private/main private` and `git push -u private private:main` | 12:02 |
|
| git 2.31.0 btw, in case this is a bug in an older version (I should probably update) | 12:03 |
|
| nvm, `git config --global push.default upstream` did it | 12:04 |
| → potash joined | 12:06 |
| ← roadie left | 12:09 |
| → antani joined | 12:11 |
| → FatGogeta joined | 12:12 |
| → thiago joined | 12:12 |
| → dskull joined | 12:13 |
|
Assault
| bremner, yeah, I mean github actions | 12:14 |
| ← antani left | 12:15 |
| ← vyryls left | 12:15 |
| → vyryls joined | 12:16 |
| Noisytoot_ → Noisytoot | 12:19 |
| → xx joined | 12:20 |
| → dcpc007 joined | 12:21 |
| → roadie joined | 12:21 |
| ← vyryls left | 12:23 |
| → momomo joined | 12:24 |
| ← Visne left | 12:26 |
| ← dionysus69 left | 12:27 |
| → Visne joined | 12:28 |
| ← cbreak left | 12:28 |
| → zer0bitz joined | 12:31 |
| → cbreak joined | 12:31 |
| → dionysus69 joined | 12:32 |
| → gryffus joined | 12:36 |
| ← dionysus69 left | 12:36 |
| → maret joined | 12:37 |
| → cdown_ joined | 12:37 |
|
momomo
| Is there a way to avoid having to copy and paste on create new branch and first push ? | 12:38 |
|
| git push --set-upstream origin remove-continuum-flag-for-sa-links | 12:38 |
|
| it should get it in my opinion, it is suggesting it | 12:39 |
|
osse
| momomo: git push -u origin HEAD | 12:39 |
|
| or even @ in recent versions | 12:40 |
| ← cdown left | 12:40 |
| cdown_ → cdown | 12:40 |
| ← cristiioan left | 12:42 |
| → dionysus69 joined | 12:42 |
|
momomo
| osse even longer | 12:43 |
|
| how am I going to remember that | 12:43 |
| → catern joined | 12:46 |
|
osse
| momomo: ? | 12:48 |
|
| is HEAD longer than remove-continuum-flag-for-sa-links ? | 12:48 |
|
| osse rubs eyes | 12:48 |
|
ikke
| git config alias.pushu 'push -u origin HEAD' | 12:49 |
|
| git pushu | 12:49 |
| → minimal joined | 12:50 |
| → cristiioan joined | 13:05 |
| ← Albright left | 13:10 |
| → Albright joined | 13:11 |
| → madewokherd joined | 13:13 |
| ← roadie left | 13:18 |
| → skapata joined | 13:19 |
| ← Assault left | 13:19 |
| ← tulpa_ left | 13:21 |
| → lucasta joined | 13:28 |
| → adelfino joined | 13:32 |
|
adelfino
| Hi! Question: is there a command that let me recover changes from past commits? Basically: diff against previous commit, do some changes, and commit changes. Similar to dealing with conflicts | 13:33 |
| → The_Blode_ joined | 13:35 |
| ← mfiano left | 13:35 |
| ← feriman left | 13:35 |
| → mfiano joined | 13:36 |
| ← dionysus69 left | 13:40 |
| ← nwoob_ left | 13:41 |
| → cdown_ joined | 13:41 |
|
mackerman
| adelfino: You may diff against previous commits, revert them which commits a patch that undoes them, or cherry-pick the changes of a commit and apply it somewhere else | 13:41 |
| ← f451 left | 13:41 |
| ← cristiioan left | 13:42 |
| → roadie joined | 13:43 |
| ← shokohsc left | 13:43 |
| ← OnkelBlade left | 13:44 |
| ← cdown left | 13:44 |
| cdown_ → cdown | 13:44 |
| → shokohsc joined | 13:45 |
| ← lucasta left | 13:45 |
| → f451 joined | 13:45 |
| → lucasta joined | 13:46 |
| → iomari891 joined | 13:47 |
| → lgc joined | 13:48 |
| → Assault joined | 13:48 |
| ← Sulky_ left | 13:49 |
|
mackerman
| Maybe sketch out a brief history, and describe what you want to do, so we can discuss specifics. | 13:49 |
| ← keypusher left | 13:50 |
| → keypusher joined | 13:53 |
| ← Assault left | 13:53 |
| ← lgc left | 13:54 |
| ← roadie left | 13:55 |
| ← lucasta left | 13:58 |
| → lucasta joined | 14:01 |
| ← FatGogeta left | 14:02 |
| ← Visor left | 14:02 |
| → dionysus69 joined | 14:03 |
|
adelfino
| mackerman, yeah, I thinking a git diff + interactive git apply could work | 14:03 |
|
| Not finding an interactive git apply though :P | 14:03 |
| → sa0 joined | 14:05 |
|
adelfino
| It's okay, I can handle it, thanks for your help | 14:06 |
| → oriba joined | 14:06 |
| ← _sa0sin_ left | 14:08 |
| ← Rashad left | 14:10 |
| → Visor joined | 14:12 |
| → cristiioan joined | 14:13 |
| ← iomari891 left | 14:16 |
| ← Visor left | 14:18 |
| → roadie joined | 14:20 |
| → Visor joined | 14:20 |
| ← adelfino left | 14:22 |
| ← roadie left | 14:25 |
| → Rashad joined | 14:25 |
| → vladoski joined | 14:26 |
| → gas51627 joined | 14:27 |
| → iomari891 joined | 14:28 |
| → gast0n joined | 14:29 |
| → tulpa_ joined | 14:35 |
| ← lucasta left | 14:43 |
| → roadie joined | 14:45 |
| ← gryffus left | 14:47 |
| ← iomari891 left | 14:47 |
| ← maret left | 14:48 |
| → iomari891 joined | 14:50 |
| ← cristiioan left | 14:55 |
| ← rfuentess left | 14:56 |
| ← Anticom left | 15:01 |
| → cristiioan joined | 15:01 |
|
anddam
| I have a repo with two branches, one public one private with stuff that should not go public | 15:03 |
| ← vicecea left | 15:03 |
| → vicecea joined | 15:04 |
|
anddam
| I do occasional merges of private into public and I manually check that the files that have to be private are not committed, I am passing off this repo, how can I guard future maintainer from publishing unwanted files? | 15:04 |
|
ikke
| anddam: pre-receive hook on the server | 15:04 |
|
anddam
| I figure the answer is some pre-commit hook, | 15:04 |
|
| ikke: oh beated me to my own question | 15:05 |
|
| on the server? | 15:05 |
|
ikke
| yes | 15:05 |
|
anddam
| no this has to be on the local clone | 15:05 |
|
ikke
| client-side hooks are optional. If someone would clone the repo again, you'd not have the hooks | 15:05 |
| ← roadie left | 15:05 |
|
anddam
| unless I put it into README.md | 15:05 |
|
| to be more clear I was maintaining this for current employer, I am leaving and passing this over | 15:06 |
|
| optional is fine as long as I document it and provide the script | 15:07 |
|
| public repo is third party on github | 15:07 |
| → dviola joined | 15:07 |
| ← Murr left | 15:08 |
| → Murr joined | 15:09 |
| → whatsupdoc joined | 15:09 |
| → roadie joined | 15:12 |
| ← csm3105 left | 15:16 |
| → nate1 joined | 15:17 |
|
anddam
| ikke: any more wisdom for me? | 15:18 |
|
| even if it's "drop it, you are doomed" | 15:18 |
| → rgrinberg joined | 15:18 |
| ← BrianBlaze left | 15:19 |
| → Kangie joined | 15:19 |
| ← nate1 left | 15:22 |
| → BrianBlaze joined | 15:23 |
| → madewokherd` joined | 15:23 |
| → zebrag joined | 15:25 |
| → Assault joined | 15:26 |
| ← madewokherd left | 15:27 |
| ← dcpc007 left | 15:27 |
| ← rgrinberg left | 15:30 |
| ← ghost43 left | 15:32 |
| → rgrinberg joined | 15:32 |
| → ghost43 joined | 15:32 |
|
mackerman
| You are doomed, client side hooks are not reliable as access control | 15:33 |
| → clime joined | 15:34 |
| → feriman joined | 15:34 |
| ← rgrinberg left | 15:34 |
|
mackerman
| Split the public part off to a seperate repo, and restrict access to the private repo | 15:35 |
| OpenSource → UNIX | 15:36 |
| → coot joined | 15:43 |
| ← Assault left | 15:48 |
| ← tyson2 left | 15:48 |
| ← mncheck left | 15:48 |
| → cdown_ joined | 15:51 |
| → nate1 joined | 15:53 |
| ← cdown left | 15:54 |
| cdown_ → cdown | 15:54 |
| ← RiFo left | 16:05 |
| → OnkelBlade joined | 16:06 |
| ← iomari891 left | 16:09 |
| → kenanmarasli joined | 16:09 |
| ← rsx left | 16:10 |
|
anddam
| splitting is easy, the point is then merging off of a different repo | 16:10 |
|
| oh wait I can just use local fs and network URIs for remotes | 16:11 |
|
| me and $AnotherGuy were sharing tools so we added "private" stuff to the repo, stuff only meant for building or certificates for authentication to internal tools | 16:12 |
|
hays
| is there a way to collapse a series of embarrassing commits into one? :) | 16:13 |
| → iomari891 joined | 16:13 |
|
anddam
| then we need to "polish & publish" so we devised to "let's just not push the private stuff" | 16:13 |
|
| hays: squashing | 16:13 |
|
ikke
| !fixup | 16:14 |
|
gitinfo
| So you lost or broke something or need to otherwise find, fix, or delete commits? Look at https://sukima.github.io/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history! | 16:14 |
|
ikke
| oh, wrong | 16:14 |
|
| !perfect | 16:14 |
|
gitinfo
| [!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.io/GitPostProduction talks you through how to use 'rebase -i' to do this. | 16:14 |
|
anddam
| hays: there's the Law of Embarrass Conservation though, the total embarassment won't get less, it's just concentrated in that one commit | 16:14 |
|
hays
| lol | 16:14 |
|
| the commit history shows me slowly learning boto3 from a boto example.. very bad | 16:15 |
|
| knowing neither, porting the code | 16:15 |
| ← nate1 left | 16:15 |
| ← Matt|home left | 16:16 |
|
hays
| hmm googling shows me maybe the best way is make a new branch and merge --squash into it | 16:18 |
|
mackerman
| In reality, few people will look at your commits, and fewer will be offended or even care that much. | 16:19 |
|
ikke
| git rebase -i master | 16:19 |
|
hays
| mackerman: probably true | 16:19 |
| → Assault joined | 16:21 |
| ← tulpa_ left | 16:21 |
| → tulpa__ joined | 16:21 |
| ← iomari891 left | 16:22 |
| → rsx joined | 16:22 |
| ← Assault left | 16:25 |
| → coldmountain joined | 16:25 |
| ← crabbedhaloablut left | 16:26 |
| ← hans_ left | 16:26 |
| → crabbedhaloablut joined | 16:27 |
|
hays
| ikke: clean | 16:27 |
| → cdown_ joined | 16:30 |
| ← cdown left | 16:32 |
| cdown_ → cdown | 16:33 |
| ← feriman left | 16:34 |
| → feriman joined | 16:35 |
| → jazzy joined | 16:35 |
| → Guest70 joined | 16:36 |
| → Betal joined | 16:37 |
| ← dionysus69 left | 16:39 |
| → rgrinberg joined | 16:39 |
| ← erarnitox left | 16:39 |
| ← vladoski left | 16:40 |
| → erarnitox joined | 16:41 |
| → iomari891 joined | 16:41 |
| ← ghost43 left | 16:42 |
| → nate1 joined | 16:42 |
| → ghost43 joined | 16:43 |
| ← SleePy left | 16:44 |
| ← prime- left | 16:44 |
| → astlep550 joined | 16:44 |
| ← astlep55 left | 16:45 |
| → justache- joined | 16:45 |
| ← Fischmie1 left | 16:45 |
| → SleePy joined | 16:45 |
| → berkay joined | 16:45 |
| ← berkay_ left | 16:45 |
| ← Linkandzelda left | 16:46 |
| ← Henry151 left | 16:46 |
| ← _qw left | 16:46 |
| ← justache left | 16:46 |
| → Linkandzelda_ joined | 16:46 |
| ← iomari891 left | 16:46 |
| Linkandzelda_ → Linkandzelda | 16:47 |
| → Fischmie1 joined | 16:47 |
| → _qw joined | 16:48 |
| → iomari891 joined | 16:48 |
| → prime joined | 16:48 |
| → Henry151 joined | 16:48 |
| → tyson2 joined | 16:51 |
| → cdown_ joined | 16:52 |
| ← ghost43 left | 16:53 |
| → ghost43 joined | 16:54 |
| ← iomari891 left | 16:54 |
| → iomari891 joined | 16:55 |
| ← cdown left | 16:55 |
| cdown_ → cdown | 16:55 |
|
pulse
| when i do: git branch --sort=-committerdate -r | 16:56 |
| → wootehfoot joined | 16:56 |
|
pulse
| is the first line the most recent one | 16:56 |
|
| (first line of output) | 16:56 |
| → dtux joined | 16:56 |
|
pulse
| i want to find the branch with most recent changes | 16:56 |
|
| am i doing this right | 16:56 |
| ← carl- left | 16:57 |
|
pulse
| nvm i found git branch -v | 17:00 |
| ← Guest70 left | 17:02 |
| → dionysus69 joined | 17:04 |
| → maret joined | 17:07 |
| → Wh0 joined | 17:08 |
| ← Murr left | 17:08 |
| → Matt|home joined | 17:08 |
| → Murr joined | 17:09 |
| ← coot left | 17:09 |
| → Null_A joined | 17:19 |
| ← fling left | 17:23 |
| ← ghost43 left | 17:23 |
| ← crabbedhaloablut left | 17:23 |
| → ghost43 joined | 17:24 |
| → crabbedhaloablut joined | 17:24 |
| → fling joined | 17:25 |
| ← ghost43 left | 17:26 |
| ← rgrinberg left | 17:26 |
| → ghost43 joined | 17:26 |
| ← dionysus69 left | 17:29 |
| → rgrinberg joined | 17:30 |
| ← rgrinberg left | 17:31 |
| → rgrinberg joined | 17:34 |
| ← rsx left | 17:41 |
| → ferr_ joined | 17:41 |
| ← fercell left | 17:43 |
| ← rektide_ left | 17:44 |
| ← nate1 left | 17:44 |
| ← rgrinberg left | 17:46 |
| ← EvilDMP left | 17:47 |
| ← iomari891 left | 17:48 |
| → rgrinberg joined | 17:49 |
| ← TonyStone left | 17:50 |
| ← cristiioan left | 17:50 |
| → TonyStone joined | 17:51 |
| → lucasta joined | 17:51 |
| → nate1 joined | 17:52 |
| → remyabel2 joined | 17:53 |
| ← Null_A left | 17:54 |
| ← mven left | 17:57 |
| → mven joined | 17:58 |
| → Null_A joined | 17:59 |
| → Null_A_ joined | 18:00 |
| → hamburgler joined | 18:03 |
| ← tulpa__ left | 18:03 |
| ← dsrt^ left | 18:03 |
| → ChmEarl joined | 18:03 |
| ← Null_A left | 18:03 |
| → tulpa_ joined | 18:04 |
| ← TomyWork left | 18:04 |
| ← ferdna left | 18:07 |
| ← igemnace left | 18:10 |
| → hoochmonger joined | 18:10 |
| → FH_thecat joined | 18:10 |
| → dsrt^ joined | 18:13 |
| → velix joined | 18:13 |
|
velix
| Does anyone know a GIT gui, where I can commit specific lines only? For example, I've added one functions and changed another and I want two commits for these two changes. Sure, lots of copy+paste will do. But I'd love to just commit function 1 and then function 2. | 18:14 |
|
ikke
| git gui | 18:14 |
| ← remyabel2 left | 18:16 |
| ← maret left | 18:17 |
| ← roadie left | 18:17 |
| ← wootehfoot left | 18:18 |
| → maret joined | 18:18 |
| ← maret left | 18:18 |
| → maret joined | 18:19 |
| → remyabel2 joined | 18:19 |
| → coot joined | 18:19 |
| ← maret left | 18:21 |
| → Assault joined | 18:21 |
| → maret joined | 18:21 |
| → lolok joined | 18:22 |
| ← crabbedhaloablut left | 18:26 |
| ← Swahili left | 18:27 |
| → crabbedhaloablut joined | 18:27 |
| ← crabbedhaloablut left | 18:28 |
| → crabbedhaloablut joined | 18:28 |
| ← Wh0 left | 18:29 |
| → Wh0 joined | 18:29 |
| ← epony left | 18:31 |
| ← tyson2 left | 18:32 |
| → epony joined | 18:33 |
|
bookworm
| fugitive/ magit | 18:34 |
|
ikke
| tig | 18:34 |
| ← vicecea left | 18:35 |
| ← Rashad left | 18:35 |
|
bookworm
| turtoise ? Or some such | 18:35 |
|
| gitextension | 18:36 |
| → vicecea joined | 18:36 |
| ← enoq left | 18:36 |
| ← Masklin left | 18:37 |
| ← erarnitox left | 18:39 |
| → erarnitox joined | 18:40 |
| → Lord_of_Life_ joined | 18:40 |
| ← Lord_of_Life left | 18:41 |
| ← FH_thecat left | 18:41 |
| → roadie joined | 18:42 |
| Lord_of_Life_ → Lord_of_Life | 18:43 |
| ← remyabel2 left | 18:44 |
|
puff
| Good afternoon. | 18:44 |
|
bookworm
| time appropriate greetings, can we help? | 18:46 |
| ← roadie left | 18:47 |
| → cristiioan joined | 18:47 |
|
potash
| Good afternoon. | 18:47 |
|
puff
| I was talking to a friend yesterday and he was complaining about how git's CLI doesn't make it easy to analyze the changes from a larger commit. | 18:48 |
|
| He wasn't very coherent about what he was having a problem with, I'm still working on that. | 18:48 |
|
bookworm
| luckily for us there $EDITOR | 18:48 |
|
| there's* | 18:48 |
|
puff
| But one thing that came out of the conversation was that I'm wondering if there's some option to set an environment variable or otherwise be able to pass in commithashA:commithashB other than by typing it on the command line. | 18:48 |
|
bookworm
| why would you want an env var? You can just expand that in your script in the arg position | 18:49 |
|
| or in other words, already exists 🤷♂️ | 18:49 |
|
| it's called basic shell | 18:49 |
|
puff
| He acutally has no problem with the patch format, etc... though I did try to tell him that some GUI diff tools (meld and intellij idea I think off the top of my head) let you specify a file and play forward/backward. | 18:49 |
|
| bookworm: Can you explain that in more detail? | 18:49 |
|
| The only git shell I'm aware of is the limited shell for remote access. | 18:50 |
|
bookworm
| normal™ people eventually get fed up and write git aliases, because no sane™ person would ever type it all out manually | 18:50 |
|
ikke
| puff: what would a hypothetical env variable like that do? | 18:50 |
| → remyabel2 joined | 18:51 |
|
bookworm
| you can use whatever expansion you fancy in a git-$whatever script and shove that in your PATH | 18:51 |
|
puff
| ikke: export COMMITDIFF="commithashA commithashB", and then "git diff" diffs between those commits. | 18:51 |
|
bookworm
| then git whatever can expand whatever env var make sense for you, do arg validation, defaults etc. It's all just bash or sh or whatever else you want | 18:52 |
|
puff
| Ah, okay, so you're saying just do it in a shell script. | 18:52 |
|
bookworm
| or alias, yes | 18:52 |
|
| or just use the cli | 18:52 |
|
| an env var won't be faster | 18:52 |
|
puff
| Yeah, that's basically what I was thinking about, writing a shell script that's sort of a stateful git front end. | 18:52 |
|
| Though honestly I'd rather write it in python or something. | 18:53 |
|
bookworm
| ooor, just use your editor | 18:53 |
|
puff
| How does that solve the problem? | 18:53 |
|
bookworm
| because you can tell it to open up diffs in tabs / splits / whatever? | 18:54 |
| ← remyabel2 left | 18:54 |
|
bookworm
| and then navigate there from one command invocation | 18:54 |
|
puff
| That's not solving the problem I'm talking about. | 18:54 |
|
| It's not about just viewing diffs of a file from two different commits. | 18:54 |
|
| It's about browsing many files in a large commit. | 18:54 |
|
bookworm
| yeah? | 18:54 |
|
puff
| Yes. | 18:55 |
|
bookworm
| $EDITOR can do that | 18:55 |
|
| rather effectively | 18:55 |
|
puff
| I don't see how that applies. | 18:55 |
|
| Or to put it another way, it's orthogonal to the problem, at least as far as I can see. | 18:56 |
| ← cristiioan left | 18:57 |
| → cristiioan joined | 18:57 |
| → roadie joined | 18:59 |
| → Murr- joined | 18:59 |
|
furrymcg1e
| try git difftool -d -t meld <commit> | 19:00 |
| ← cristiioan left | 19:00 |
| → cdown_ joined | 19:00 |
| → remyabel2 joined | 19:01 |
| ← cdown left | 19:01 |
| cdown_ → cdown | 19:01 |
| ← Murr left | 19:02 |
| Murr- → Murr | 19:02 |
| → Rashad joined | 19:02 |
| ← rgrinberg left | 19:04 |
| ← dsrt^ left | 19:04 |
| ← zeenk left | 19:05 |
| ← xaxas left | 19:05 |
| → xaxas joined | 19:05 |
| ← coldmountain left | 19:05 |
|
puff
| furrymcg1e: Yeah, I'm familiar with meld and I love it for visual diffs. Again, that's not what I'm asking about. | 19:06 |
| ← roadie left | 19:07 |
| → roadie joined | 19:07 |
|
furrymcg1e
| git difftool -d compares large commits in browsable directories | 19:10 |
|
puff
| Yeah, I'm aware. It's really handy, and in general I like meld's UI for complex diffs. | 19:12 |
|
| And I did tell my friend to try out diffing with meld. | 19:12 |
| → tuxayo joined | 19:12 |
| → ulmanak joined | 19:12 |
|
puff
| But some people like the CLI better... frankly so do I, I generally only use meld for complex diffs, or directory diffs (which are certainly complex). | 19:13 |
| ← manin891 left | 19:13 |
| ← OnkelBlade left | 19:15 |
|
furrymcg1e
| tig is a very good for text-mode interface for git | 19:15 |
| ← roadie left | 19:15 |
|
puff
| Yeah, it looks neat. | 19:16 |
|
| I really have to take another look at magit, one of these days. | 19:17 |
| ← pulse left | 19:18 |
|
puff
| Hm. This web page seems to be implying (but doesn't state explicitly) that if you create a shell script named git-something and put it in your path (and chmod it etc) then "git something" will (presumably as long as there's no standard git subcommand named "something") then run that shell script. | 19:19 |
|
| http://thediscoblog.com/blog/2014/03/29/custom-git-commands-in-3-steps/ | 19:20 |
|
tuxayo
| Hi :) | 19:20 |
|
| Does anyone know a way to rebase a branch on another one commit at a time and stop when there is a conflict? | 19:20 |
|
| I'm rebasing a branch left for a year while the main upstream branch moved on. I rebase month by month (taking the 1st commit of dec, jan, feb, etc) to avoid getting unnecessarily complex conflict that are the merge of multiple conflicting changed. | 19:20 |
|
| That make conflict sections too large and too much diverging changes to process at the same time when examining the conflict section. | 19:20 |
|
| So I wonder if there is a way to rebase one by one automatically until hitting a conflict. | 19:20 |
|
ikke
| !imerge | 19:20 |
|
gitinfo
| https://github.com/mhagger/git-imerge -- a tool to split a large merge with many conflicts into many smaller merges, hopefully each with easier-to-understand small conflicts. | 19:20 |
|
ikke
| You can choose if the end result is a merge or a rebase | 19:21 |
| ← shailangsa left | 19:22 |
| → pulse joined | 19:22 |
|
tuxayo
| Interesting! | 19:22 |
| ← ntz left | 19:23 |
| → ntz joined | 19:23 |
|
tuxayo
| > figure out exactly which pairs of commits conflict | 19:24 |
|
| Great! That does what I wanted via a commit by commit rebase | 19:24 |
| ← momomo left | 19:25 |
| → momomo joined | 19:26 |
|
tuxayo
| Even with a talk to present the tool :) | 19:28 |
|
| Thanks ikke ! | 19:28 |
|
ikke
| :) | 19:28 |
| ← coot left | 19:29 |
| ← Assault left | 19:35 |
| → roadie joined | 19:41 |
| → Guest11 joined | 19:45 |
| ← Guest11 left | 19:46 |
| ← roadie left | 19:46 |
| → dsrt^ joined | 19:47 |
| → Trieste joined | 19:47 |
| ← Jong left | 19:48 |
| → shailangsa joined | 19:51 |
| ← remyabel2 left | 19:51 |
| → roadie joined | 19:55 |
| ← cdown left | 19:57 |
| ← otisolsen70 left | 20:00 |
| → bloody joined | 20:00 |
| ← paddymahoney left | 20:03 |
| → m0viefreak joined | 20:04 |
| ← Null_A_ left | 20:09 |
| → Null_A joined | 20:09 |
| ← srinidhi left | 20:12 |
| → remyabel2 joined | 20:15 |
| ← feriman left | 20:15 |
| → Jong joined | 20:16 |
|
momomo
| I am trying to google but having difficulty finding any quality responses. Are there any closed source, propertiary and commercial licenses for code released on github? It means I want to publish it but to use it you need to contact us and pay first. For any kind of commercial utilization. Personal / private utilization might be ok. | 20:18 |
|
ajak
| momomo: let's maybe look at it this way: what are you trying to do? | 20:19 |
| → Assault joined | 20:21 |
|
ikke
| SSPL is a AGPL like license | 20:21 |
| → mir3272 joined | 20:23 |
|
mir3272
| after a potential fs corruption, how do I check my working copies are intact? objects is easy (git fsck), but working copies may have delta that would be unrecognised because the metadata like mtime didn’t change | 20:23 |
| ← Assault left | 20:26 |
| ← ulmanak left | 20:26 |
| ← dsrt^ left | 20:26 |
| ← chexum left | 20:28 |
| ← crabbedhaloablut left | 20:28 |
| → chexum joined | 20:29 |
| ← nivag left | 20:30 |
|
ikke
| mir3272: crude method is rm .git/index && git reset | 20:30 |
| → nivag joined | 20:30 |
| ← oriba left | 20:33 |
| ← chexum left | 20:33 |
| → chexum joined | 20:33 |
| → V__ joined | 20:33 |
| → crabbedhaloablut joined | 20:34 |
|
ikke
| I can't find an option for update-index for something like this | 20:34 |
|
m0viefreak
| maybe git read-tree HEAD? | 20:35 |
| → rgrinberg joined | 20:35 |
|
ikke
| m0viefreak: that writes HEAD into the index | 20:35 |
|
| not the working tree | 20:36 |
|
m0viefreak
| yes, isn't that the idea? | 20:36 |
|
ikke
| no | 20:36 |
|
| they want to verify the working tree matches the index | 20:37 |
| ← crabbedhaloablut left | 20:37 |
|
mir3272
| exactly, and without any caching of info | 20:37 |
|
ikke
| git stores stat info in the index. if the stat info matches, git won't check the contents of the files | 20:38 |
|
m0viefreak
| ah, yeah then the crude way, or 'git read-tree --empty && git reset' if you don't want to mess around in file-system manually | 20:38 |
|
mir3272
| no option to invalidate the cached info? | 20:38 |
| → bambanxx joined | 20:40 |
|
ikke
| rm .git/index :P | 20:41 |
| ← ChmEarl left | 20:41 |
| ← hoochmonger left | 20:42 |
| → cweiss07653212 joined | 20:42 |
| → hans_ joined | 20:42 |
|
mir3272
| that’s what I thought at first, but it’ll show everything as deleted/added | 20:43 |
| → ZacSharp joined | 20:43 |
|
ikke
| then run git reset | 20:44 |
|
| or git read-tree HEAD | 20:44 |
| ← terminaldweller left | 20:45 |
| ← cweiss07653212 left | 20:45 |
| ← lucasta left | 20:45 |
| ← zer0bitz left | 20:45 |
| → Ajax1460 joined | 20:46 |
| justache- → justache | 20:46 |
| ← Ajax146 left | 20:48 |
| Ajax1460 → Ajax146 | 20:48 |
| → crabbedhaloablut joined | 20:48 |
| ← Rashad left | 20:50 |
| → terminaldweller joined | 20:50 |
| → cweiss07653212 joined | 20:55 |
| → forgotmynick joined | 20:55 |
| ← roadie left | 20:55 |
| → roadie joined | 20:55 |
| → ChmEarl joined | 20:58 |
| ← roadie left | 21:01 |
| ← ZacSharp left | 21:04 |
|
ldericher
| not sure if this is the right place to ask ... but does adding a license to a software repository apply it retroactively? like what about the first N commits that don't have a license file? | 21:05 |
|
mackerman
| ldericher: Ask an IP lawyer | 21:07 |
|
mir3272
| not normally; ask the owner for a licence for the old versions | 21:09 |
| ← kenanmarasli left | 21:17 |
| ← cweiss07653212 left | 21:21 |
| → EvilDMP joined | 21:21 |
| ← V__ left | 21:22 |
| → roadie joined | 21:26 |
| → rama joined | 21:27 |
| ← Wh0 left | 21:28 |
| → coot joined | 21:28 |
| ← llh left | 21:29 |
| ← velix left | 21:30 |
| ← maret left | 21:34 |
| ← roadie left | 21:35 |
| → llh joined | 21:36 |
| ← zebrag left | 21:36 |
| ← bambanxx left | 21:40 |
| ← crabbedhaloablut left | 21:45 |
| → crabbedhaloablut joined | 21:45 |
| ← coot left | 21:52 |
|
tuxayo
| I wonder if I can use git imerge for backporting. (currently I'm just cherry-picking) I think not. | 21:57 |
|
| To use imerge it would have to revert hundreds of commits from the upstream branch to get it back to the point the old release branch forked with the upstream branch. | 21:57 |
|
| All while keeping applied the commits that one wants to backport. And then when at the point of the fork, we need to apply the patches that the old release branch got since the 1st release/fork at least that part is regular imerge operation. | 21:57 |
|
| It might cause to get unnecessary conflicts when undoing patches that the old branch got via backport. Because the patches will be applied again. And then there are dependencies. Like patch 1 is backported and patch 2 depends on patch 1 but isn't yet backported. When backporting patch 2, undoing patch 1 will cause a mess. | 21:58 |
|
| Ok so my idea isn't practical. Maybe with matching the commits messages between the upstream and old branch to not undo those already present? That seems very messy. | 21:58 |
|
| Anyway, can git imerge be of use for backporting? Could a tool with similar principles be done for backporting or is the problem inherently incompatible? | 21:58 |
| → roadie joined | 22:01 |
| → stewie925 joined | 22:01 |
| ← skapata left | 22:04 |
| ← nate1 left | 22:04 |
| → skapata joined | 22:10 |
| → cweiss07653212 joined | 22:12 |
| ← roadie left | 22:12 |
| ← mir3272 left | 22:23 |
| → Murr- joined | 22:26 |
| → ZacSharp joined | 22:26 |
| ← Murr left | 22:28 |
| Murr- → Murr | 22:28 |
| → nate1 joined | 22:30 |
| → bigGopher joined | 22:33 |
| ← crabbedhaloablut left | 22:39 |
| ← Novi left | 22:39 |
| → roadie joined | 22:39 |
| → crabbedhaloablut joined | 22:39 |
| ← nate1 left | 22:41 |
| ← roadie left | 22:43 |
| → riposte joined | 22:44 |
| ← finalriposte left | 22:45 |
| ← rgrinberg left | 22:49 |
| ← vdamewood left | 22:50 |
| ← hans_ left | 22:52 |
| → lucasta joined | 22:53 |
| → ofl^ joined | 22:57 |
| ← tulpa_ left | 23:02 |
| ← ZacSharp left | 23:03 |
| ← gas51627 left | 23:06 |
| ← Murr left | 23:08 |
| → Murr joined | 23:08 |
| → Novi joined | 23:09 |
| ← m0viefreak left | 23:10 |
| ← theoceaniscool left | 23:11 |
| ← clime left | 23:12 |
| ← stewie925 left | 23:18 |
| → vyryls joined | 23:19 |
| → hoochmonger joined | 23:20 |
| → _vanessa_ joined | 23:21 |
| ← lolok left | 23:22 |
| ← vyryls left | 23:23 |
| ← vanessa left | 23:23 |
| → P1RATEZ joined | 23:24 |
| ← ofl^ left | 23:27 |
| ← The_Blode_ left | 23:32 |
| → vyryls joined | 23:33 |
| → crundar joined | 23:34 |
| → sudoforge joined | 23:43 |
| → nate1 joined | 23:47 |
| ← FinnElija left | 23:48 |
| ← Aminda left | 23:49 |
| → FinnElija joined | 23:49 |
| → Aminda joined | 23:50 |
| → roadie joined | 23:51 |
| ← LuKaRo_ left | 23:52 |
| → YuGiOhJCJ joined | 23:56 |
| ← alfredb left | 23:57 |
| → alfredb joined | 23:59 |
| → agrosant joined | 23:59 |
| ← agrosant left | 23:59 |
| ← nyah left | 23:59 |
| → LuKaRo joined | 23:59 |
| ← Jong left | 23:59 |