| 2021-09-28 |
| → pinage404 joined | 00:01 |
| ← hornhack left | 00:01 |
| → tuxayo joined | 00:02 |
| → Helmholtz joined | 00:05 |
| → christall joined | 00:05 |
| → Vipulk joined | 00:06 |
| → ormaaj joined | 00:08 |
| ← alzgh left | 00:10 |
| → alzgh joined | 00:11 |
| → nabaiste^ joined | 00:12 |
| ← R2robot left | 00:19 |
| → R2robot joined | 00:23 |
| → cliluw joined | 00:25 |
| ← christall left | 00:30 |
| ← ZacSharp left | 00:31 |
| → hbautista_ joined | 00:31 |
| ← hbautista left | 00:34 |
| ← Samian left | 00:39 |
| → SpeakerToMeat joined | 00:42 |
|
SpeakerToMeat
| Hi | 00:42 |
|
| Quick stupid question, is there any form of add which will add all the changed files to the commit, but none of the untracked ones? | 00:42 |
| ← subopt left | 00:45 |
| → Samian joined | 00:47 |
| ← cliluw left | 00:48 |
| ← nyah left | 00:49 |
| ← hbautista_ left | 00:50 |
| → drew` joined | 00:50 |
|
bremner
| isn't that one of the documented options (maybe -A?) | 00:52 |
| → hbautista joined | 00:52 |
| → ttree joined | 00:54 |
| → Null_A joined | 00:56 |
| → hqdruxn08_ joined | 00:57 |
| → hqdruxn08__ joined | 00:59 |
| → getSomethingGood joined | 00:59 |
| ← hqdruxn08 left | 01:01 |
| ← hqdruxn08_ left | 01:03 |
|
BtbN
| SpeakerToMeat, commit -a will do that, but it's not exactly the same obviously | 01:03 |
|
SpeakerToMeat
| I found a hint somewhere. | 01:05 |
|
| git add -u | 01:05 |
| ← Null_A left | 01:07 |
| ← bambanxx left | 01:08 |
| ← alzgh left | 01:11 |
| ← lxsameer left | 01:13 |
| → Null_A joined | 01:14 |
| ← emf left | 01:18 |
| ← Null_A left | 01:26 |
| → Null_A joined | 01:26 |
| ← EvilDMP left | 01:27 |
| → jcbjoe2021 joined | 01:38 |
| ← _xor left | 01:40 |
| → christall joined | 01:41 |
| ← kilobyte_ch left | 01:42 |
| → kilobyte_ch joined | 01:44 |
| ← ChmEarl left | 01:45 |
| ← christall left | 01:45 |
| ← retroid_ left | 01:49 |
| ← Samian left | 01:51 |
| ← adlternative left | 01:53 |
| ← gast0n left | 01:54 |
| → stats4647 joined | 02:01 |
| → gast0n joined | 02:03 |
| ← Null_A left | 02:06 |
| ← stats4647 left | 02:06 |
| → ferdna joined | 02:08 |
| ← kilobyte_ch left | 02:14 |
| → Null_A joined | 02:24 |
| → kilobyte_ch joined | 02:28 |
| ← Null_A left | 02:28 |
| ← ttree left | 02:30 |
| → _xor joined | 02:32 |
| → mooz joined | 02:37 |
| ← FinnElija left | 02:39 |
| → FinnElija joined | 02:40 |
| → jcbjoe2021_ joined | 02:41 |
| ← terrorjack left | 02:49 |
| → gouldsam joined | 02:52 |
| → sudoforge joined | 02:52 |
| ← jcbjoe2021 left | 03:07 |
| jcbjoe2021_ → jcbjoe2021 | 03:07 |
| → vysn joined | 03:12 |
| → Treleure joined | 03:21 |
| → node1 joined | 03:29 |
| ← AbleBacon left | 03:30 |
| ← mooz left | 03:32 |
| → ttree joined | 03:34 |
| → justsomeguy joined | 03:37 |
| → Tetractys joined | 03:40 |
| ← justsomeguy left | 03:41 |
| → christall joined | 03:42 |
| → node1_ joined | 03:44 |
| ← node1_ left | 03:44 |
| → node1_ joined | 03:44 |
| ← node1 left | 03:48 |
| → Samian joined | 03:50 |
| ← node1_ left | 03:51 |
| ← navidr left | 03:58 |
| ← lgc left | 04:01 |
| → bytehackr_ joined | 04:06 |
| ← ttree left | 04:10 |
| ← drogas left | 04:14 |
| → srinidhi joined | 04:16 |
| ← christall left | 04:18 |
| ← fjmorazan left | 04:20 |
| → fjmorazan joined | 04:20 |
| → mooz joined | 04:25 |
| ← gast0n left | 04:27 |
| ← stkrdknmibalz left | 04:34 |
| → darkstardevx joined | 04:37 |
| → zumba_addict joined | 04:45 |
| → ThomasD13 joined | 04:48 |
| → aniruddha joined | 04:51 |
| ← nabaiste^ left | 04:56 |
| ← gouldsam left | 05:00 |
| ← hbautista left | 05:02 |
| ← Treleure left | 05:07 |
| defjam → clouding | 05:07 |
| ← YuGiOhJCJ left | 05:10 |
| clouding → defjam | 05:14 |
| → dimi1947 joined | 05:19 |
| → stats4647 joined | 05:20 |
| ← Murr left | 05:21 |
| → Murr joined | 05:22 |
| ← stats4647 left | 05:24 |
| ← getSomethingGood left | 05:27 |
| Hash → JudyRuliani | 05:35 |
| JudyRuliani → JudyRiuliani | 05:35 |
| ← crabbedhaloablut left | 05:36 |
| → crabbedhaloablut joined | 05:37 |
| → rfuentess joined | 05:46 |
| ← jkordani left | 05:49 |
| → retroid_ joined | 05:49 |
| ← mic4ael left | 05:55 |
| → mic4ael joined | 05:55 |
| → nightstrike joined | 05:55 |
| ← ferdna left | 05:56 |
| → twb joined | 05:58 |
|
twb
| This annoys me constantly: error: object a6727941433ee1c91a20ede6cb381af1d18c566d: missingSpaceBeforeDate: invalid author/committer line - missing space before date | 05:59 |
| ← sudoforge left | 05:59 |
|
twb
| How can I have transfer.fsckobjects=true by default, *BUT* turn it off for a single "git clone" command? | 05:59 |
| bytehackr_ → bytehackr | 05:59 |
|
twb
| i.e. I want git clone -o transfer.fsckobjects=false https://github.com/coreutils/coreutils | 05:59 |
|
| Oh damn. it's just git -c not git -o | 06:00 |
|
| The trick was looking in "man git" not "git --help" or "git config --help" | 06:00 |
|
gitinfo
| the git manpage is available at https://gitirc.eu/git.html | 06:00 |
| → af joined | 06:08 |
| → christall joined | 06:15 |
| → kenanmarasli joined | 06:20 |
| ← thiago left | 06:22 |
| drew` → drew | 06:24 |
| ← dimi1947 left | 06:32 |
| → otisolsen70 joined | 06:35 |
| ← Furai left | 06:46 |
|
hendry
| i have a strange issue where i'm modifing a file, commit it, and then on my git show it shows that i've deleted it. wth. | 06:48 |
| → Furai joined | 06:50 |
| → sQVe joined | 06:51 |
| ← christall left | 06:52 |
|
twb
| hendry: "git show" by default shows the most recent commit | 06:56 |
|
| hendry: perhaps you also did "git mv" or "git rm" and forgot? | 06:57 |
| → theoceaniscool joined | 06:59 |
| → alkino joined | 07:00 |
| → EvilDMP joined | 07:04 |
| ← EvilDMP left | 07:04 |
| ← unluckyshrubbery left | 07:04 |
| ← skapata left | 07:05 |
| → EvilDMP joined | 07:05 |
| ← sQVe left | 07:06 |
| ← Betal left | 07:06 |
| → mithrin joined | 07:08 |
|
mithrin
| Hey, how to add custom CA to git certificate store? | 07:08 |
|
twb
| What git certificate store | 07:09 |
|
| mithrin: http.sslCAPath ? | 07:09 |
| → alzgh joined | 07:11 |
|
twb
| mithrin: on Debian it looks like git (mostly) uses libcurl-gnutls so put your certificate in /usr/local/share/ca-certificates/fuck.crt and then run "sudo update-ca-certificates" | 07:12 |
|
mithrin
| git config --global http.sslBackend schannel helped | 07:12 |
|
twb
| mithrin: if you mean an SSH certificate, that goes in ~/.ssh/authorized_keys on the SSH server | 07:12 |
|
mithrin
| thank you all | 07:12 |
|
twb
| mithrin: interesting. Out of curiosity, what OS/distro are you using? | 07:12 |
|
mithrin
| Windows 10 Enterprise | 07:13 |
|
twb
| Ah OK | 07:13 |
| ← CalimeroTeknik left | 07:13 |
| → CalimeroTeknik joined | 07:13 |
|
twb
| Then yeah I guess schannel causes it to use the Windows system keyring? | 07:14 |
|
osse
| one of them | 07:15 |
|
| sounds relevant only for https | 07:15 |
| ← molt left | 07:17 |
|
twb
| Does git:// support TLS? I never really thought about it | 07:18 |
| ← reset left | 07:22 |
| ← ackyshake left | 07:22 |
| → skapata joined | 07:23 |
| ← skapata left | 07:23 |
| → skapata joined | 07:23 |
|
osse
| no clue | 07:23 |
|
twb
| I mean presumably the use case is something like "git clone https://github.com/…/euthanasia-howto" | 07:24 |
| → sQVe joined | 07:25 |
| ← jazzy left | 07:25 |
| → ackyshake joined | 07:25 |
|
ikke
| no, not natively | 07:28 |
|
| You could use some tls tunneling tool, but you'd have to use it on both sides of the connection | 07:29 |
|
twb
| ikke: thanks | 07:29 |
| ← Samian left | 07:31 |
| ← aniruddha left | 07:31 |
| → christall joined | 07:35 |
| ← durham left | 07:35 |
| ← vysn left | 07:37 |
| ← nrg left | 07:39 |
| → gouldsam joined | 07:39 |
| ← zumba_addict left | 07:39 |
| ← christall left | 07:40 |
| → nrg joined | 07:40 |
| → stats4647 joined | 07:41 |
| → durham joined | 07:41 |
| ← bn_work left | 07:45 |
| → gas51627 joined | 07:47 |
| ← ackyshake left | 07:47 |
| ← stats4647 left | 07:49 |
| → ackyshake joined | 07:50 |
| ← weyhmueller left | 07:55 |
| → weyhmueller joined | 07:55 |
| → aniruddha joined | 07:58 |
| → Guest1 joined | 07:59 |
| ← Guest1 left | 07:59 |
| → hornhack joined | 08:01 |
| → node1 joined | 08:01 |
|
node1
| Hi | 08:02 |
|
osse
| my name is | 08:02 |
|
node1
| Is there anyway to do silent installation of "git config with username/ secret tocken and remote repository" | 08:03 |
|
| secret token == password* | 08:03 |
| ← daoudr_ left | 08:03 |
|
node1
| silent here means unattended configuration. | 08:03 |
| ← hackinghorn left | 08:04 |
|
twb
| node1: are you just saving credentials into .git/config? | 08:04 |
| ← Tetractys left | 08:04 |
|
node1
| twb, yes if the action is unattended or silent. | 08:05 |
| → rsx joined | 08:05 |
|
node1
| twb, do you know anyway? | 08:06 |
|
twb
| node1: I don't know a way; that seems like something you should avoid | 08:07 |
|
node1
| why i should avoid? | 08:07 |
|
twb
| Because storing secrets outside of a TCB is shit | 08:07 |
|
| node1: when you say secret password, are you specifically referring to an SSH password? | 08:08 |
|
| node1: if so, upgrading to SSH keys is usually very easy. SSH certificates are even better, but are more work. | 08:09 |
|
node1
| github token which has least privilege access. | 08:09 |
|
twb
| ah OK I'm not familiar with that | 08:09 |
|
node1
| ok | 08:10 |
|
twb
| Because I am a lazy hipocrite, I just told github to trust my existing ~/.ssh/ed25519 | 08:10 |
|
| * ~/.ssh/id_ed25519 | 08:10 |
|
node1
| will promote ssh in my next version, till yet things should be simple. | 08:10 |
|
twb
| (Every time I go to clean up, I get bogged down trying to find a trustworthy handset, and ragequit) | 08:11 |
| ← mat001 left | 08:11 |
| → lxsameer joined | 08:12 |
| ← Oddly left | 08:14 |
| → Oddly joined | 08:14 |
|
node1
| !man gitcredentials | 08:16 |
|
gitinfo
| The git man pages are available online at https://gitirc.eu/git.html. Or were you looking for the "man git-foo" syntax (without the !)? | 08:16 |
|
| the gitcredentials manpage is available at https://gitirc.eu/gitcredentials.html | 08:16 |
| → pretty_dumm_guy joined | 08:17 |
|
twb
| node1: I'm just guessing, but have you tried git clone https://alice:swordfish@github.com/pornhub/memcachedb | 08:18 |
| ← hnOsmium0001 left | 08:19 |
|
node1
| twb, Your intention does not looks good to me. :( | 08:19 |
|
| node1 need to read and develop lot of things | 08:20 |
| ← node1 left | 08:20 |
| ← bytehackr left | 08:23 |
| ← rahl left | 08:29 |
| → furrymcgee joined | 08:30 |
| → rahl joined | 08:31 |
| → terrorjack joined | 08:32 |
| ← EvilDMP left | 08:38 |
| → EvilDMP joined | 08:40 |
| ← gouldsam left | 08:43 |
| → vdamewood joined | 08:50 |
| ← Lunatrius left | 08:52 |
| ← igemnace left | 08:52 |
| → igemnace joined | 08:54 |
| → drogas joined | 08:57 |
| ← elastic_dog left | 08:58 |
| ← ano left | 08:59 |
| → elastic_dog joined | 08:59 |
| → unluckyshrubbery joined | 09:09 |
| → hackinghorn joined | 09:12 |
| ← hornhack left | 09:14 |
| ← cmc left | 09:14 |
| → cmc joined | 09:15 |
| ← cmc left | 09:15 |
| → cmc joined | 09:16 |
| ← pulse left | 09:21 |
| ← Murr left | 09:21 |
| → Murr joined | 09:21 |
| → cousteau joined | 09:25 |
| ← bodiccea left | 09:38 |
| → natrys joined | 09:41 |
| → vladoski joined | 09:45 |
| → masber joined | 09:47 |
| → meator joined | 09:52 |
| ← durham left | 09:57 |
| → durham joined | 09:57 |
| → AnapodoPsalidi joined | 10:00 |
| ← AnapodoPsalidaki left | 10:00 |
| → ConstantDesc joined | 10:07 |
| ← furrymcgee left | 10:14 |
| → furrymcgee joined | 10:14 |
| → vlado joined | 10:16 |
| → christall joined | 10:16 |
| ← ConstantDesc left | 10:18 |
| ← vladoski left | 10:18 |
| → saroy joined | 10:32 |
| → rewrit3 joined | 10:33 |
| ← lxsameer left | 10:33 |
| ← af left | 10:36 |
| → mthall joined | 10:37 |
| ← skapata left | 10:39 |
| → af joined | 10:41 |
| → elkalamar joined | 10:41 |
| ← igemnace left | 10:42 |
| ← meator left | 10:46 |
| → Xaldafax joined | 10:55 |
| ← christall left | 10:56 |
| → amosbird_ joined | 10:56 |
| ← amosbird left | 10:56 |
| → ConstantDesc joined | 10:59 |
| → betelgeuse joined | 10:59 |
| → meator joined | 11:01 |
| → PCatinean joined | 11:05 |
| → tuskkk____ joined | 11:10 |
| → enoq joined | 11:14 |
| gxt_ → gxt | 11:18 |
| ← Vonter left | 11:26 |
| → Vonter joined | 11:27 |
| → SpeakerToMeat__ joined | 11:32 |
| ← SpeakerToMeat left | 11:33 |
| ← elkalamar left | 11:36 |
| ← ConstantDesc left | 11:38 |
| → lxsameer joined | 11:39 |
| → speckz joined | 11:41 |
| ← momomo left | 11:43 |
| → momomo joined | 11:47 |
| ← durham left | 11:47 |
| → durham joined | 11:48 |
| → ConstantDesc joined | 11:51 |
| ← speckz left | 11:51 |
| → bodiccea joined | 11:53 |
| ← srinidhi left | 11:54 |
| → sandipan joined | 11:58 |
| ← saroy left | 11:58 |
| → AbleBacon joined | 12:02 |
| ← durham left | 12:02 |
| → stats4647 joined | 12:03 |
| → spaceone joined | 12:05 |
|
spaceone
| is there some command to do git reset $file && git checkout $file in one step? | 12:05 |
| → durham joined | 12:06 |
| → tolot joined | 12:06 |
|
osse
| git checkout HEAD $file | 12:06 |
|
spaceone
| git reset @ "$file" | 12:06 |
|
| ah, thanks | 12:06 |
|
osse
| I think @ will work too | 12:07 |
|
jast
| but not with reset :) | 12:07 |
|
| @ is a shorthand for HEAD | 12:07 |
| ← stats4647 left | 12:08 |
|
jast
| quick reference: | 12:08 |
|
| !checkout | 12:08 |
|
gitinfo
| checkout does two different things! (1) no file/path argument: 'git checkout <ref>' = switches to a branch or commit. Uncommitted changes are carried over; if they don't apply cleanly the whole operation rolls back. (2) 'git checkout [<commit>] -- <path>' = overwrites the given files/paths with different versions, from <commit> or (if not given) from the index. | 12:08 |
|
jast
| !reset | 12:08 |
|
gitinfo
| reset does two things! (1) without file/path argument: 'git reset [flags] [<commit>]' = make the current branch point to <commit> (default: HEAD). --soft = don't do anything else. --mixed (default) = overwrite the index to match. --hard = overwrite the working files to match. (2) 'git reset [<commit>] -- <path>' = overwrite the index entries for <path> with the content from <commit> (default: HEAD) | 12:08 |
|
cousteau
| Didn't know @ was shorthand for HEAD | 12:10 |
|
jast
| it didn't always exist | 12:10 |
| ← ghost43_ left | 12:10 |
|
jast
| not sure when it was added | 12:10 |
| → ghost43 joined | 12:11 |
|
cousteau
| Also, what is reset+checkout supposed to do? Forget all uncommitted changes (indexed or not)? Isn't that what reset --hard does? | 12:12 |
|
osse
| pretty sure it's been around for a fairly long time. But only recently did it start working for e.g. push | 12:12 |
|
| cousteau: --hard doesn't work for a single file | 12:12 |
|
jast
| it's easy to get the two different forms of reset mixed up | 12:12 |
|
| the syntax for checkout and reset is one of the biggest design flaws in Git's CLI IMO | 12:13 |
|
cousteau
| osse: oh, oops | 12:13 |
|
| Yeah I just saw that in the manpage | 12:13 |
|
| jast: now there's git switch to partly fix the weirdness of checkout | 12:14 |
| → average joined | 12:14 |
|
cousteau
| But I don't know to which extent it fixes it | 12:14 |
|
jast
| git switch and git restore each cover a little less than half of what "git checkout" does | 12:15 |
|
| it's not a good improvement IMO | 12:15 |
|
cousteau
| Also I don't see why you wouldn't be able to reset --soft/--mixed/--hard a single file. I mean it should be possible and would make sense, right? | 12:16 |
|
osse
| those flags only make sense if you change the value of HEAD | 12:16 |
|
cousteau
| At least reset to the HEAD commit | 12:16 |
|
| Yeah good point | 12:16 |
|
osse
| I suppose git could accept them if the commit argument is absent or equal to HEAD... | 12:17 |
|
cousteau
| soft changes the HEAD, mixed changes HEAD and index, and hard changes HEAD, index, and tree; right? | 12:18 |
|
osse
| yep | 12:18 |
| ← furrymcgee left | 12:21 |
|
cousteau
| Perfect | 12:24 |
|
anddam
| howdy, I am using log --color --graph --abbrev-commit --format='…' with a lengthy format in a repo with lot of commmits, the output takes some time to pop up and I figure this is because output has to be collected as a whole before parsing it | 12:29 |
| → pulse joined | 12:29 |
|
anddam
| is there a way to speed up the output? namely I am looking for changes in a single directory of a packages repo, that is need to only list a handful of entries out of many thousands | 12:30 |
|
| for comparison git log --oneline is pretty fast to produce output, I'd like to add date to that | 12:31 |
|
osse
| I'd gradually reduce the format until yuo find the culprit | 12:33 |
|
| but I am fairly sure that git does not read the whole log before starting to produce output | 12:33 |
|
| My guess is that the main culprit is --graph | 12:33 |
| → gh34 joined | 12:37 |
|
bremner
| --reverse would be another suspect option | 12:39 |
| → mat001 joined | 12:39 |
| → christall joined | 12:48 |
| ← nightstrike left | 12:50 |
| ← ConstantDesc left | 12:50 |
| ← christall left | 12:50 |
| → gouldsam joined | 12:50 |
| → christall joined | 12:51 |
| → Swahili joined | 12:51 |
| ← bambams left | 12:58 |
| → bambams joined | 13:00 |
| → zer0bitz joined | 13:00 |
|
jast
| btw guys I made an overview of checkout vs reset, comments welcome | 13:01 |
|
| https://gitirc.eu/help/checkout-reset.html | 13:01 |
| ← bambams left | 13:03 |
| → nyah joined | 13:03 |
|
xD-
| nice | 13:03 |
|
jast
| msg gitinfo .weblogin | 13:04 |
|
| whoops | 13:04 |
|
| typing is hard | 13:04 |
|
| let's go shopping | 13:04 |
| ← ThorMojito left | 13:04 |
|
osse
| Did you write all of that just now? | 13:05 |
|
jast
| yes | 13:05 |
|
cbreak
| jast: for git checkout [--] <path> you write that it doesn't update the index | 13:05 |
|
| but ... does it matter? | 13:05 |
|
| it could update the index with itself | 13:05 |
|
jast
| mainly for understanding what's going on | 13:05 |
|
| basically changing the index isn't what you're after when you use this | 13:06 |
|
cbreak
| it'd look nicer if the whole column was green | 13:06 |
|
| and no, I don't just say that because I played too much tetris | 13:06 |
|
| but it's almost a 4 stack | 13:06 |
|
jast
| but then why have the column in the first place | 13:06 |
|
| maybe I should change the labels to be more imperative | 13:07 |
|
cbreak
| good question | 13:07 |
|
jast
| I changed the column headers | 13:07 |
|
cbreak
| I would make a column about "current branch updated" | 13:07 |
|
jast
| it's a bit subtle | 13:07 |
|
| that's "checkout without path" | 13:08 |
|
| section below | 13:08 |
| → igemnace joined | 13:08 |
|
jast
| but maybe it doesn't hurt being clear about it multiple times | 13:08 |
|
osse
| as long as it's fewer than 8 | 13:09 |
|
cbreak
| you write that git reset --soft doesn't change the branch pointer | 13:09 |
|
jast
| how about this | 13:09 |
| ← igemnace left | 13:09 |
|
cbreak
| ah, right, same issue as before | 13:09 |
|
| it changes it to HEAD in my mind | 13:09 |
|
| I find it easier to remember that git reset (without path) always changes the branch pointer | 13:10 |
|
jast
| again I changed the column headers | 13:10 |
|
cbreak
| and with path always changes the index | 13:10 |
|
jast
| I added footnotes :) | 13:12 |
| ← cmbengue left | 13:12 |
| → cmbengue joined | 13:12 |
| → sudoforge joined | 13:15 |
| ← cmbengue left | 13:15 |
|
cbreak
| :) | 13:16 |
|
| I like it | 13:17 |
| → speckz joined | 13:17 |
|
jast
| .trigger_edit checkout-reset Having trouble keeping all of the various forms of "git checkout" and "git reset" apart? Here's an overview: https://gitirc.eu/help/checkout-reset.html | 13:18 |
|
gitinfo
| jast: Okay. | 13:18 |
| → ThorMojito joined | 13:18 |
| → bambanxx joined | 13:19 |
| → bn_work joined | 13:23 |
| → ApostleInTriumph joined | 13:26 |
| ← ApostleInTriumph left | 13:27 |
| → ApostleInTriumph joined | 13:27 |
|
ApostleInTriumph
| hello. I'm trying to push to a private repo which exists. but I get the following error from terminal, fatal: repository 'https://github.com/user/Project.git/' not found | 13:28 |
| → furrymcgee joined | 13:28 |
|
jast
| ApostleInTriumph: just to clarify, this is also the error message you get if your Git client doesn't try to authenticate (which can happen because GitHub pretends that repos don't exist if you're unauthenticated) | 13:30 |
|
| what can help is including your username in the URL or in your local repo's config | 13:31 |
|
| git config credential.user your-github-username | 13:31 |
|
| sorry, it's credential.username, not credential.user | 13:31 |
|
ApostleInTriumph
| jast thanks! I tried it, still the error persists | 13:32 |
| → Guest0 joined | 13:32 |
|
jast
| does it ask for a password? | 13:33 |
| Guest0 → jkordani | 13:33 |
| ← furrymcgee left | 13:34 |
| ← jkordani left | 13:34 |
| ← meator left | 13:35 |
| → jkordani joined | 13:35 |
| → mtor joined | 13:35 |
|
ApostleInTriumph
| yes | 13:35 |
| ← mtor left | 13:35 |
| → meator joined | 13:35 |
|
ApostleInTriumph
| jast when I enter wrong password, it says remote: Support for password authentication was removed on August 13, 2021. Please use a personal access token instead. | 13:35 |
|
| when I enter the right one (the personal access token), it says remote: Repository not found. | 13:36 |
|
jast
| do you have a personal access token set up? with full "repo" access enabled? | 13:36 |
| → otisolsen70_ joined | 13:36 |
|
jast
| that's the bold "repo" checkbox at the top of the list when setting up a token | 13:36 |
| ← rfuentess left | 13:37 |
|
ApostleInTriumph
| okay my bad that was the issue | 13:37 |
|
jast
| oh, good. I like issues that are explainable. :) | 13:37 |
|
ApostleInTriumph
| why was password deprecated at the first place to replace with this painfully long random string that's hard to store and impossible to remember? | 13:38 |
|
jast
| you'll have to ask the GitHub folks that | 13:38 |
|
| though the password was never usable if you enabled two-factor auth | 13:38 |
|
| maybe they just didn't want to support two things in their Git auth | 13:38 |
| ← otisolsen70 left | 13:39 |
|
jast
| maybe they just realized that many people use git's credential store to save their git HTTP passwords and think that the credential store getting stolen is an important attack vector | 13:39 |
| → jwillikers joined | 13:40 |
|
osse
| more like attack unordered map, amirite | 13:40 |
|
| jast deallocates osse | 13:40 |
|
| osse forks+execs in his destructor | 13:41 |
|
jast
| anyway, the security theatre in all these web services annoys the hell out of me, too | 13:41 |
|
| if you want to avoid all of that, use SSH access to repos | 13:41 |
| → igemnace joined | 13:41 |
| ← ThomasD13 left | 13:41 |
|
jast
| osse: what's a destructor | 13:41 |
|
osse
| the thing that runs when a thing goes out of scope | 13:42 |
|
| or is deallocated | 13:42 |
|
cbreak
| passwords are bad, because people are too lazy to use proper ones, which are long and impossible to remember | 13:42 |
|
jast
| is that some kind of C++ madness | 13:42 |
|
cbreak
| ssh keys are much nicer to work with. | 13:42 |
| ← mthall left | 13:42 |
| ← otisolsen70_ left | 13:42 |
|
jast
| agreed | 13:42 |
|
osse
| jast: that too. lots of languages have them | 13:42 |
|
jast
| though I have both passwords and SSH keys in my password manager | 13:42 |
| → mthall joined | 13:42 |
|
jast
| destructors are one of the things that I find a little too magical | 13:43 |
|
cbreak
| I have passwords in my password manager, and ssh keys on my physical keychain via yubikeys | 13:43 |
|
jast
| for instance, what happens if a destructor raises an exception? | 13:43 |
|
cbreak
| jast: the object fails to be destroyed | 13:43 |
|
osse
| sub DESTROY { } is perhaps more up your alley | 13:43 |
|
cbreak
| if this happens while an exception is already being processed, your program will be terminated | 13:44 |
|
| and by default, if you let an exception escape your destructor, your program will also be terminated | 13:44 |
|
jast
| it was a rhetorical question btw | 13:44 |
|
| anyway I prefer RAII style code | 13:45 |
| → ConstantDesc joined | 13:45 |
|
osse
| huh | 13:46 |
|
| isn't that the point of destructors | 13:46 |
|
cbreak
| raii without destructors is like pizza without the dough. | 13:46 |
|
osse
| or are you yanking our chains | 13:46 |
|
| 12speed dura ace chains | 13:47 |
|
jast
| I don't really know | 13:47 |
|
| I think as long as exceptions aren't a thing it's fine | 13:47 |
|
osse
| If a destructor raises an exception I'd wager that the code you would have to write if destructors weren't a thing would raise an exception too | 13:48 |
|
| I bet ... ONE THOUSAND DOLLARS | 13:49 |
|
cbreak
| a destructor that raises an exception should also raise an eyebrow or two during code review. | 13:49 |
|
jast
| the problem is that if you do semi-complex things in a destructor, often it's very hard to see any exceptions it may raise | 13:49 |
|
| that's also the main downside of exceptions | 13:50 |
|
cbreak
| it's ok. | 13:50 |
|
| by default, exceptions aren't allowed to leave destructors. | 13:50 |
|
jast
| at least with a concept like Rust's Result types you'll always be forced to explicitly panic on errors | 13:50 |
|
cbreak
| so if you screw up handling them inside, it's termination. | 13:50 |
|
jast
| that's pretty terrible though | 13:50 |
|
| imagine getting a termination in 1 out of 10000 runs | 13:50 |
|
cbreak
| why? | 13:50 |
|
| if you fail to handle errors, that's what you get. | 13:51 |
|
jast
| I'm saying exceptions can make it hard to even be aware of where you might need to handle errors | 13:51 |
|
cbreak
| -> go handle your errors | 13:51 |
|
osse
| Speaking of failing, I fail to see how the concept of destructors makes the real life problem any worse than it would be without them | 13:51 |
|
jast
| well you did start out mentioning a destructor that forks-and-execs :) | 13:52 |
|
| I don't really want to live in a world where that's a thing | 13:52 |
|
cbreak
| fork and exec are more a legacy C thing | 13:53 |
|
| it has many problems with non-prehistoric code | 13:53 |
|
| avoid it if possible | 13:53 |
|
jast
| it's what pretty much everything does under the hood | 13:53 |
|
cbreak
| there are plenty of alternatives | 13:53 |
| ← igemnace left | 13:54 |
|
osse
| jast: Yeah but that was a meaningless joke :P It was intended to be about as realistic as the concept of deallocating a human | 13:55 |
|
jast
| AFAIK on Linux there is nothing else except fork() that can create new processes | 13:55 |
|
cbreak
| vfork with exec | 13:55 |
|
| posix_spawn | 13:55 |
|
osse
| bro do u even clone() | 13:55 |
|
jast
| AFAIK posix_spawn wraps fork and exec | 13:55 |
|
cousteau
| cbreak: mind you, good passwords are long AND easy to remember | 13:56 |
|
cbreak
| cousteau: why easy to remember? | 13:56 |
|
cousteau
| But those are kinda hard to come up with | 13:56 |
|
jast
| yeah well, in the end clone() does the same thing as fork(), except with more options and slightly different semantics | 13:56 |
|
cbreak
| You can use jrbaCMEook898+DGO09Xh, for free | 13:56 |
|
cousteau
| Because if they're hard to remember you'll end up writing them down or having to reset the password every time | 13:57 |
|
osse
| "cousteau and cbreak are fighting over passwords" is long and easy to remember \o/ | 13:57 |
|
jast
| use a password manager, done | 13:57 |
|
| osse: damn you, stop leaking my master password on IRC | 13:57 |
|
cbreak
| cousteau: the idea is to write them down, indeed | 13:57 |
|
| here, have a new one: 4JVamhqxFBL9nDdDzegB5GYgV. Put it into a password manager, just to be safe. | 13:58 |
|
cousteau
| I'd say that's a potential security risk | 13:58 |
|
cbreak
| how so? | 13:58 |
|
| there are various types of password managers, for varying degrees of paranoia | 13:58 |
|
jast
| getting your remembered passwords confused in your head is a potential security risk, too, just of a different kind | 13:58 |
|
cousteau
| Writing them down, I mean. Password managers may or may not be secure enough. I haven't made up my mind yet. | 13:58 |
|
jast
| the thing is | 13:58 |
|
cbreak
| and the stand-alone local-only ones should be more secure than anything you can practically keep into your head reliably | 13:59 |
|
jast
| I have 361 distinct passwords | 13:59 |
|
| and that's just for personal accounts | 13:59 |
|
| there's a limit to how many passwords you can remember and never get mixed up | 13:59 |
|
cbreak
| cousteau: think about the attacker model first, that should allow you to determine which kind of password manager is acceptable | 13:59 |
|
cousteau
| Are they the same password with two added letters at the end (each letter having 19 possible variations)? | 14:00 |
|
jast
| no | 14:00 |
|
| all of them are randomly generated | 14:00 |
|
cousteau
| Oh | 14:00 |
|
jast
| the next best thing instead of a password manager is to generate all of your passwords out of a master password and a "domain" value | 14:01 |
|
| but then you have to remember which domain value is used where | 14:01 |
|
cousteau
| So the fact that 19*19=361 was just a coincidence? Dammit :( | 14:01 |
| ← aniruddha left | 14:01 |
|
jast
| yeah, just a coincidence | 14:01 |
|
| I have an additional 291 credentials for work | 14:02 |
|
| some of those are for testing, but still | 14:02 |
|
cousteau
| How secure is that "master password + site-specific value" method, out of curiosity? | 14:02 |
|
jast
| depends mostly on your master password and the algorithm being used | 14:02 |
|
| if you use something like HMAC-SHA256 you should be good on the second point | 14:03 |
|
cousteau
| Is strcat an acceptable algorithm? | 14:03 |
|
jast
| or, better yet, a good key derivation function | 14:03 |
| → thiago joined | 14:03 |
|
jast
| a big downside of this is that many services have weird password restrictions | 14:04 |
|
| some will force you to use a special character from a specific narrow range, some will reject special characters from the same range, etc. | 14:04 |
|
| some even have a maximum number of characters in a password | 14:04 |
|
cousteau
| Yeah and some have the fantastic idea of limiting the MAX length to some ridiculously small value | 14:05 |
|
jast
| the only sane way to deal with all of that is to use a password manager and having your password DB encrypted with a strong master password | 14:05 |
|
cousteau
| I remember the "password must have a min length of 6 and a max length of 8" requirement at uni | 14:05 |
|
cbreak
| cousteau: remember: Getting cleartext access to some of your passwords isn't all that hard | 14:08 |
|
| would access to passwords compromise others? | 14:08 |
|
| with a stupid derivation scheme it would | 14:08 |
|
| with purely random individual keys it would not | 14:08 |
|
| with a good derivation scheme it probably wouldn't | 14:08 |
| → Trailblazer51 joined | 14:08 |
|
cousteau
| Maybe you are right, the thing is that password managers imply (1) me trusting my passwords to software someone else made (kinda easy actually, I'm very little paranoid), (2) lower portability (what if I want to use my password from another PC?), and (3) the fear that they'll somehow access my laptop and figure out my password and then I'm screwed | 14:09 |
|
| None of these would be a real concern if I knew more about security, probably | 14:09 |
|
cbreak
| 1: You have to trust every web page and application you log in to anyway | 14:09 |
|
| and you have to trust your OS, your browser, ... this is one more software to trust | 14:09 |
|
| 2. Depending on the password manager you chose, portability should be OK. | 14:10 |
|
| I use 1password, which has applications for MacOS, Linux, Windows, Android, ... and a web interface | 14:10 |
|
| (but the web interface is a pain to use...) | 14:10 |
|
| 3. Yes. | 14:11 |
|
| encrypt your file system with FDE. And use a good password manager password :) | 14:11 |
|
cousteau
| The thing with knowing little about security is that I get paranoid about all the wrong things | 14:12 |
| ← kenanmarasli left | 14:13 |
| ← Trailblazer51 left | 14:13 |
|
samir
| Hi Everyone. I've been trying to get a program called stagit (https://codemadness.org/stagit.html) working on a VPS which hosts a couple of my remote git repositories. | 14:14 |
|
| In the stagit documentation, it mentions having a `url` file, `owner` file and `description` file. This enables you to specify a clone URL, show the repo's owner and a description of the repo, respectively. | 14:14 |
|
| I'm familiar with the `description` file as I see one created every time I run `git init --bare` in a remote repo. But I have never seen the `url` file or `owner` file. | 14:14 |
|
| Are those maintained just in the local repository under `repo/.git`? Or are they managed in the remote repo with all of the other files such as `config`, `description`, `hooks`, etc? | 14:15 |
| ← hackinghorn left | 14:17 |
|
bremner
| samir: you should ask the stagit authors your stagit questions | 14:17 |
|
osse
| my guess is you can simply create the url and owner files next to the description file | 14:18 |
|
samir
| bremner: I have but they have mentioned that I need to maintain these files. I'm not familiar with them so was wondering if they are normal git files | 14:18 |
|
| osse: will try that. Would they be in the local repo or remote repo? | 14:18 |
|
osse
| they are not | 14:18 |
|
samir
| ok | 14:19 |
| → hackinghorn joined | 14:19 |
|
osse
| surely it must be in the repo that stagit generates from | 14:20 |
|
samir
| osse: yeah, I think you are right. I have stagit running in the VPS (remote repo). It looks like it can pick up the git clone url from the `url` file from there. Will try the same thing for the owner. | 14:22 |
|
| Thanks! | 14:22 |
| → skapata joined | 14:24 |
| ← skapata left | 14:24 |
| → skapata joined | 14:24 |
|
cousteau
| Yes, if it's not something specific to git I wouldn't expect it to be in the .git directory, but on a regular file within the project | 14:25 |
|
| Otherwise git won't bother cloning that | 14:25 |
| vdamewood → vinleod | 14:27 |
|
samir
| cousteau: Makes sense. Thanks! | 14:28 |
| ← af left | 14:29 |
|
cousteau
| For example, GitHub searches for GitHub-specific config files in the .github directory | 14:30 |
| → af joined | 14:31 |
|
cousteau
| So if you clone a project from GitHub that has those config files, they will be cloned as well, and if you upload the project to another GitHub repo it'll preserve those files. From git's point of view, they're just regular files in the project. | 14:32 |
| → rfuentess joined | 14:38 |
| ← speckz left | 14:39 |
| → LuxuryMode joined | 14:43 |
| → subopt joined | 14:45 |
|
samir
| got it. Thanks for that explanation | 14:47 |
| → hnOsmium0001 joined | 14:49 |
| ← bambanxx left | 14:49 |
| → node1 joined | 14:51 |
| ← twb left | 14:53 |
|
jast
| samir: I think they did it this way because stagit also supports bare repositories. there is no officially defined way to put custom metadata in a bare repository, so the options you have is adding it to the config file or just creating another plain file next to it (like the "description" file). git itself ignores these. | 14:53 |
| ← average left | 14:54 |
|
jast
| in fact no part of git (except gitweb if you want to count that) ever looks at the "description" file, either | 14:54 |
| ← drogas left | 14:56 |
|
jast
| typically if you run something like this on the server side, it will be dealing with bare repos (that's what you normally want for hosting purposes) | 14:56 |
| ← jwillikers left | 14:58 |
| → Null_A joined | 14:59 |
| → Lunatrius joined | 15:03 |
| ← sQVe left | 15:04 |
| → hornhack joined | 15:05 |
| ← hackinghorn left | 15:06 |
| hornhack → hackinghorn | 15:06 |
|
samir
| jast: Thanks! You all have been very helpful! I think I need to crack open https://git-scm.com/book | 15:07 |
|
jast
| you wouldn't get any specific information about these files in the book, though, because they're not a standard thing in git :) | 15:07 |
|
samir
| good point! | 15:07 |
|
jast
| that said, reading up a bit probably can't hurt | 15:08 |
|
| but we're also happy to explain things you find confusing, or point you to more material | 15:08 |
|
samir
| I'm not a developer or programmer but feel that it would be good to put some of my files and documents under version control | 15:08 |
|
| and given the ubiquity of git, that would be a good way to go | 15:08 |
|
jast
| sure, that can definitely be useful | 15:08 |
|
samir
| Thanks, jast! | 15:08 |
|
jast
| a git repository tends to work best if all of the files in a repo are related | 15:08 |
|
| but it's not an absolute requirement if you don't plan on doing things like, say, branching | 15:09 |
|
samir
| branching is probably a feature I don't need at the moment. My biggest "need" is being able to revert back to a prior version of a file or document | 15:10 |
|
jast
| sure, that's always an option with git | 15:10 |
|
samir
| say I updated a config file or "dotfile" and things went bad | 15:10 |
| → elkalamar joined | 15:10 |
|
jast
| it's more geared towards reverting everything back, but both things are possible | 15:10 |
|
samir
| right now, I have files like `program.conf.1`, `program.conf.bak`, `program.conf.crap`, etc. | 15:11 |
|
jast
| yeah, that's no way to live :-) | 15:11 |
|
samir
| sad, but true | 15:11 |
|
jast
| preprint2 of final Thesis draft2 - Copy.docx | 15:12 |
|
samir
| LOL! | 15:12 |
|
imMute
| needs more Final Final | 15:13 |
|
jast
| more - Copy - Copy, too | 15:13 |
|
ikke
| and Really Final | 15:14 |
|
jast
| also, remember to store a subtly different and slightly more up-to-date copy in the temp/ subdir | 15:14 |
|
| anyway | 15:14 |
|
| the most important thing in versioning things with git is that if you ever want to look back, you'll appreciate having written good commit messages that briefly describe the changes and your motivation for making them | 15:15 |
| ← rfuentess left | 15:15 |
| → yates joined | 15:16 |
|
yates
| is there a way to find a tag given the hash? | 15:16 |
|
jast
| of the commit? | 15:17 |
|
| git tag --points-at | 15:17 |
|
yates
| jast: thanks, but i mean the reverse | 15:17 |
|
jast
| so you have the hash of the tag object? | 15:18 |
|
yates
| yes | 15:18 |
| ← ApostleInTriumph left | 15:18 |
| → shored joined | 15:18 |
|
yates
| specifically i'm tryign to see if one of the linux kernel tags matches this hash: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tag/?h=v5.10.4 | 15:18 |
| → kenanmarasli joined | 15:18 |
|
jast
| I'm not sure if there's an Optimal(tm) way, but there's always "git show-ref | grep hash" | 15:18 |
|
yates
| there is no 5.10.4 tag | 15:19 |
| → rfuentess joined | 15:19 |
| → vysn joined | 15:20 |
| ← masber left | 15:20 |
|
jast
| the tag name is v5.10.4 and at least in that hosted repo it exists | 15:20 |
| vinleod → vdamewood | 15:20 |
| ← Murr left | 15:21 |
| → Murr joined | 15:21 |
|
yates
| is this not the "master" linux repo? https://github.com/torvalds/linux.git | 15:22 |
| → ChmEarl joined | 15:23 |
| → pyeverything joined | 15:23 |
|
jast
| I don't know exactly how all of the linux repos are connected | 15:23 |
| ← node1 left | 15:23 |
|
jast
| historically the official repo has been on git.kernel.org | 15:23 |
|
| and I *think* linus isn't the maintainer of the stable kernels | 15:23 |
|
bookworm
| GKH is | 15:24 |
|
jast
| yeah, that's what I thought | 15:24 |
|
bookworm
| and the other guy, can't remember the name | 15:24 |
| → ttree joined | 15:24 |
|
bookworm
| the problem with the kernels is that development is at least in part based on sending patches around, meaning for stable that some commits actually differ in their hashes as they are slightly rewritten and cherry picked | 15:25 |
| → tirnanog joined | 15:26 |
|
bookworm
| iow, comparing the stable tree with torvald's isn't exactly trivial | 15:26 |
| ← gouldsam left | 15:28 |
| → bambanxx joined | 15:31 |
| → junktext joined | 15:36 |
| ← Null_A left | 15:39 |
| → Gaboradon joined | 15:42 |
| → ash_worksi joined | 15:46 |
| → cmbengue joined | 15:48 |
| ← tuskkk____ left | 15:49 |
|
ash_worksi
| so, I had to leave yesterday, but I still need help with difftool | 15:52 |
|
| the last suggestion, which was to use the -t option, yielded the same results as before (no sign the application has or will launch; exit status 0) | 15:53 |
| → nate_ joined | 15:55 |
| ← pyeverything left | 15:56 |
| slaughtr → slaughter | 15:56 |
| → ysavd^ joined | 15:56 |
| ← justache left | 15:57 |
|
ash_worksi
| oh wow | 15:58 |
| → justache joined | 15:58 |
|
ash_worksi
| I removed all local difftool configuration and removed the guitool and it worked | 15:59 |
|
| yay | 15:59 |
| → Maxattax joined | 16:03 |
| → beshr joined | 16:08 |
| ← enoq left | 16:14 |
| ← vlado left | 16:19 |
| → stats4647 joined | 16:19 |
| ← ttree left | 16:29 |
| ← sandipan left | 16:32 |
| → sandipan joined | 16:32 |
| → Brumaire joined | 16:34 |
| ← ConstantDesc left | 16:34 |
| → bambams joined | 16:35 |
| ← rfuentess left | 16:38 |
| → jazzy joined | 16:39 |
| → Narrat joined | 16:40 |
| ← jkordani left | 16:42 |
| → zebrag joined | 16:44 |
| → pcatinean_ joined | 16:47 |
| ← PCatinean left | 16:50 |
| ← ysavd^ left | 16:50 |
| ← alzgh left | 16:51 |
| → alzgh joined | 16:51 |
| → ysavd^ joined | 16:51 |
| ← Narrat left | 16:57 |
| → Narrat joined | 16:57 |
| ← sandipan left | 16:58 |
| → saroy joined | 16:58 |
| → sandipan joined | 17:00 |
| ← cousteau left | 17:01 |
| → ano joined | 17:02 |
| → node1 joined | 17:02 |
| ← saroy left | 17:03 |
| ← elkalamar left | 17:03 |
| → emf_ joined | 17:03 |
| → koolazer joined | 17:09 |
| ← stats4647 left | 17:09 |
| ← alzgh left | 17:09 |
| → alzgh joined | 17:10 |
| → stats4647 joined | 17:10 |
| → ConstantDesc joined | 17:10 |
| ← christall left | 17:11 |
| ← ConstantDesc left | 17:11 |
|
yates
| how do i show the hash of a tag in git? | 17:12 |
| → pyeverything joined | 17:13 |
|
another|
| annotated tag or simple tag? | 17:14 |
|
yates
| the tags such as v5.10.4 in https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git | 17:16 |
|
| if i've already cloned it and checked the tag out? | 17:16 |
| ← pyeverything left | 17:18 |
|
another|
| those are likely annotated tags | 17:18 |
| → christall joined | 17:19 |
| ← ash_worksi left | 17:19 |
|
nedbat
| yates: just curious: why do you want the hash? | 17:19 |
|
another|
| do you need the hash of the tag itself or the commit it's referencing? | 17:19 |
| ← christall left | 17:23 |
| ← vysn left | 17:25 |
| ← gas51627 left | 17:26 |
| → shabius joined | 17:28 |
|
yates
| what is the long number in parentheses next to the "tag name" here? https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tag/?h=v5.10.4 | 17:28 |
|
| perhaps i'm abusing the syntax: is it called a "hash" or a "blob"? | 17:29 |
|
| nedbat: i want to verify i've got the right repo and tag version. | 17:30 |
|
| another|: the commit | 17:30 |
|
| i've already drug through the dirt from using https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git instead of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git | 17:31 |
|
| just want to be sure i've got the right thang (as they say in Lousianna) | 17:32 |
|
another|
| `git show v5.10.4` ? | 17:32 |
|
yates
| another|: yes, that's what i converged to after RTFM. thanks | 17:33 |
| ← _xor left | 17:34 |
| ← sandipan left | 17:34 |
| → Guest10 joined | 17:35 |
| ← Guest10 left | 17:36 |
| → christall joined | 17:36 |
| → _xor joined | 17:39 |
| → ScottMichaud joined | 17:41 |
| → elkalamar joined | 17:42 |
| → jstein joined | 17:42 |
| ← pcatinean_ left | 17:43 |
| ← Narrat left | 17:44 |
| → Narrat joined | 17:44 |
| → ash_worksi joined | 17:44 |
| ← rsx left | 17:45 |
| ← node1 left | 17:46 |
| ← ScottMichaud left | 17:47 |
| → YoungChiefBTW joined | 17:48 |
| → hbautista joined | 17:49 |
| → orbyt joined | 17:51 |
| ← LuxuryMode left | 17:53 |
| ← ash_worksi left | 17:55 |
| ← emf_ left | 17:55 |
| → aniruddha joined | 17:56 |
| ← zebrag left | 17:59 |
| → phoenixh joined | 18:03 |
| ← elkalamar left | 18:05 |
| → lgc joined | 18:09 |
|
nvmd
| ok so how can one move around in a repo with submodules without getting "failed to unpack tree object ..." and "Submodule X could not be updated"? | 18:10 |
| ← phoenixh left | 18:11 |
|
nvmd
| at this point I've had so many issues with submodules I wonder why people ever bothered adding it to git | 18:13 |
| ← christall left | 18:13 |
| → christall joined | 18:13 |
| ← christall left | 18:18 |
| → hbautista_ joined | 18:20 |
| → christall joined | 18:21 |
| ← darkstardevx left | 18:21 |
| ← hbautista left | 18:21 |
| → reset joined | 18:23 |
| → liefer joined | 18:23 |
| → pyeverything joined | 18:24 |
| → impermanence joined | 18:24 |
| ← christall left | 18:25 |
| ← meator left | 18:32 |
| → darkstardevx joined | 18:38 |
| ← EvilDMP left | 18:39 |
| ← hackinghorn left | 18:42 |
| → hackinghorn joined | 18:43 |
| → christall joined | 18:46 |
| → emf joined | 18:54 |
| → fling joined | 18:55 |
| ← rtjure left | 18:59 |
| ← SpeakerToMeat__ left | 19:02 |
| ← pyeverything left | 19:02 |
| → pyeverything joined | 19:03 |
| ← christall left | 19:04 |
| ← beshr left | 19:05 |
| → average joined | 19:07 |
| ← emf left | 19:11 |
| → mei joined | 19:12 |
| → emf joined | 19:13 |
| → SpeakerToMeat__ joined | 19:20 |
| → Adoi joined | 19:21 |
| ← zer0bitz left | 19:23 |
| → Betal joined | 19:23 |
| → rwp joined | 19:23 |
| ← kenanmarasli left | 19:26 |
| ← emf left | 19:28 |
| → christall joined | 19:31 |
| → ZacSharp joined | 19:32 |
| ← defjam left | 19:33 |
| ← Adoi left | 19:38 |
| ← geirha left | 19:38 |
| → EvilDMP joined | 19:40 |
| → emf joined | 19:42 |
|
drew
| I want to cherry-pick the two patches at the tip of one branch to the current branch. Would that be `git cherry-pick my_branch:HEAD~2..HEAD` ? | 19:47 |
| → Samian joined | 19:49 |
| ← christall left | 19:58 |
|
osse
| drew: git cherry-pick onebranch~2..onebranch | 20:01 |
|
drew
| thanks osse | 20:02 |
|
osse
| drew: cherry-pick (along with most commands) do their changes on the current branch, so all you need is a way to specify the commits you want to cherry-pick | 20:05 |
|
| my_branch:HEAD is invented syntax :P I guess it means the HEAD of my_branch. but "my_branch" alone is the head (lowercase) of my_branch, and HEAD (uppercase) always means the current commit absolutely | 20:06 |
| ← ZacSharp left | 20:08 |
| ← fling left | 20:12 |
| → fling joined | 20:13 |
| → geirha joined | 20:16 |
| ← Samian left | 20:17 |
| ← pyeverything left | 20:19 |
| ← alkino left | 20:20 |
| → Samian joined | 20:21 |
|
drew
| gotcha lol | 20:21 |
| → christall joined | 20:24 |
| → mukul joined | 20:28 |
| ← tolot left | 20:30 |
| ← yates left | 20:31 |
| → pyeveryt_ joined | 20:31 |
| → ash_worksi joined | 20:32 |
| ← mukul left | 20:35 |
| → yates joined | 20:39 |
| ← terrorjack left | 20:42 |
| ← vdamewood left | 20:43 |
| ← christall left | 20:48 |
| → christall joined | 20:48 |
| ← cdown left | 20:52 |
| → zebrag joined | 20:53 |
| → cdown joined | 20:57 |
| ← ysavd^ left | 21:02 |
| → vysn joined | 21:07 |
| ← ano left | 21:07 |
| → Lord_of_Life_ joined | 21:12 |
| ← Lord_of_Life left | 21:13 |
| → rafasc joined | 21:14 |
| → Null_A joined | 21:14 |
| Lord_of_Life_ → Lord_of_Life | 21:15 |
| ← rafasc left | 21:16 |
| → rafasc joined | 21:16 |
| ← Murr left | 21:21 |
| → Murr joined | 21:21 |
| ← elastic_dog left | 21:23 |
| → squirrel joined | 21:24 |
| → onizu joined | 21:25 |
|
yates
| if i have a valid commit, how do i determine what branch that commit belongs to? | 21:25 |
| → elkalamar joined | 21:26 |
|
rafasc
| yates: git branch --contains <commit> | 21:26 |
|
yates
| is it via "git show <commit>"? | 21:26 |
| ← Brumaire left | 21:26 |
| → rtjure joined | 21:27 |
|
yates
| rafasc: thanks: http://paste.debian.net/1213638/ | 21:27 |
|
| but now i'm still confused: i thought "HEAD" is simply the tip of whatever branch you're in | 21:28 |
|
rafasc
| and it is, in a sense. | 21:28 |
|
| the problem here is that you are in no branch. | 21:29 |
|
| you have a commit checked out directly. | 21:29 |
|
yates
| isn't each and every commit a part of some branch? | 21:29 |
|
rafasc
| try: git branch -a --contains <commit> | 21:29 |
|
| yates: not necessarily. | 21:30 |
| → elastic_dog joined | 21:30 |
|
rafasc
| e.g. you can tag a commit, push it, and delete the branch. | 21:30 |
|
| then you have a commit, that exists, can be checked out, and does not belong to any kind of branch. | 21:31 |
|
| !detached | 21:31 |
|
gitinfo
| A detached HEAD (aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach | 21:31 |
| ← gh34 left | 21:31 |
|
yates
| https://www.youtube.com/watch?v=CDeG4S-mJts | 21:32 |
|
nedbat
| yates: branches are references to commits. a commit doesn't have to be referenced by a branch, or be in the ancestors of any branch. | 21:34 |
|
yates
| rafasc: so that extended -a command gives this: http://paste.debian.net/1213640/ | 21:34 |
| → phylaz joined | 21:34 |
|
nedbat
| yates: does that tell you what you need? | 21:35 |
|
rafasc
| that means that commit is reachable from all those branches. | 21:35 |
| ← phylaz left | 21:35 |
|
yates
| i guess so | 21:35 |
|
| thanks rafasc, nedbat | 21:35 |
|
rafasc
| !next then? | 21:35 |
|
gitinfo
| Another satisfied customer. NEXT! | 21:35 |
|
yates
| i'm going back to svn... | 21:36 |
|
rafasc
| NO! | 21:36 |
|
nedbat
| yates: i have confidence in you. you can do this. | 21:36 |
|
yates
| nedbat: lol. | 21:36 |
|
| nedbat: hand me my cane, please | 21:36 |
| ← zebrag left | 21:37 |
|
| rafasc hits yates in the head with his own cane. | 21:38 |
|
rafasc
| s/his/their | 21:38 |
|
| you meme video saying someone charging 200$/h for git advice.. everyone here doing it for free. | 21:40 |
|
| sometimes I wonder if that meme is funny for people that understand german. | 21:42 |
| → ZacSharp joined | 21:42 |
|
yates
| rafasc: it's a reflection on the (over-)complexity of git, not on the kindness of people here. | 21:43 |
|
| i wonder if that meme is funny for people who ARE german... | 21:44 |
|
nedbat
| yates: git is more complex than svn. but it's not over-complex. it could use better ux sometimes, but the facilities are all there for good reason. | 21:45 |
|
| yates hits nedbat with his cane | 21:45 |
|
nedbat
| yates: is the cane a reference to your age? :) | 21:46 |
| → Gustavo6046_ joined | 21:46 |
| ← elkalamar left | 21:46 |
|
yates
| yes. don't tell me you're older than me... 1957 | 21:46 |
| ← Gustavo6046 left | 21:47 |
|
yates
| old, yeah, but i grew up with the Beatles! | 21:48 |
|
nedbat
| yates: ok, you got me, but only by five years. | 21:48 |
|
yates
| i remember rotary-dial phones and 300-baud acoustic modems... | 21:48 |
|
nedbat
| yup | 21:49 |
|
osse
| FIIIIIVE YEEEAEAARS | 21:49 |
| Gustavo6046_ → Gustavo6046 | 21:49 |
|
nedbat
| osse: ? :) | 21:49 |
|
osse
| bowie | 21:49 |
|
yates
| osse: +1 | 21:49 |
|
nedbat
| osse: i don't know that song | 21:50 |
|
yates
| David Bowie | 21:50 |
| ← nvmd left | 21:50 |
|
nedbat
| yes, i got that :) | 21:53 |
| ← Narrat left | 21:53 |
| ← stats4647 left | 21:53 |
|
osse
| https://www.youtube.com/watch?v=2ObjtVdsV3I | 21:54 |
| → stats4647 joined | 21:54 |
| → terrorjack joined | 21:57 |
|
yates
| yeah, i don't remember that song either | 21:58 |
| ← Samian left | 21:58 |
|
yates
| osse: you a bowie fan? (probably a stupid question..) | 21:59 |
|
osse
| not in particular | 22:00 |
|
| i just like a lot of the songs that everyone likes | 22:00 |
| → ConstantDesc joined | 22:01 |
| ← christall left | 22:03 |
| → christall joined | 22:04 |
|
yates
| nedbat: didn't we interact on #python some months ago? | 22:04 |
|
nedbat
| yates: probably. i'm more active there | 22:05 |
|
| yates countenance falls at his apparent lack of popularity | 22:05 |
| ← christall left | 22:08 |
|
yates
| in git-speak, what is the nomenclature of the hash representing a commit? hash? blob? what? | 22:09 |
|
| commit b1313fe517ca3703119dcc99ef3bbf75ab42bcfb (HEAD, tag: v5.10.4) | 22:10 |
|
| what is b1313fe517ca3703119dcc99ef3bbf75ab42bcfb called? | 22:10 |
|
| during this century? | 22:11 |
| ← ConstantDesc left | 22:11 |
|
tang^
| IRC is not instant messaging | 22:12 |
|
| and it's a hash | 22:12 |
|
squirrel
| how is irc not instant messaging? | 22:13 |
|
yates
| because tang^ doesn't want it to be instant messaging, whatever instant messaging means to tang^... ? | 22:14 |
|
tang^
| it's not guaranteed to be instant | 22:14 |
|
yates
| close enough for me. | 22:14 |
|
| what's the delay, two seconds? | 22:14 |
|
osse
| concidering you gave us just over 78 years to reply I'd say you got an answer pretty quickly | 22:14 |
|
yates
| tang^: thanks | 22:15 |
|
| osse: where did 78 come from? | 22:16 |
|
tang^
| number of whole years left in this decade | 22:16 |
|
osse
| i was jsut referring to the "during this century" thing. but maybe you meant something else | 22:16 |
|
squirrel
| heh | 22:17 |
|
tang^
| err, that's what I meant, this century | 22:17 |
|
nedbat
| yates: sometimes people refer to the hash as the sha also | 22:17 |
|
rafasc
| commit id also an acceptable term. | 22:18 |
|
tang^
| SHA-1 hash if you wanted to be detailed | 22:18 |
|
rafasc
| eventually we'll change to another sha. | 22:19 |
|
tang^
| true enough | 22:19 |
|
rafasc
| git help glossary also mentions object name | 22:19 |
|
| object name | 22:20 |
|
| The unique identifier of an object. The object name is usually represented by a 40 character hexadecimal string. Also colloquially called SHA-1. | 22:20 |
| → nehsou^ joined | 22:20 |
| → cagmz joined | 22:21 |
|
yates
| i didn't know there was a "git help glossary" command. that's pretty cool/useful | 22:21 |
| ← aniruddha left | 22:21 |
|
rafasc
| try git help -g | 22:23 |
| ← vysn left | 22:24 |
| ← travisghansen left | 22:24 |
|
rafasc
| man git config can be very informative. | 22:24 |
|
gitinfo
| the git-config manpage is available at https://gitirc.eu/git-config.html | 22:24 |
|
yates
| rafasc: very cool too! | 22:25 |
|
rafasc
| but that's more useful to look things up. | 22:26 |
|
osse
| also man gitrevisions | 22:26 |
|
gitinfo
| the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html | 22:26 |
|
yates
| query: does everyone here know what the slang term "hosed" means? "Jennifer really hosed my stick shift when I loaned her the car yesterday." | 22:26 |
| → travisghansen joined | 22:26 |
|
yates
| someone actually asked me about it on another channel recently... made me feel OLD | 22:27 |
|
osse
| screwed up? broke? | 22:27 |
|
yates
| yes | 22:27 |
|
| ruined | 22:28 |
|
osse
| hah | 22:28 |
|
| and english isn't even my mother's thong! | 22:28 |
| → jstein_ joined | 22:28 |
|
bremner
| thanks for that image | 22:28 |
|
rafasc
| osse: is she called Jennifer? | 22:28 |
|
yates
| i hear you. my wife is a Tamilian from Bangalore and speaks better English than 95 percent of Americans. | 22:29 |
|
rafasc
| bremner: I didn't have the image until you mentioned it. | 22:29 |
|
bremner
| rafasc: you're welcome | 22:29 |
|
yates
| i'm not sure i even want to ask.. | 22:29 |
| JudyRiuliani → Hash | 22:29 |
| → ConstantDesc joined | 22:30 |
|
rafasc
| zzz time. G'night all o/ | 22:30 |
|
yates
| rafasc: good night old person | 22:30 |
| ← rafasc left | 22:31 |
|
yates
| oh sorry, that's nedbat | 22:31 |
| ← ConstantDesc left | 22:31 |
| → jess joined | 22:37 |
| → christall joined | 22:37 |
| ← SpeakerToMeat__ left | 22:38 |
| → SpeakerToMeat__ joined | 22:39 |
| ← pyeveryt_ left | 22:42 |
| → sdasd joined | 22:43 |
| ← emf left | 22:44 |
| ← squirrel left | 22:45 |
| sdasd → squirrel | 22:45 |
| ← rtjure left | 22:45 |
| ← jstein_ left | 22:48 |
| ← jstein left | 22:48 |
| → vicfred joined | 22:51 |
| ← theoceaniscool left | 22:52 |
| → pyeveryt_ joined | 22:53 |
| ← orbyt left | 22:55 |
| ← pyeveryt_ left | 22:58 |
| ← christall left | 22:58 |
| → atrigent joined | 23:02 |
| ← pizdets left | 23:03 |
| → pizdets joined | 23:04 |
| → igemnace joined | 23:07 |
| ← squirrel left | 23:09 |
| ← R2robot left | 23:17 |
| → ttree joined | 23:22 |
| → R2robot joined | 23:22 |
| → christall joined | 23:25 |
| ← JanC left | 23:40 |
| → JanC joined | 23:40 |
| ← ZacSharp left | 23:41 |
| ← bambanxx left | 23:47 |
| ← mei left | 23:49 |
| ← natrys left | 23:51 |
| ← christall left | 23:54 |
| → Duckle9 joined | 23:54 |
| → stkrdknmibalz joined | 23:55 |
| ← rtur left | 23:55 |
| ← mat001 left | 23:56 |
| ← Duckle left | 23:56 |
| Duckle9 → Duckle | 23:56 |
| → zebrag joined | 23:56 |
| → rtur joined | 23:57 |
| ← cagmz left | 23:58 |
| → mat001 joined | 23:58 |