IRCloggy #git 2021-10-09

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2021-10-09

→ ash_worksi joined00:05
→ a6a45081-2b83 joined00:10
← alkino left00:10
→ christall joined00:11
→ emf joined00:15
← dflick left00:19
← lgc left00:20
← a6a45081-2b83 left00:21
← emf left00:21
← alzgh left00:23
← tirnanog left00:26
← christall left00:27
→ titouan joined00:30
← zumba_addict left00:31
← _xor left00:34
← ZacSharp left00:38
→ _xor joined00:40
→ fstd_ joined00:41
← skapata left00:43
→ ttree joined00:44
→ jwillikers joined00:45
← fstd left00:45
← jwillikers left00:47
→ skapata joined00:48
← skapata left00:48
→ skapata joined00:48
← ash_worksi left00:51
→ jwillikers joined00:54
← gioyik left00:54
← BSaboia left00:54
← titouan left00:56
← xx left00:58
← rgrinberg left00:58
→ retroid_ joined01:00
→ retro_ joined01:04
← retroid_ left01:05
→ zumba_addict joined01:05
→ chenqisu1 joined01:10
chenqisu1 → chenqisu1201:11
← jwillikers left01:15
→ jwillikers joined01:15
← nx_ left01:21
→ christall joined01:25
→ rgrinberg joined01:27
→ LuxuryMode joined01:29
← pyeveryt_ left01:33
← igemnace left01:36
→ Gustavo6046_ joined01:40
← Gustavo6046 left01:41
← jwillikers left01:41
→ pyeverything joined01:41
Gustavo6046_ → Gustavo604601:43
← christall left01:44
→ dflick joined01:51
→ darkstardevx joined01:53
← dflick left01:59
← ChmEarl left02:01
→ retroid_ joined02:03
← Thanatermesis left02:04
← retro_ left02:06
→ retro_ joined02:07
← retroid_ left02:07
← nyah left02:08
→ christall joined02:11
→ fflam joined02:21
← zebrag left02:23
← zumba_addict left02:24
← christall left02:31
← pretty_dumm_guy left02:34
← hnOsmium0001 left02:35
← jcbjoe2021 left02:36
← LuxuryMode left02:36
← circuitbone left02:36
← merpnderp left02:37
← tang^ left02:37
← ttree left02:38
→ jcbjoe2021 joined02:39
→ LuxuryMode joined02:39
→ merpnderp joined02:39
→ jwillikers joined02:43
→ pycurious joined02:47
pycurious After i get cherry-pick - to paste changes. How do I commit all those cherry-picks? git status doesnt show those changes02:49
→ tang^ joined02:51
→ circuitbone joined02:51
pycurious ah cherry-pick already committed those changes :)02:51
→ tirnanog joined02:53
→ hnOsmium0001 joined02:54
← FinnElija left02:54
→ FinnElija joined02:57
← skapata left03:03
← Murr left03:10
→ Murr joined03:10
← bloody left03:10
→ ferdna joined03:15
→ ttree joined03:17
← causasui left03:25
← rgrinberg left03:26
← jwillikers left03:27
→ christall joined03:29
→ jwillikers joined03:30
→ ackyshake joined03:33
← jwillikers left03:33
← Gustavo6046 left03:44
→ Gustavo6046 joined03:45
← christall left03:55
← Gustavo6046 left04:19
→ Gustavo6046 joined04:19
skered Is there a single git command that will provide a return code that will tell you if there's changes or additions/deletions? 0 nothing non-zero changes/add/dels.04:22
→ erich_zann joined04:23
→ causasui joined04:24
→ jazzy joined04:30
← Crispy left04:32
→ cluelessperson joined04:33
→ rgrinberg joined04:37
← Gustavo6046 left04:39
→ Gustavo6046 joined04:39
← pulse left04:47
→ christall joined04:52
← ferdna left05:00
← pyeverything left05:11
→ pyeveryt_ joined05:12
← christall left05:13
→ wolfdale3 joined05:14
← pyeveryt_ left05:16
→ zumba_addict joined05:17
← pycurious left05:22
→ nivag joined05:27
← gast0n left05:28
← tejr left05:28
→ tejr joined05:28
← jetchisel left05:33
← sgn left05:34
→ sgn joined05:37
→ gordonfish- joined05:39
← gordonfish left05:40
← hbautista_ left05:46
← erich_zann left06:00
← ttree left06:01
→ jetchisel joined06:01
→ christall joined06:15
→ ttree joined06:17
j416 PaulePanter: 'git rm' is short for 'rm' + 'git add'.06:18
skered: diff06:19
→ longshanks joined06:23
← jazzy left06:23
longshanks Hi all. I have noticed that sometimes I have a merge conflict on GitHub but when I do the merge locally, it often just merges cleanly. Is there a difference in how the two things perform their merges?06:26
← ttree left06:27
← christall left06:46
← jinsun left06:48
→ mei joined06:50
← zer0bitz left06:51
skered j416: The issue with diff is that I don't think it will show changes and adds with a single command. git diff vs git diff --cached06:55
→ gioyik joined07:01
→ erich_zann joined07:03
← gioyik left07:04
← unluckyshrubbery left07:04
← rgrinberg left07:08
← Murr left07:10
← _xor left07:10
→ Murr joined07:10
← longshanks left07:11
→ _xor joined07:14
→ remyabel joined07:23
→ palasso joined07:27
→ alkino joined07:31
← alkino left07:37
→ alkino joined07:38
→ meator joined07:39
→ spare joined07:44
← meator left07:44
→ bkircher joined07:49
PaulePanter j416: Than you.08:00
← PaulePanter left08:00
j416 skered: probably true.08:12
← hnOsmium0001 left08:14
→ aminvakil joined08:16
← spare left08:17
→ igemnace joined08:31
→ christall joined08:35
→ meator joined08:40
→ wender joined08:49
→ coot joined08:51
← computeiro left08:52
← coot left08:55
→ coot joined08:55
← AsenMx left08:55
→ AsenMx joined08:56
← jonosterman left08:57
→ jonosterman joined08:58
← jonosterman left08:58
← christall left09:01
← igemnace left09:01
→ mat001 joined09:02
← Betal left09:02
← braxas left09:03
← Puyo left09:03
→ mjoerg joined09:03
→ braxas joined09:04
→ Puyo joined09:04
→ unluckyshrubbery joined09:06
→ jonosterman joined09:09
← johncs left09:10
→ skapata joined09:10
← skapata left09:10
→ skapata joined09:10
← rahl left09:10
→ johncs joined09:11
→ Guest62 joined09:11
← sudoforge left09:12
→ kenanmarasli joined09:12
→ rahl joined09:12
← Guest62 left09:15
→ Xenguy_ joined09:15
← Gustavo6046 left09:15
→ Gustavo6046 joined09:17
← mjoerg left09:18
← Xenguy left09:18
→ YuGiOhJCJ joined09:21
→ ravan_ joined09:23
← ravan left09:25
→ xx joined09:31
→ Vonter joined09:38
← alkino left09:42
→ igemnace joined09:49
→ christall joined09:58
→ caveman joined09:59
ueberall Hi. Is it possible to change the way git (and only git!) asks for a GPG passphrase on Linux so that you get a chance to switch to a password manager and use copy&paste? ATM, a separate window/modal dialog is used for this.10:06
s17 you could use ssh-agent10:07
ikke ueberall: you can set gpg.program I suppose to change it10:09
ueberall s17: I actually do. No idea why it prompted me for a passphrase the agent should already know (it's a key assigned to multiple email addresses, though, which may be the problem here).10:09
s17: Sorry, strike that… it's actually a different key.10:15
→ wyre joined10:21
← caveman left10:23
← coot left10:23
← YuGiOhJCJ left10:25
← christall left10:31
→ pyeverything joined10:34
→ theoceaniscool joined10:37
← pyeverything left10:38
← AbleBacon left10:41
← meator left10:47
→ epolanski joined10:51
← wyre left10:52
→ wyre joined10:52
nedbat strange that in a git config, user email and name is enough for a commit, but in environment variables, you have to specify both author and committer separately.10:59
ikke porcelain vs plumbing11:01
← wyre left11:01
→ meator joined11:13
→ tchan1 joined11:14
nedbat it's funny to see the GitHub Actions that use "git config --global user.email ..." to set the email for a commit, when you can leave out --global. They do it because with no auth, that's the command git says to run.11:15
→ jinsun joined11:17
→ wyre joined11:23
→ alzgh joined11:25
← chenqisu12 left11:26
→ christall joined11:28
← Xenguy_ left11:32
← wyre left11:32
→ kawics11 joined11:41
→ wyre joined11:45
← kawics11 left11:46
→ nx_ joined11:48
→ lgc joined11:48
← igemnace left11:48
← christall left11:55
← nx_ left11:58
← Vonter left12:01
→ Vonter joined12:08
← tchan1 left12:09
→ tchan joined12:09
← The_Blode left12:13
→ nyuszika7h joined12:15
→ The_Blode joined12:21
→ rond_ joined12:23
→ coot joined12:23
→ rewrit3 joined12:24
← tirnanog left12:28
→ christall joined12:31
→ ledtc joined12:35
← Vonter left12:37
→ Vonter joined12:38
cbreak nedbat: author and committer are identities with a purpose12:51
the information in git's config is not purpose-bound, it can be used for both authorship and committer identity12:51
using --global makes sense in general for user names, after all, a user account obviously belongs to a single user, with a single name.12:52
for e-mail addresses you might want to have different ones in different repos, but if you want that, you can set it per repo afterwards12:53
← loki_val left12:55
→ jwillikers joined12:58
→ crabbedhaloablut joined12:59
← christall left12:59
nedbat cbreak: i understand that in general --global makes sense. just not in a github action13:00
← ackyshake left13:07
→ cbreak joined13:08
→ LouWestin joined13:12
← cbreak left13:14
→ R2robot joined13:16
→ cbreak joined13:22
← Lord_of_Life left13:23
→ Lord_of_Life joined13:25
davve why not?13:25
→ pulse joined13:27
ikke davve: The environment is typically ephemeral and operates on a single repository13:27
→ bin4ry joined13:28
← Lord_of_Life left13:31
→ natrys joined13:32
→ Lord_of_Life joined13:34
← wolfdale3 left13:38
→ nx_ joined13:38
← Lord_of_Life left13:38
→ wolfdale4 joined13:40
← jwillikers left13:45
← rewrit3 left13:46
→ Lord_of_Life joined13:47
→ pycurious joined13:52
← Lord_of_Life left13:54
→ Lord_of_Life joined13:56
→ christall joined14:00
→ Cleverness joined14:01
→ jwillikers joined14:05
← Lord_of_Life left14:08
→ whupdup joined14:09
whupdup Hey, can someone help me figure out how to change a file in my commit history? I have a .gitmodules file with only 1 commit associated (adding the file) and I want to overwrite the file in that commit with a different .gitmodules14:10
so that the repository it references can't show up in git history14:11
ikke whupdup: note that, event though one commit changed that file, all subsequent commits 'contain' it14:11
whupdup: you need something like !filter-repo for it14:12
gitinfo whupdup: A new git add-on that greatly improves on git-filter-branch: https://github.com/newren/git-filter-repo14:12
→ Lord_of_Life joined14:13
← R2robot left14:16
← Lord_of_Life left14:16
→ zebrag joined14:17
→ R2robot joined14:18
→ R2robot_ joined14:21
→ rsx joined14:23
← R2robot left14:24
← whupdup left14:26
← coot left14:28
← christall left14:28
→ gast0n joined14:33
← Gustavo6046 left14:35
→ Gustavo6046 joined14:36
→ avu joined14:40
← Cleverness left14:42
→ Lord_of_Life joined14:58
← pycurious left14:58
← causasui left14:58
→ pycurious joined14:59
→ bket joined15:03
→ hnOsmium0001 joined15:05
→ ChmEarl joined15:06
audio → audiocat15:08
← wolfdale left15:09
← Murr left15:09
wolfdale4 → wolfdale15:09
→ Murr joined15:10
← pycurious left15:14
→ thiago joined15:16
← nx_ left15:17
→ pycurious joined15:20
← rsx left15:21
→ Null_A joined15:22
→ christall joined15:28
→ coot joined15:32
→ rgrinberg joined15:34
← wolfdale8 left15:40
→ ramblebamble joined15:41
← tang^ left15:42
← epolanski left15:50
→ tang^ joined15:50
tang^ → DoofusCanadensis15:52
← m0viefreak left15:52
→ sudoforge joined15:54
→ buffet joined15:54
← christall left15:57
→ XV8 joined15:58
→ wootehfoot joined16:00
→ blackandcold joined16:05
← Gustavo6046 left16:06
← coot left16:07
← blackandcold left16:17
← jinsun left16:19
← durham left16:21
→ Gustavo6046 joined16:22
→ durham joined16:23
← natrys left16:26
→ mjoerg joined16:30
← mjoerg left16:42
→ coot joined16:48
← Vonter left16:54
→ christall joined16:54
← XV8 left16:55
→ Vonter joined16:55
→ XV8 joined16:56
← XV8 left16:57
→ jazzy joined17:10
← R2robot_ left17:12
→ jinsun joined17:13
→ Orphis joined17:15
← Null_A left17:16
← jazzy left17:21
→ ttree joined17:26
→ jazzy joined17:27
→ spare joined17:27
jazzy → jazz-o-lantern17:27
→ natrys joined17:28
→ vancz joined17:32
← irrgit_ left17:32
→ cdown joined17:33
→ pulse_ joined17:34
→ node1 joined17:35
← pulse left17:37
← cdown left17:41
← spare left17:43
→ spare joined17:43
← ravan_ left17:46
← rond_ left17:46
→ ravan joined17:46
→ kawics11 joined17:54
← kawics11 left17:55
→ kawics11 joined17:55
→ pretty_dumm_guy joined17:57
← LuxuryMode left17:59
← kawics11 left17:59
→ ss4 joined18:09
→ Yruama joined18:10
← wootehfoot left18:13
← ravan left18:16
← christall left18:21
→ christall joined18:21
← molt left18:26
→ MrMagic joined18:26
→ molt joined18:26
← indy left18:28
→ MrC joined18:28
→ qsx joined18:29
← gjnoonan left18:29
→ gjnoonan joined18:30
→ indy joined18:30
← coot left18:30
← rgrinberg left18:32
→ hbautista_ joined18:33
← MrMagic left18:34
→ MrMagic_ joined18:34
← Baughn left18:36
← node1 left18:37
← christall left18:38
→ mat001_ joined18:40
→ Baughn joined18:40
→ rambleba1 joined18:41
→ phroa` joined18:41
→ keypushe- joined18:41
→ Dotz0cat_ joined18:41
→ Bitflux joined18:42
← ramblebamble left18:42
← mat001 left18:42
← keypusher left18:42
← jetchisel left18:42
Dotz0cat_ → Dotz0cat18:42
→ BigShip joined18:42
→ arand joined18:43
← meator left18:43
→ jetchisel joined18:43
→ avar joined18:43
← MrMagic_ left18:43
→ cambrian_invader joined18:43
keypushe- → keypusher18:45
→ MrMagic joined18:47
← ss4 left18:48
pulse_ → pulse18:48
← MrMagic left18:52
→ MrMagic joined18:52
← MrMagic left18:56
→ MrMagic joined18:56
← natrys left19:05
→ christall joined19:09
← Murr left19:09
→ Murr joined19:09
← paruh left19:13
→ jiffe joined19:13
← MrMagic left19:18
→ MrMagic_ joined19:18
← thiago left19:19
← bkircher left19:25
← MrMagic_ left19:27
→ MrMagic joined19:27
← ThorMojito left19:30
← christall left19:31
← MrMagic left19:31
→ MrMagic joined19:32
→ igemnace joined19:32
← The_Blode left19:34
← MrMagic left19:41
→ MrMagic joined19:42
→ bloody joined19:42
→ nx_ joined19:44
→ ravan joined19:45
← MrMagic left19:45
→ MrMagic joined19:45
← mei left19:51
← MrMagic left19:54
← jetchisel left19:54
→ MrMagic joined19:55
→ paruh joined19:56
→ jetchisel joined19:56
→ coot joined20:01
← MrMagic left20:03
→ MrMagic joined20:04
→ christall joined20:06
← ttree left20:07
← pycurious left20:08
← MrMagic left20:10
→ MrMagic joined20:11
→ ThorMojito joined20:12
→ ttree joined20:21
← wender left20:25
← zumba_addict left20:29
← christall left20:31
← xx left20:31
→ pycurious joined20:31
→ The_Blode joined20:33
← cliluw left20:41
→ cliluw joined20:41
← momomo left20:44
← przemoc left20:44
← gast0n left20:44
→ przemoc86 joined20:44
→ mns joined20:44
→ momomo joined20:46
← Gustavo6046 left20:48
→ Gustavo6046_ joined20:48
← MrMagic left20:49
→ m0viefreak joined20:50
→ fjmorazan joined20:51
← DoofusCanadensis left20:51
Gustavo6046_ → Gustavo604620:51
→ MrMagic joined20:51
← Gustavo6046 left20:58
→ Gustavo6046 joined21:01
→ shailangsa joined21:04
→ ackyshake joined21:04
← jazz-o-lantern left21:05
← Murr left21:09
← nivag left21:09
← ackyshake left21:09
→ Murr joined21:09
← coot left21:11
← erich_zann left21:12
← Gustavo6046 left21:13
← MrMagic left21:14
→ Gustavo6046 joined21:15
→ nivag joined21:16
→ christall joined21:18
→ Guest58 joined21:18
Guest58 Could someone Git-savvy explain why Git mysteriously ignores some directories? I have <code>alias home='git --work-tree=$HOME --git-dir=$HOME/.home'</code> in my ~/.bashrc and I do not have a ~/.gitignore file. After doing <code>home init</code> and <code>home status</code>, some files do not show up. Why is this?21:19
→ MrMagic joined21:20
← Lord_of_Life left21:21
rambleba1 Guest58, what do you mean they don't show up, as in they are not committed or they are not displayed when you do a ls ont he filesystem or they are not present when you do a git status21:23
← MrMagic left21:24
→ MrMagic joined21:24
Guest58 @rambleba1: some files that do exist in $HOME do not show up when I run <code>home status</code>21:25
→ Lord_of_Life joined21:25
→ LuxuryMode joined21:26
← Gustavo6046 left21:26
Guest58 diff <(home status |grep -P "\t" |sed 's/^[\t]//' |sort) <(ls -1Ap |sort)21:27
gives21:27
12a1321:27
> desktop/21:27
46a4821:27
> public/21:27
52a5521:27
> templates/21:27
53a5721:27
> .texmf/21:27
57a6221:27
> .w3m/21:27
61a6721:27
> .vnc/21:27
→ DoofusCanadensis joined21:27
→ jazzy joined21:29
rambleba1 Well first of a paste-bin would be better :) also, could you write the commands out instead of using aliases eg. home status, I assume git status with some paramters? Also: are the folders desktop public etc. in your repository ? If not than you have your answer already, because git does not keep track of folders, only of files21:30
j416 Guest58: are those directories empty?21:31
Guest58: are the files in those directories already committed?21:32
Guest58 j416: ah, yes, this might be an explanation21:33
rambleba1: diff <(git --work-tree=$HOME --git-dir=$HOME/.home status |grep -P "\t" |sed 's/^[\t]//' |sort) <(ls -1Ap |sort)21:33
http://dpaste.com/G9JH6DK9B21:33
→ AbleBacon joined21:33
Guest58 immediately after git --work-tree=$HOME --git-dir=$HOME/.home init21:34
j416: no, some of these directories are nonempty (.texmf for example)21:35
rambleba1 thank you21:36
j416 Guest58: status won't show things that are already committed.21:36
→ Gustavo6046 joined21:36
Guest58 j416: but nothing is committed! This is immediately after init21:36
j416 also, Git doesn't track empty directories.21:37
→ ackyshake joined21:37
j416 (and status won't show those either)21:37
Guest58 j416: my .texmf directory is nonempty, but the other ones (http://dpaste.com/G9JH6DK9B) are empty, and would thus be explained by that21:38
j416 user error?21:39
← christall left21:40
Guest58 j416: yes, most likely, but I can't figure out what I am doing wrong21:40
j416 also, I would advise you to avoid keeping your $HOME in a Git repo.21:40
→ natrys joined21:40
← natrys left21:41
rambleba1 Guest58 linux has /etc/skel for that ;)21:41
j416 way too easy to accidentally destroy something. 'git clean -dfx' would delete anything untracked, for instance.21:41
← jazzy left21:42
rambleba1 as to your commands, it strikes me as odd that work-tree is used although it is the right directory,21:42
Guest58 j416: --work-tree=$HOME --git-dir=$HOME/.home21:42
j416 Guest58: yes?21:42
Guest58 just running git would not find this21:42
rambleba1 do you happen to have a global .gitignore or configuration that might ignore files depending on patterns that are in the non-empty folders being ignored?21:43
Guest58 no risk of accident21:43
j416 Guest58: "home clean -dfx", then21:43
Guest58 j416: won't run that21:43
j416 but yes, one step safer calling it .home.21:43
Guest58 rambleba1: no, there is no .gitignore21:43
j416 also, be careful if you have any other git repos in under $HOME.21:44
Guest58 all I want to do is to keep some of my config files under git21:44
j416 they'd be tracked as, I forget the name, but something that's not quite submodules and still not full repos.21:45
Guest58: I'd keep my config files in a separate dir and use symlinks.21:45
rambleba1 Guest58, I recommend writing a small package for your distribution, keeping that in GIT and installing it21:45
j416 Guest58: either symlink manually (script it), or use something like stow21:46
Guest58 thank you for your suggestions, rambleba1 and j41621:46
I will investigate those and see if I can make that work for me21:47
j416 Guest58: here's how I do it, fwiw. https://github.com/jsageryd/.config.d21:47
rambleba1 you are welcome, it still irks me that we still don't know why it is being ignored -.-21:47
j416, what is stow?21:48
j416 symlink manager thing21:48
← ledtc left21:48
j416 https://www.gnu.org/software/stow/21:49
rambleba1 ah so pretty much s.th. like layover FS but with symlinks nice21:50
thx21:50
→ jazzy joined21:50
Guest58 thanks again, I got some reading to do :) bye21:52
← Guest58 left21:52
← rambleba1 left21:54
→ Null_A joined22:02
→ gxt joined22:03
→ oriba joined22:09
← mven left22:11
→ mven joined22:12
→ rgrinberg joined22:14
→ Betal joined22:17
→ nobody_ joined22:19
← jwillikers left22:20
→ tirnanog joined22:20
← Gustavo6046 left22:28
→ Gustavo6046 joined22:31
→ roadie joined22:31
← vdamewood left22:34
← rgrinberg left22:36
→ ChemicalRascal joined22:39
→ christall joined22:39
→ rgrinberg joined22:39
← Null_A left22:45
→ hqdruxn08_ joined22:48
← hqdruxn08__ left22:52
→ gast0n joined22:52
← Gustavo6046 left22:54
← retro_ left22:55
→ Gustavo6046 joined22:59
← palasso left23:00
← pizdets left23:02
→ pizdets joined23:03
→ nyah joined23:04
← christall left23:08
→ retroid_ joined23:13
← ttree left23:14
→ Null_A joined23:14
← kenanmarasli left23:18
← nobody_ left23:23
← rgrinberg left23:27
→ R2robot joined23:32
← mat001_ left23:40
← skapata left23:40
→ thiago joined23:48
→ nvmd joined23:56

Logs Search ←Prev date Next date→ Channels Documentation