IRCloggy #git 2019-08-19

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.

2019-08-19

← de-facto left00:01
→ silverwhitefish joined00:01
→ de-facto joined00:01
→ fphilipe_ joined00:12
← tufteddeer left00:14
→ tufteddeer joined00:14
← Atlenohen left00:14
← kerframil left00:15
→ freeman42y joined00:15
← Achylles left00:18
← tufteddeer left00:19
← freeman42x left00:19
← Newami left00:22
← CryptoDavid left00:22
→ learningc joined00:29
← learningc left00:31
→ _ADN_ joined00:34
→ tufteddeer joined00:36
← _ADN_ left00:39
← ElFerna left00:40
← fphilipe_ left00:46
→ dartmouthed joined00:59
← liberiga left01:03
→ speerfissure joined01:04
→ smccarthy joined01:06
← ryantrinkle left01:16
← yyy left01:18
← rsrx left01:23
← ericnoan left01:26
→ jamiejackson joined01:27
→ crose joined01:28
→ ericnoan joined01:29
→ igemnace joined01:30
← m1dnight_ left01:30
→ ryantrinkle joined01:30
← veegee_ left01:30
→ m1dnight_ joined01:32
← randomdude999 left01:34
← tufteddeer left01:35
→ tufteddeer joined01:41
← tufteddeer left01:45
← m0viefreak left01:51
→ stevenbenner joined01:52
→ clime joined01:55
← igemnace left01:55
→ igemnace joined01:56
→ learningc joined01:59
← doug16k left02:00
→ tufteddeer joined02:03
→ yyy joined02:03
← clime left02:05
→ malta89 joined02:09
malta89 Hola02:09
Sin mentir ,primera vez utilizando freenode alguien que sepa español por estos lados02:10
Bien ya entiendo como funciona esto.02:11
Lo dejare por hoy. :P02:11
Mentada carita no significativa02:11
← malta89 left02:11
← R2robot left02:12
→ R2robot joined02:14
wyoung malta89 ?02:15
← zulutango left02:18
→ zulutango joined02:18
→ cfoch joined02:21
← jamiejackson left02:23
→ zeroxprime joined02:27
← diogenese left02:29
← fethio left02:29
← Cabanossi left02:29
← yyy left02:30
→ _ADN_ joined02:35
← armyriad left02:36
← zeroxprime left02:39
← smccarthy left02:40
← comptroller left02:40
← _ADN_ left02:40
→ fethio joined02:42
→ Cabanossi joined02:42
→ fphilipe_ joined02:42
→ Kaisyu joined02:43
← noonien left02:46
lagothrix → Guest376102:47
← Guest3761 left02:47
→ lagothrix joined02:47
→ maxel joined02:50
→ diogenese joined02:50
→ causa_sui joined02:53
← lucasb left03:02
← thiago left03:10
Hoffman → Hoff03:12
→ slovenian89 joined03:15
→ thiago joined03:15
← fphilipe_ left03:17
← jubal left03:22
→ skibur joined03:25
← skibur left03:25
→ gutierri joined03:25
← diogenese left03:30
← freeman42y left03:30
→ ivorybishop joined03:32
→ mven joined03:33
← speerfissure left03:33
← mven` left03:33
← _xor left03:45
→ _xor joined03:45
← slovenian89 left03:48
→ fjellfras joined03:48
→ diogenese joined03:48
← fjellfras left03:48
→ fjellfras joined03:49
→ duderonomy joined03:50
→ slovenian89 joined03:51
← xcm left03:55
→ xcm joined03:56
→ keepLearning512 joined03:59
← shored left04:03
→ shored joined04:03
← dartmouthed left04:04
← mrCyborg left04:05
→ mrCyborg joined04:06
← donofrio left04:06
← queip left04:13
→ toothe joined04:15
← atrigent left04:17
→ queip joined04:24
→ jubal joined04:32
→ _ADN_ joined04:36
← jubal left04:40
→ jubal joined04:41
← _ADN_ left04:41
← isan left04:52
→ beastDiv_ joined04:53
→ Wetmelon joined04:58
← queip left04:58
← gutierri left04:58
← jubal left04:58
→ pks_ joined05:01
← pks left05:02
pks_ → pks05:02
→ jubal joined05:03
→ fphilipe_ joined05:03
→ queip joined05:04
→ howdoi joined05:04
pr100|afk → pr10005:05
← fphilipe_ left05:08
→ pyfgcr joined05:09
← igemnace left05:09
→ igemnace joined05:10
→ fphilipe_ joined05:13
← fphilipe_ left05:21
← Wetmelon left05:25
→ fphilipe_ joined05:28
← ivorybishop left05:28
→ drbean joined05:28
← pyfgcr left05:29
← waveclaw left05:33
← orbyt_ left05:37
→ waveclaw joined05:40
← queip left05:57
→ dartmouthed joined06:12
→ queip joined06:16
→ sQVe joined06:17
← xcm left06:18
→ Noti joined06:19
→ rfuentess joined06:19
→ xcm joined06:20
→ mazuma joined06:20
→ g00s joined06:26
→ rakibul joined06:32
rakibul hello. I have a question about git with pass. can I ask here?06:34
dodobrain what is 'pass' ? anyway you can ask git questions here, dont ask to ask06:35
Wulf rakibul: passwords? don't use them.06:36
moritz pass is a password store that uses a git repo for storing and merging files06:37
rakibul pass the unix password manager tool. a command line utility06:37
→ dege joined06:37
→ _ADN_ joined06:37
→ n3wborn joined06:39
rakibul I know git should see the gpg encrypted password files. but I was hoping it can at least tell they have changed. I git init on .password-store. add all and commit. then changed a password file. but git status says 'dirctory unchanged'.06:39
dodobrain did you save the file? and what does `git status --ignored` report?06:40
rakibul password file did change. and if take sha256 of the file before and after it shows the different sha. but git can't tell the difference.06:40
no .gitignore file in that directory.06:41
← _ADN_ left06:42
rakibul i know it is probably incoreect use of git as they files are not plain text files. but i was hoping to manage different version of them through git.06:43
← keepLearning512 left06:44
thiago you can06:46
the problem is elsewhere06:46
rakibul so for i have tried two different machine.06:47
same issue. git can tell if new file is added. but can't see the change in file.06:48
thiago assume git is right and you're doing something wrong06:48
does git ls-files list the file?06:48
rakibul i have tried adding external difftool to 'cmp'. still could not get it to see the change in file.06:48
← oatmealraisin left06:49
thiago again, assume git is right and look for what you're doing wrong06:50
rakibul yes git ls-files shows file.06:50
thiago if it tells you there are no changes, then there are no changes in the files it is looking at06:50
→ oatmealraisin joined06:51
rakibul but the file is changing. and sha256 can prove it. so can i by using 'pass changedfile'06:51
→ TomyWork joined06:52
thiago have you got any commits on that file already?06:52
rakibul i know git diff is for text only. pass files are gpg encrypted. but every updated changes the file content.06:53
no. only initial commit.06:53
thiago initial commit of what?06:53
"any commits to that file" -> "no, only initial commit" implies you created a commit containing something else, other than the file in question06:54
← queip left06:55
rakibul if git can not see file change, how can i create a commit! thats a strange queation.06:55
← dcpc007 left06:56
thiago you said you have a commit06:56
so I am asking: what did you commit, if it wasn't the file?06:56
rakibul commit #1 when they file was first created and the first password stored.06:56
thiago ok, so you meant "yes" when you said "no"06:57
yes, you do have at least one commit06:57
rakibul i did not unserstand your queation correctly.06:57
pr100 → pr100|afk06:58
_ikke_ realies: what does git ls-files -v <filename> return?06:58
rakibul:*06:58
thiago ok, show me the full terminal output of the following: ls -l of the directory before you make change to the file; 2) git status of that dir. Then repeat for after you make the change.06:58
and what _ikke_ asked06:59
rakibul H filename06:59
_ikke_ Aha06:59
oh06:59
← planigan left06:59
← beastDiv_ left06:59
thiago now the git status and ls -l before and after a change. Pastebin please.07:00
rakibul ok wait.07:00
→ DWestCoast joined07:01
← Noti left07:02
→ Noti joined07:02
→ queip joined07:04
← DWestCoast left07:05
← macroprep left07:08
rakibul https://pastebin.com/xv6jTYbV07:09
_ikke_ raw: https://pastebin.com/raw/xv6jTYbV07:09
thiago still waiting07:10
rakibul aplogiea for the delay. but link is above.07:10
thiago incomplete07:11
rakibul *Apologies07:11
thiago can you give the git status I also asked for, before and after?07:12
rakibul I'm on android mobile. output gathered are from userland running ubuntu.07:12
→ beastDiv_ joined07:12
thiago get to a real computer, please07:12
rakibul user2@localhost:~/.password-store$ git status07:13
← cfoch left07:13
rakibul nothing to commit. working tree clean.07:14
→ pyfgcr joined07:14
thiago before too?07:14
rakibul ya07:14
→ Mattiaslndstrm joined07:14
thiago please un-alias ls and show me the actual ls -l output07:15
without -h07:15
rakibul but note these are .gpg file.07:15
thiago then git cat-file -s @:digocean.gpg07:15
rakibul so it would be understandable that git will not understand the content.07:15
thiago git doesn't need to understand the content07:16
← beastDiv_ left07:17
← Mattiaslndstrm left07:17
rakibul user2@localhost:~/.password-store$ git cat-file -s @:digocean.gpg07:17
→ Mattiaslndstrm joined07:18
thiago what was the answer?07:18
rakibul 2976 i guess.07:19
→ qassim joined07:19
thiago ok, now the ls -l without -h07:19
unalias ls; ls -l digocean.gpg07:21
rakibul user2@localhost:~/.password-store$ /bin/ls -l digocean.gpg07:21
sorry. my bad. forgot my ls is alias to -lh.07:22
← queip left07:22
← Bobdude left07:22
thiago ok, what did it print?07:22
rakibul ^above07:22
thiago you never gave the answer07:22
what did ls print?07:22
rakibul digocean.gpg07:23
thiago with -l?07:23
rakibul -rw-------. 1 user2 user2 2976 Aug 19 07:0507:23
thiago thanks07:23
the size is right07:23
← cd left07:23
rakibul yes it is.07:23
thiago so I stand by what I said: git is right. The file isn't modified.07:24
is it possible something is committing behind your back?07:24
check the git log07:24
→ sphalerite_ joined07:24
rakibul no cron job. no.07:24
thiago how about pass itself?07:24
→ cyalc joined07:25
thiago check the git log. is the commit at the top the same before and after the edit?07:26
→ flaviodesousa joined07:26
→ thefatma joined07:26
rakibul i do not think pass has any knowledge of git.07:28
thiago check the git log07:28
← drbean left07:29
rakibul dang!07:30
← xcm left07:30
rakibul commit 4a177f29921ee3e76f89a79fda3b3032b033cc4107:30
i think you are right. i think pass is being too cleaver.07:30
thiago probably07:31
← mazuma left07:31
thiago and with that, good night07:31
rakibul i'll go back and read the source code of the pass to pin point the issue. thank you. you are very cleaver.07:32
← g00s left07:32
rakibul good night.07:32
→ xcm joined07:33
→ _ADN_ joined07:34
→ mazuma joined07:34
← lankanmon left07:35
← fethio left07:35
← mazuma left07:36
← thiago left07:36
→ Flaghacker joined07:42
← diogenese left07:42
→ gxt joined07:43
← Flaghacker left07:43
← cyalc left07:44
→ drbean joined07:46
→ queip joined07:47
→ z|bandito joined07:49
→ fethio joined07:50
→ diogenese joined07:50
← oatmealraisin left07:52
→ clime joined07:55
→ keepLearning512 joined07:58
← hussam left07:59
← queip left07:59
→ bolovanos joined08:02
← Goplat left08:07
→ libertyprime joined08:08
← sphalerite left08:10
← cbreak left08:10
sphalerite_ → sphalerite08:10
→ queip joined08:11
→ cbreak joined08:11
← mescalinum left08:15
→ SilentGhost joined08:16
→ fetus_deletus joined08:18
→ mescalinum joined08:19
← nivag left08:20
← keepLearning512 left08:21
→ ivorybishop joined08:22
ivorybishop → speerfissure08:22
← diogenese left08:22
→ mimajof joined08:22
→ keepLearning512 joined08:24
← rakibul left08:24
→ rakibul joined08:25
← rakibul left08:25
← queip left08:26
← simon left08:28
← n3wborn left08:31
→ queip joined08:31
pr100|afk → pr10008:34
← bket left08:34
→ bket joined08:34
← Stoot left08:39
→ lacrymology joined08:41
→ TomTom joined08:43
→ feriman joined08:46
→ bluesmonk joined08:49
← zamba left08:50
→ randomdude999 joined08:51
→ zamba joined08:54
→ diogenese joined08:54
← ChrisLane left08:55
→ nivag joined08:55
→ nivag_ joined08:55
→ ChrisLane joined08:56
← zamba left09:00
← fethio left09:03
→ zamba joined09:03
→ figuinhas joined09:03
← nivag_ left09:05
→ fethio joined09:06
← figuinhas left09:11
→ computer2000 joined09:12
→ JaredCE joined09:15
← neunon left09:15
→ neunon joined09:17
← zamba left09:17
→ floppydh joined09:18
→ neunon_ joined09:19
→ fstd_ joined09:22
← neunon left09:22
neunon_ → neunon09:22
→ yokisuci joined09:23
← yokisuci left09:23
→ zamba joined09:23
← KnoP left09:23
← kjartan left09:24
→ kjartan joined09:25
← fstd left09:26
fstd_ → fstd09:26
→ KnoP joined09:27
← pie_ left09:27
← neunon left09:29
→ figuinhas joined09:30
← diogenese left09:30
→ neunon joined09:30
→ beastDiv_ joined09:32
← bluesmonk left09:36
← queip left09:36
← randomdude999 left09:37
→ randomdude999 joined09:39
→ diogenese joined09:39
← learningc left09:39
← lacrymology left09:41
← d^sh left09:52
← catsup left09:53
→ catsup joined09:54
→ lacrymology joined09:54
→ d^sh joined09:55
← tombusby left09:57
→ lacrymol1gy joined09:58
→ nerosnm joined09:59
← fphilipe_ left10:01
→ hellauer joined10:01
→ learningc joined10:04
pr100 → pr100|afk10:07
→ tombusby joined10:07
→ gloomy joined10:12
→ rsrx joined10:15
← keepLearning512 left10:16
→ keepLearning512 joined10:25
← keepLearning512 left10:25
← yonder left10:26
→ keepLearning512 joined10:26
← lacrymol1gy left10:29
→ hussam joined10:34
→ Atlenohen joined10:38
← JaredCE left10:38
← rsrx left10:39
← m1rror left10:39
→ m1rror joined10:40
→ kreyren joined10:40
kreyren i have https://github.com/ohmybash/oh-my-bash/pull/100 is there a way to mirror file from repository A to repository B ?10:40
(on github)10:41
BtbN click the fork button10:42
kreyren BtbN, not an option since repository B is different from repository A (using only component from A)10:42
BtbN Then you will have to copy it manually10:43
kreyren BtbN, any other way? this is pita..10:43
BtbN Add the other repo as submodule I guess10:44
kreyren BtbN, that might work but project would have to be adapted for it.. which shoudn't be an issue.. thanks!10:46
BtbN it's also massive overkill for a single file, I'd just copy it10:47
kreyren BtbN, i need it to be automatized since it has shit ton of files that are fetched from other repositories10:47
← lacrymology left10:47
→ craigo joined10:48
← figuinhas left10:49
→ figuinhas joined10:49
→ lacrymology joined10:51
← nerosnm left10:52
lacrymology → lacrym1logy10:52
← gloomy left10:56
→ lalitmee joined10:57
← heroux left11:00
← fjellfras left11:01
→ jfontan joined11:03
← shored left11:04
→ shored joined11:04
→ nerosnm joined11:05
← lalitmee left11:05
→ troulouliou_div2 joined11:07
→ yyy- joined11:07
→ emsjessec joined11:07
→ heroux joined11:07
pr100|afk → pr10011:10
→ RoriconKnight joined11:11
→ fphilipe_ joined11:17
← xcm left11:18
→ xcm joined11:20
← feriman left11:23
→ lalitmee joined11:23
→ rakibul joined11:23
← rakibul left11:26
→ rakibul joined11:33
← Atlenohen left11:37
← rakibul left11:39
→ Viking667 joined11:39
← learningc left11:39
Viking667 Good evening. I'm a bit new to git, I'm wanting to add a folder of files. git-commit --dry-run is telling me that .gitattributes is modified and not added, is this usually added to the git repo?11:40
_ikke_ yes, it usually is11:40
Viking667 Ah, okay. Thanks.11:40
That's going to be fun to justify to my upstream...11:41
_ikke_ There is a repositor local file as well11:41
.git/info/attributes11:41
You can place attributes there that are not relevant for upstream11:42
Viking667 Interesting. I'll look at that, though it might end up being relevant for upstream if I get the job of maintaining the docs...11:42
← beastDiv_ left11:42
nedbat Viking667: why is your change adding .gitattributes?11:43
Viking667 I was working with a set of files in CRLF format (they're XML files stored from a Windows machine) and I'm on Linux - I'd rather not change them back-or-forth to LF11:43
But they don't have .xml files listed in their .gitattributes file (as they don't have any)11:44
← RoriconKnight left11:44
nedbat Viking667: if they already deal with line endings, just not in xml files, then they should be fine with it.11:44
Viking667: if they don't have windows line endings anywhere yet, then they may object.11:44
→ RoriconKnight joined11:45
Viking667 They're a Windows project. I'm trying to ease the process, as I'm not on Windows most of the time.11:45
nedbat Viking667: sounds like you will be fine then11:45
pr100 → pr100|afk11:45
Viking667 so... leave the .xml out of my own .gitattributes?11:45
← lacrym1logy left11:45
Viking667 then git-add complains about line endings.11:45
I can't remember the exact complaint, I'll go look it up again11:46
nedbat Viking667: no, i meant you should commit the change to .gitattributes11:46
Viking667 Right. Then that brings me to my next question, which is a bit more involved.11:46
If I rebase to their HEAD a few times, that shows up as commits to my repo (obviously). If I want to do a pull request from me to their HEAD, how do I leave those commits off the pull request?11:47
(at least, I think that's the way around I mean)11:48
i.e. let's say I changed two files, and want their HEAD to pull in JUST those two files, without all the other catch-up commits I did.11:48
I've heard of cherry-picking, but that seems to apply more to branches than what I'm using it in.11:49
← rigid left11:50
→ rigid joined11:52
→ mowcat joined11:53
Viking667 Ah, here we are: Warning: CRLF will be replaced by LF in blah.h....The file will have its original line endings in your working directory.11:55
That's why I wanted to add .xml files (blah.h was just an example) so git wouldn't complain.11:56
→ oatmealraisin joined11:58
← jcbitter left12:00
→ jcbitter joined12:01
→ beastDiv_ joined12:04
Viking667 AH well, I'll have to pick this up another time. Thanks for the help.12:08
← Viking667 left12:08
← bolovanos left12:09
→ CodeSlingerPaul joined12:12
→ Fischmiep joined12:17
→ learningc joined12:20
← Mattiaslndstrm left12:21
→ subopt joined12:21
→ malmalmal joined12:23
← Cabanossi left12:23
→ gloomy joined12:32
→ Cabanossi joined12:32
← Fischmiep left12:33
← jas4711 left12:36
← rfuentess left12:37
→ Fischmiep joined12:37
← Oleg_ left12:37
← lalitmee left12:39
→ rsrx joined12:40
→ lucasb joined12:41
→ Mattiaslndstrm joined12:42
← figuinhas left12:47
← keepLearning512 left12:47
→ figuinhas joined12:48
→ rfuentess joined12:51
← Fischmiep left12:58
→ feriman joined12:58
→ andrybak joined13:02
← tombusby left13:03
← yyy- left13:03
→ tombusby joined13:06
→ ThiefMaster joined13:09
→ keepLearning512 joined13:09
← gloomy left13:12
← gxt left13:19
← thefatma left13:22
← ryantrinkle left13:28
← igemnace left13:38
→ igemnace joined13:39
← oatmealraisin left13:40
→ Stoot joined13:41
→ lacrymol1gy joined13:47
→ bluezone joined13:54
← troulouliou_div2 left13:56
→ pie_ joined13:56
→ lalitmee joined13:57
→ yyy- joined14:00
← keepLearning512 left14:01
→ Es0teric joined14:02
← malmalmal left14:02
← figuinhas left14:03
← nerosnm left14:05
→ Oleg_ joined14:06
→ ravndal joined14:08
→ thiago joined14:09
→ rfuentess__ joined14:10
← beastDiv_ left14:10
→ beastDiv_ joined14:11
→ greggerz joined14:11
← xcm left14:13
← lalitmee left14:14
→ xcm joined14:14
→ lalitmee joined14:14
← rfuentess left14:14
→ bobrosswins joined14:15
→ keepLearning512 joined14:16
← slovenian89 left14:19
← andi_ left14:19
← EliTheGamerFTW left14:19
← shored left14:21
→ shored joined14:21
j416 what's the correct way to get rid of this ref? refs/original/refs/heads/foo14:24
it seems it's in a pack; there's nothing in .git/refs/original/14:24
→ figuinhas joined14:26
canton7 j416, `git for-each-ref --format="%(refname)" refs/original/ | xargs -n 1 git update-ref -d`14:26
j416, see "Checklist for shrinking a repository" in man git filter-branch14:26
gitinfo j416: the git-filter-branch manpage is available at https://gitirc.eu/git-filter-branch.html14:26
j416 canton7: I only have that one ref, I'll use update-ref. Thanks.14:26
canton7: nice, ty for the docs14:26
canton7 (refs/original is created as a backup by filter-branch)14:26
j416 should've checked the man page first; didn't think of it14:27
yes14:27
→ cdown joined14:27
← speerfissure left14:29
← beastDiv_ left14:30
→ oatmealraisin joined14:30
→ ryantrinkle joined14:32
← lalitmee left14:35
← sQVe left14:36
j416 o/14:36
← ExtraSteve left14:37
← xcm left14:38
→ xcm joined14:38
rfuentess__ → rfuentess14:39
← cdown left14:43
_ikke_ git push +:/refs/original/* (untested) should work as well14:44
← bobrosswins left14:45
← igemnace left14:45
← RoriconKnight left14:45
_ikke_ git push . +:/refs/original/*14:45
something like that14:45
→ bobrossw_ joined14:46
← bobrossw_ left14:46
→ beastDiv_ joined14:50
→ cdown joined14:50
← thiago left14:50
← beastDiv_ left14:51
→ igemnace joined14:54
← irrgit left14:55
← yyy- left14:57
→ Phylock joined14:57
→ bluesmonk joined14:57
→ yyy- joined14:57
← tufteddeer left14:58
→ tufteddeer joined14:59
← jubal left14:59
← subopt left15:00
Xiti` → Xiti15:01
← fphilipe_ left15:01
→ AbleBacon joined15:01
→ subopt joined15:02
← hellauer left15:02
→ fphilipe joined15:02
← tufteddeer left15:03
→ tufteddeer joined15:04
→ boombatower joined15:05
← igemnace left15:07
→ igemnace joined15:08
← phy1729 left15:09
← drbean left15:10
← xcm left15:11
→ irrgit joined15:12
→ czart joined15:13
→ xcm joined15:14
← cdown left15:14
→ Bobdude joined15:14
← yyy- left15:17
← tufteddeer left15:18
← Noti left15:18
→ tufteddeer joined15:18
← feriman left15:19
← floppydh left15:22
← dege left15:22
→ nerosnm joined15:22
→ feriman joined15:22
← tufteddeer left15:22
← BrianBlaze left15:25
← libertyprime left15:25
→ BrianBlaze joined15:26
→ lalitmee joined15:32
→ tufteddeer joined15:35
← Phylock left15:35
← nerosnm left15:39
← tufteddeer left15:41
→ thiago joined15:42
← omnireq left15:45
pr100|afk → pr10015:45
→ ave_milia joined15:47
← BrianBlaze left15:47
← TomyWork left15:48
← lacrymol1gy left15:48
→ isan joined15:49
→ yyy- joined15:50
→ BrianBlaze joined15:51
→ Phylock joined15:51
← mimajof left15:51
→ agowa338 joined15:54
→ sainathvd joined15:54
→ cfoch joined15:54
← mowcat left15:57
→ lacrymol1gy joined15:59
→ veegee joined16:00
← tchan left16:01
→ tchan joined16:02
← flaviodesousa left16:03
← computer2000 left16:04
← causa_sui left16:05
← dviola left16:09
→ nowhereman joined16:09
← cbreak left16:12
→ orbyt_ joined16:12
→ cbreak joined16:13
→ fission6 joined16:14
← BrianBlaze left16:16
→ BrianBlaze420 joined16:17
← nowhereman left16:18
→ nowhereman joined16:25
→ AtumT joined16:25
→ hellauer joined16:25
→ nerosnm joined16:25
→ planigan joined16:29
← nowhereman left16:29
← Es0teric left16:34
→ gutierri joined16:36
→ bobrosswins joined16:37
← BrianBlaze420 left16:38
→ BrianBlaze joined16:39
← rfuentess left16:39
← pyfgcr left16:39
← planigan left16:43
← stux|RC-only left16:43
pr100 → pr100|afk16:43
← crose left16:44
← keepLearning512 left16:45
→ planigan joined16:45
← learningc left16:45
← BrianBlaze left16:46
→ atrigent joined16:48
← pR0Ps left16:49
← yyy- left16:49
→ BrianBlaze joined16:50
← planigan left16:50
← fission6 left16:53
→ stux|RC-only joined16:55
← orbyt_ left16:56
→ planigan joined16:57
← gutierri left16:59
← agowa338 left17:00
→ gloomy joined17:01
→ pR0Ps joined17:02
→ amcclure joined17:02
← fethio left17:03
→ jrnieder joined17:03
← fphilipe left17:05
→ skyikot joined17:06
← atrigent left17:09
← figuinhas left17:09
→ As4xk joined17:10
→ orbyt_ joined17:10
← amcclure left17:11
→ amcclure joined17:11
→ rafasc joined17:11
← skyikot left17:12
← lalitmee left17:12
→ martin-_-_ joined17:12
→ rmsvc joined17:13
martin-_-_ hi, I'm on master and modified some stuff like removing files, modifining files. (like git rm folder -r) how could I commit all this changes to a new branch?17:14
← sainathvd left17:14
_ikke_ martin-_-_: Just create/checkout a new branch17:17
uncommitted changes do not belong to any branch17:17
→ barteks2x joined17:17
→ fethio joined17:20
pr100|afk → pr10017:20
← causasui left17:21
→ azwieg103 joined17:21
→ rudrab joined17:22
← Cabanossi left17:23
→ plexigras joined17:24
→ omnireq joined17:28
← plexigras left17:30
→ Dirak joined17:31
→ plexigras joined17:32
← shored left17:33
→ shored joined17:33
→ fphilipe joined17:35
→ Cabanossi joined17:38
As4xk Hi. When I merge branch A (with commit xx, among others) into branch B, then the commits "xx" show up when running "git log" in both branch A and branch B (with the same hash). How can I checkout a commit hash from the perspective of one particular branch?17:39
_ikke_ As4xk: That's not how git works17:39
→ atrigent joined17:39
_ikke_ A commit is a commit, it exists outside of the branch you created it in17:40
→ skyikot joined17:40
vishal As4xk: a commit is the full snapshot of the repo, and it doesn't matter the branch it 'shows up in'. See !parable17:40
gitinfo As4xk: 'The git parable' provides some good reasoning behind git. http://tom.preston-werner.com/2009/05/19/the-git-parable.html17:40
← nerosnm left17:42
As4xk Hmm. Interesting. When reading _ikke_'s comment I though "Ah, so a commit is probably one patch". Which I get it's not, based on vishal's comment. I'll read the article and then I suspect I'll be back with new qestions. If not, even better. Thanks anyway!17:44
rafasc As4xk: That has to do with the definition of a branch in git.17:44
vishal a commit is *not* a patch. nothing in git is stored ad patches or diffs in fact17:44
s/ad/as/17:44
← bluesmonk left17:45
rafasc Takes this history as an example: https://i.stack.imgur.com/tEzfm.png17:45
Take for example Branch_B, most people would say that Branch_B has 3 commits. But this is wrong.17:46
← rsrx left17:46
martin-_-_ _ikke_ on https://stackoverflow.com/questions/14655816/how-to-commit-changes-to-new-branch/50177571 they write I would need to create first the branch and then add files with git add17:47
but my branch does not exist17:47
and I already added /removed the files with git add17:47
so I'm still unsure whether I lose my changes if I create a new branch17:48
rafasc In git, the branch is simply the label, a pointer. The commits that belong to it are those you find when you follow its ancestorors (in this case, going against the arrows, (this will anger math folks, because in this image the arrows should really be reversed))17:48
← rudrab left17:48
_ikke_ The order of git add/rm and creating the branch does not matter17:48
← andrybak left17:48
martin-_-_ ok thanks17:48
_ikke_ martin-_-_: if you want to create the branch on top of the currently checked out commit, it's very easy17:48
martin-_-_ why do they recommend using stash?17:48
I'm currently on master17:49
_ikke_ That might be necessary if you want to create the branch starting from a different commit17:49
martin-_-_ ah17:49
but I dont need git checkout -b your-new-branch. git -b your-new-branch should be enough, right?17:50
as I already checkout out the files by modifining them17:50
rafasc You still need to checkout -b new-branch, to create the branch and switch to it.17:51
martin-_-_ ah okay thx17:51
rafasc 'commit' "binds" the staged changes into the current branch. So if you want the changes in that branch, you need to checkout the branch.17:52
martin-_-_ thanks this worked :)17:54
rafasc I am saying "bind" in quotes, because what really happens is that commit just creates the commit with the staged changes, then move the branch-pointer to that commit.17:54
→ jubal joined17:55
→ wootehfoot joined17:58
← isan left17:58
→ Sasazuka joined18:00
→ SkarmoutsosV joined18:00
→ F0rTex joined18:01
martin-_-_ so I now wanted to push my local created branch. I tried this: git push -u origin Graph-Controlv1.0 but it get error: src refspec Graph-Controlv1.0 does not match any....18:05
← fethio left18:05
→ rudrab joined18:06
← Anthaas left18:06
_ikke_ martin-_-_: verify the local branch name hten18:07
then18:07
rafasc what does: git branch --show-current say?18:07
→ SteenJobs joined18:07
martin-_-_ I'm in master18:07
_ikke_ git branch?18:07
→ Anthaas joined18:08
martin-_-_ ok I think I found the problem18:08
git branch -a shows me <U+0083>Graph-Controlv1.018:09
_ikke_ Right, some unicode character crept in there18:09
rafasc 'NO BREAK HERE', I wonder how that happened.18:10
← fphilipe left18:10
_ikke_ Did you copy it from somewhere?18:10
martin-_-_ yes from the git bash cmd18:10
crap. I'm unable to switch into the branch18:10
I tried this git checkout <U+0083>Graph-Controlv1.018:11
_ikke_ yes, that's not going to work18:11
martin-_-_ I'm trying to use the command from the command history.... but I dont get it work to remove -b parameter18:13
← cfoch left18:13
rafasc maybe, git branch -m $'\u0083wtfGraph-Controlv1.0' 'Graph-Controlv1.0'18:13
if using bash.18:14
remove the "wtf", oops.18:14
maybe, git branch -m $'\u0083Graph-Controlv1.0' 'Graph-Controlv1.0'18:14
martin-_-_ thanks rafasc that did it!18:15
→ fethio joined18:19
→ malmalmal joined18:22
← sauvin left18:27
← omnireq left18:29
← gloomy left18:30
→ beastd joined18:31
← rudrab left18:34
→ comptroller joined18:38
→ nerosnm joined18:38
← TomTom left18:40
→ rudrab joined18:44
→ KeyJoo joined18:44
← atrigent left18:47
pr100 → pr100|afk18:49
→ freeman42x joined18:54
← nerosnm left18:54
→ cd joined18:56
→ Wizek joined18:57
→ gloomy joined18:57
← malmalmal left18:57
→ atrigent joined18:57
← sunri5e left19:05
← Dirak left19:05
→ sunri5e joined19:07
← rudrab left19:09
← fethio left19:12
→ mowcat joined19:12
→ troulouliou_div2 joined19:12
→ rudrab joined19:13
→ tufteddeer joined19:14
→ Jitta joined19:15
← nicolaus left19:20
← tufteddeer left19:22
→ tufteddeer joined19:23
← martin-_-_ left19:23
← Mattiaslndstrm left19:23
→ nicolaus joined19:24
← rnsanchez left19:25
→ dege joined19:26
→ fethio joined19:27
← orbyt_ left19:28
ephemer0l → GeneralDiscourse19:29
→ fphilipe joined19:33
→ yyy- joined19:34
← rudrab left19:35
← bobrosswins left19:37
→ rnsanchez joined19:38
← fphilipe left19:38
→ nerosnm joined19:38
→ bobrosswins joined19:39
← bobrosswins left19:39
← tufteddeer left19:39
→ learningc joined19:41
← wootehfoot left19:43
yyy- → yyy19:44
← heroux left19:45
← learningc left19:46
→ n3wborn joined19:49
← Milos left19:50
→ heroux joined19:51
← SteenJobs left19:51
→ orbyt_ joined19:51
→ pyfgcr joined19:52
← BrianBlaze left19:55
← SkarmoutsosV left19:55
→ SteenJobs joined19:55
→ fission6 joined19:57
← emsjessec left19:57
← oatmealraisin left19:57
← nerosnm left20:01
→ Dirak joined20:01
← weltall left20:02
→ cdown joined20:03
→ BrianBlaze joined20:03
→ fphilipe joined20:05
→ m0viefreak joined20:08
← skyikot left20:11
→ im0nde_ joined20:15
← im0nde1 left20:18
→ AtumT_ joined20:18
← AtumT left20:18
→ wootehfoot joined20:23
← SteenJobs left20:28
← gloomy left20:29
im0nde_ → im0nde120:30
→ nerosnm joined20:34
→ iam730 joined20:37
← fethio left20:37
← czart left20:39
← atrigent left20:41
← nerosnm left20:42
← inkbottle left20:43
→ DuckyDev joined20:44
DuckyDev hi guys. I published some content on github with some passwords which was stored in plain text inside the code, since then I've secured the application, removed the passwords to ENV variablees. But how will I go arround and delete the trace from the commits?20:45
_ikke_ !bfg could help20:46
gitinfo A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)20:46
_ikke_ It does mean you need to rewrite your history, which means everyone needs to reclone the reppo20:47
repo20:47
→ inkbottle joined20:47
← wootehfoot left20:52
→ fethio joined20:52
→ igghibu joined20:52
→ leitz joined20:53
← Phylock left20:55
← igghibu left20:56
→ rudrab joined20:56
← meLon left21:01
→ atrigent joined21:02
← khisanth_ left21:02
← rudrab left21:03
DuckyDev thats fine with me :D21:05
← feriman left21:05
→ oatmealraisin joined21:08
← shicks2525 left21:09
clayjar I wonder how the tool deals with GPG signed commits.21:09
→ shicks2525 joined21:09
clayjar I'd imagine that the author would have to re-sign the updated commit individually... which isn't reasonable;21:10
DuckyDev SO reading through the examples, I've a password string "xxxxxxxx" should I then just execute thr program with --replace-text "xxxxxxx" my-repo.git ?21:11
clayjar the utility seems to be on par with a license retrieval utility which normally never gets to be part of the standard package; it violates some basic assumptions on the typical usage21:11
→ gxt joined21:13
DuckyDev I figured it out21:15
← iam730 left21:16
→ khisanth_ joined21:16
DuckyDev I love how the managed to get Thrump into the picture :D21:16
--21:16
You can rewrite history in Git - don't let Trump do it for real!21:16
Trump's administration has lied consistently, to make people give up on ever21:16
being told the truth. Don't give up: https://www.aclu.org/21:16
--21:16
→ skyikot joined21:18
→ iam730 joined21:18
clayjar → AtomSplitter21:19
← fphilipe left21:20
→ rakibul joined21:20
→ weltall joined21:21
AtomSplitter → ZhuXi21:21
← rakibul left21:22
→ tufteddeer joined21:23
← osse left21:24
leitz thinks DuckyDev needs some real news.21:26
← weltall left21:26
← leitz left21:27
← tufteddeer left21:28
← AbleBacon left21:28
→ tufteddeer joined21:29
→ cluelessperson joined21:30
← greggerz left21:33
← sgn left21:33
← beastd left21:34
→ Milos joined21:35
→ sgn joined21:35
← pyfgcr left21:38
← Milos left21:38
→ kerframil joined21:38
→ Milos joined21:39
← plexigras left21:39
← teward left21:40
← tufteddeer left21:40
← subopt left21:43
→ teward joined21:47
→ greggerz joined21:47
← Milos left21:49
→ nerosnm joined21:49
→ fphilipe joined21:50
→ Milos joined21:50
← greggerz left21:51
← gxt left21:52
← ave_milia left21:53
← nerosnm left21:54
→ pionen joined21:55
← atrigent left22:04
→ tufteddeer joined22:04
← _ADN_ left22:05
← Jitta left22:05
← cluelessperson left22:06
→ yonder joined22:07
← Milos left22:08
← xcm left22:09
→ meLon joined22:09
← teward left22:10
→ xcm joined22:10
← randomdude999 left22:16
→ randomdude999 joined22:16
→ teward joined22:17
→ Milos joined22:18
← wymillerlinux left22:20
← fphilipe left22:24
← thiago left22:25
← teward left22:26
← z|bandito left22:34
← lacrymol1gy left22:35
→ azwieg104 joined22:36
← fission6 left22:37
← troulouliou_div2 left22:43
← rafasc left22:47
← dege left22:48
← m1dnight_ left22:48
→ m1dnight_ joined22:50
← mowcat left22:50
→ supernovah joined22:51
← freeman42x left22:51
← cdown left23:03
→ thiago joined23:05
R2robot !sensitive23:07
gitinfo [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/23:07
→ dviola joined23:07
← tufteddeer left23:08
→ tufteddeer joined23:08
← AtumT_ left23:12
← kiki_lamb left23:12
← hussam left23:13
← boombatower left23:14
← kreyren left23:14
← tufteddeer left23:15
→ OtakuSenpai joined23:22
→ tufteddeer joined23:26
← hellauer left23:28
→ Wulf4 joined23:29
← Wulf left23:33
Wulf4 → Wulf23:33
← n3wborn left23:34
← dartmouthed left23:35
→ weltall joined23:36
→ teward joined23:39
← ryantrinkle left23:41
← jcbitter left23:43
→ jcbitter joined23:44
→ atrigent joined23:47
→ Wulf4 joined23:57
← SpeakerToMeat left23:58
← Wulf left23:59
Wulf4 → Wulf23:59

Logs Search ←Prev date Next date→ Channels Documentation