IRCloggy #git 2019-06-17

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-06-17

Soni is it safe to git fetch arbitrary URLs?00:01
→ orbyt_ joined00:01
← camsbury left00:04
← Cheaplogic2 left00:05
Hello71 mostly00:07
← Newami left00:07
Soni "mostly" means...?00:07
can they write to arbitary locations? are there CVEs I'm unaware of? can objects use `../`?00:07
→ ecilam joined00:07
Soni should I be running my python program in a sandbox like bochs or something?00:08
← bradleyprice left00:10
→ nabil joined00:10
← alonkli left00:12
← alonkli12 left00:12
→ bradleyprice joined00:12
Hello71 well they can fill your hard drive00:12
and there was the unintended feature where .git/config could have ssh arguments or something like that00:12
also nobody uses bochs except for os dev00:13
→ nuala joined00:15
Soni and malware dev00:15
← nabil left00:16
← bradleyprice left00:17
← inovas left00:18
→ inovas joined00:21
→ thebetrayer joined00:22
← thebetrayer left00:24
→ learningc joined00:28
→ bambanx joined00:29
← Anthaas left00:29
→ Anthaas joined00:30
← yyy left00:33
← Kaisyu7 left00:34
→ dviola joined00:37
← learningc left00:37
→ Kaisyu7 joined00:44
← CryptoDavid left00:47
→ welovfree joined00:50
→ dansan joined00:53
→ Hotpinkbrawler joined00:56
← Hotpinkbrawler left01:02
Hello71 nobody sensible ever used it for that. qemu for speed, vmware/virtualbox for ease of use, softice for the tough wares01:07
→ igemnace joined01:14
← oatmealraisin left01:15
← m0viefreak left01:16
← skyikot left01:17
← F0rTex left01:17
→ F0rTex joined01:18
→ jubal_ joined01:25
← xcm left01:25
→ xcm joined01:26
← jubal left01:26
← jcbitter left01:29
→ jcbitter joined01:31
← fatalhalt left01:40
→ fatalhalt joined01:43
← mowcat left01:47
← dviola left01:49
→ kenlee joined01:52
← fatalhalt left01:52
→ fatalhalt joined01:56
→ dviola joined02:00
→ hqdruxn08__ joined02:01
← toothe left02:02
← null1337 left02:04
← hqdruxn08_ left02:05
→ jubal joined02:07
← jubal_ left02:09
→ crackin joined02:15
← barteks2x left02:18
→ skyikot joined02:20
→ dansan_ joined02:25
← dansan left02:28
→ fphilipe_ joined02:29
lagothrix → Guest1185702:30
→ lagothrix joined02:30
→ breakingsad joined02:31
← Guest11857 left02:32
← fphilipe_ left02:35
← welovfree left02:43
→ wcpan joined02:46
← crackin left02:52
← nic-hartley left02:52
← paraxial left03:00
→ crackin joined03:03
← omnireq left03:12
← crackin left03:13
← AtumT left03:15
→ omnireq joined03:16
← bambanx left03:20
→ pabs3 joined03:25
pabs3 anyone know if there is a git-remote-darcs project?03:26
← alyptik left03:27
→ fjellfras joined03:34
→ crackin joined03:34
→ milkt joined03:40
← libertyprime left03:41
← cd left03:44
→ fphilipe_ joined03:47
→ bradleyprice joined03:47
← milkt left03:53
→ thevishy joined04:00
← crackin left04:02
← donofrio_ left04:06
← R2robot left04:06
→ SkarmoutsosV joined04:12
← thevishy left04:22
← armyriad left04:22
→ regedit joined04:25
← wcpan left04:27
→ alyptik joined04:29
← queip left04:30
← inovas left04:30
← sunri5e left04:31
→ inovas joined04:31
→ wcpan joined04:36
→ queip joined04:37
← fatalhalt left04:39
→ Newami joined04:40
dansan_ → dansan04:48
→ thevishy joined04:48
→ sunri5e joined04:56
← mud left04:57
→ NightStrike joined04:58
← bradleyprice left04:58
→ pks_ joined05:02
← Goplat left05:02
→ libertyprime joined05:03
← pks left05:03
pks_ → pks05:03
→ null1337 joined05:06
← ferdna left05:07
→ bradleyprice joined05:11
← bradleyprice left05:11
→ bradleyprice joined05:11
→ takyashi joined05:12
→ R2robot joined05:13
← skyikot left05:14
← bradleyprice left05:16
← xcm left05:17
→ xcm joined05:17
← victorqueiroz left05:17
← Inline left05:18
← libertyprime left05:22
→ skyikot joined05:23
→ libertyprime joined05:23
← thiago left05:26
← fk left05:35
→ victorqueiroz joined05:36
→ aw1 joined05:37
→ thiago joined05:38
← neunon left05:40
→ bradleyprice joined05:42
→ neunon joined05:43
→ paraxial joined05:45
← aw1 left05:49
← mat001 left05:50
← bradleyprice left05:50
→ mat001 joined05:51
← mat001 left05:52
→ mat001 joined05:53
← mat001 left05:53
→ Noti joined05:55
← thiago left05:59
← libertyprime left06:00
→ libertyprime joined06:02
← igemnace left06:02
→ igemnace joined06:03
← jcbitter left06:07
→ jcbitter joined06:08
→ bradleyprice joined06:10
← bradleyprice left06:15
→ tufteddeer joined06:16
→ bradleyprice joined06:17
→ dege joined06:20
→ esrse joined06:22
← bradleyprice left06:22
← fphilipe_ left06:23
← rhumbot left06:24
→ chele joined06:24
→ tsdh joined06:27
← jcbitter left06:29
→ jcbitter joined06:30
→ Mattiaslndstrm joined06:30
← Noti left06:34
→ sQVe joined06:41
← elichai2 left06:42
← netj left06:44
← libertyprime left06:44
→ netj joined06:44
→ aw1 joined06:45
→ n3wborn joined06:50
← tufteddeer left06:51
→ tufteddeer joined06:52
→ fk joined06:52
← hussam left06:53
→ lss8 joined06:55
→ fphilipe_ joined06:55
→ libertyprime joined06:56
→ gloomy joined06:57
← gloomy left06:58
→ Jackneill joined07:02
→ crackin joined07:04
→ z|bandito joined07:05
← nowhere_man left07:05
→ bradleyprice joined07:06
← orbyt_ left07:07
← crackin left07:08
← tufteddeer left07:08
→ tufteddeer joined07:09
← bradleyprice left07:11
← takyashi left07:14
← tufteddeer left07:15
← minikdo left07:16
→ armyriad joined07:18
→ mayurvpatil joined07:21
→ mikecmpbll joined07:21
← dviola left07:22
→ tufteddeer joined07:24
← fjellfras left07:24
→ Noti joined07:26
← thevishy left07:26
← nuala left07:33
→ strk joined07:37
strk how do I debug what a ref is pointing to ?07:37
beacuse I'm not getting the expected top-commit in a origin/pr-tea/41 ref07:37
the only reference i have to "pr-tea" in my .git/config is fetch = +refs/pull/*/head:refs/remotes/origin/pr-tea/*07:38
under the "origin" remote07:38
which has url = https://git.osgeo.org/gitea/geos/geos.git07:38
uhm, forget it please07:39
it was a left-over07:39
→ gloomy joined07:39
→ bradleyprice joined07:45
→ takyashi joined07:47
← bradleyprice left07:49
→ nav2002 joined07:50
→ hofmann3900 joined07:50
← SkarmoutsosV left07:52
→ crmaurei joined07:54
← mayurvpatil left07:57
← Noti left08:00
← yonder left08:03
→ floppydh joined08:05
← freeman42x left08:05
→ Noti joined08:06
← victorqueiroz left08:07
canton7 strk, at the first sniff of something like this, I normally open 'gitk --all'08:11
strk, alternatively, if you've only got a command-line, !lol08:12
gitinfo strk: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all08:12
→ thevishy joined08:13
→ g00s joined08:17
← queip left08:18
← takyashi left08:21
→ hio joined08:22
→ queip joined08:24
← tufteddeer left08:27
→ tufteddeer joined08:27
→ crackin joined08:29
→ florekm joined08:31
← crackin left08:33
→ OnceMe joined08:33
OnceMe when I git rebase -i HEAD~3 and :wq08:34
I still see my commits in git log, how come?08:34
← sinhue left08:35
igemnace is that *all* you did? interactive rebase won't do anything unless you tell it to, e.g. delete some commits or tell it to "edit" some commits08:35
strk .. other than rebasing08:35
OnceMe yes, thats all I did08:35
do I need something else?08:35
strk why would you not expect to see your commits ?08:35
igemnace what are you hoping to do?08:35
OnceMe I want to squash last 3 commits into one08:35
so that I dont see 3 other commits anymore08:36
selckin read the editor, and change pick to fixup08:36
igemnace change the words beside the commits you want to squash into "squash" instead of "pick"08:36
strk read the instructions in the editor buffer that pops up08:36
OnceMe squash or fixup?08:37
canton7 OnceMe, do you want to edit the commit message of the combined commit?08:37
(if yes, squash. If no, fixup)08:37
igemnace for reference, check git help rebase under the INTERACTIVE MODE section08:38
← tufteddeer left08:38
← queip left08:38
OnceMe I want new commit message08:38
I guess Ill use fixup on all 4 commits?08:39
so that I discard previous commit messages08:39
_ikke_ OnceMe: fixup will squash the commit into the commit on top of it08:40
igemnace you only use fixup on the second and subsequent commits08:40
OnceMe so how do I add new message for this one squashed commit?08:40
← Murr left08:41
OnceMe so 4 commits, s #1 s #2 s #3 s #408:42
→ Murr joined08:42
OnceMe first s #1 is red, I guess for the reason?08:42
canton7 probably? The first in the series should be "pick"08:42
squash means "squash into the commit above"08:43
→ OtakuSenpai joined08:43
→ queip joined08:44
OnceMe ok squashed, git status now says you have 1 and 4 different commits each, use git pull ...08:45
your branch and origin have diverged..08:45
canton7 well yes, you've !rewritten history08:45
!rewrite08:45
gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum08:45
OnceMe should I git pull, or just to do git push? git pull will again pull those 4 commits08:45
_ikke_ yes, you don't want to use git pull08:45
canton7 do not pull08:45
→ figuinhas joined08:45
canton7 that will merge together the old and new versions of history08:45
→ flavius joined08:45
canton7 you'll need to force-push as gitinfo said, but make sure that nobody else has fetched the old commits (and that includes you on another machine), otherwise life starts getting confusing08:46
← aw1 left08:47
OnceMe heh ok08:47
these are pretty new commits, like 5 mins ago08:47
what if somebody pulled those commits?08:47
→ nuala joined08:48
canton7 then the risk is 1) they fetched them, 2) they add more commits on top, 3) they try and push. Git refuses, because the remote has different history, 4) they run 'git pull', and they merge together their old version of the history, and the newer version that you just pushed, 5) they push their combination of the old and new histories08:48
igemnace they'll have to reset to your new commits, if they wanted to keep up-to-date with your version08:49
← thevishy left08:50
→ mayurvpatil joined08:50
← skyikot left08:50
← strk left08:51
← g00s left08:51
OnceMe they can just git stash08:52
git branch -D branch.. git checkout branch git stash apply08:52
problem solved I guess?08:52
canton7 no08:53
the easiest thing to do if for them to rebase, rather than pull08:53
← xcm left08:53
→ benyoo joined08:56
igemnace so this is public history? heed the factoid's words; move on08:56
→ xcm joined08:57
benyoo Hello, how I can pull from a repo without merging... just overwriting all existing file?08:57
I want to push at my work code to a repo and then I want to pull that push at home. I want to avoid merge conflict.. the files at home can be overwritten the whole time.08:59
OnceMe benyoo, why dont you checkout the whole branch?08:59
benyoo iam not very good with git, I will read about checkout thx09:00
igemnace benyoo: git fetch then git reset --hard origin/master or whatever the name of the remote tracking branch is09:01
OnceMe igemnace, thats going to lose his local files09:02
igemnace i believe that's what he asked for09:03
OnceMe if I understood right, he only wants to overwrite existing files but to retain any files which were under his local branch09:03
or not?09:03
igemnace benyoo?09:03
← n3wborn left09:05
← pabs3 left09:07
→ BeerLover joined09:12
← queip left09:13
→ mimajof joined09:13
→ queip joined09:19
← catsup left09:19
→ catsup joined09:19
← catsup left09:20
→ dudek joined09:21
→ catsup joined09:21
← stux|RC left09:21
→ inquisitiv3 joined09:22
← OtakuSenpai left09:22
← zamba left09:23
← regedit left09:25
→ stux|RC joined09:27
→ zamba joined09:29
← Murr left09:29
→ Murr joined09:30
→ OtakuSenpai joined09:31
← benyoo left09:31
→ dviola joined09:32
← Qizzy left09:33
→ barteks2x joined09:34
→ Qizzy joined09:35
→ tombusby joined09:35
← inquisitiv3 left09:43
→ bloops joined09:44
→ takyashi joined09:46
← ghoti left09:48
→ hojang joined09:52
← Murr left09:55
→ Murr joined09:55
← bloops left09:58
← zamba left10:00
← lankanmon left10:03
→ zamba joined10:03
→ planetcall|work joined10:06
→ bsanford joined10:07
← bsanford left10:07
← diogenese left10:14
→ diogenese joined10:15
← troyt left10:17
→ troyt joined10:17
← xcm left10:24
→ xcm joined10:24
← takyashi left10:27
← nav2002 left10:31
→ yyy- joined10:38
← fakhraee left10:42
← hojang left10:43
← Murr left10:43
← UrsoBranco left10:44
→ takyashi joined10:44
→ fakhraee joined10:45
→ Murr joined10:46
← esrse left10:46
→ steven- joined10:47
← steven left10:48
mra90 if I have a local branch "branch_name" and want to push it onto a remote with different name what should I do?10:53
igemnace git push <remote name> <local name>:<different name>10:54
and you might like --set-upstream with that, so you don't have to specify that entire invocation every time you push10:54
mra90 igemnace: I noticed that git push origin HEAD:new_remote_branch works10:55
what does HEAD is used for there?10:55
and why it works? ;P10:55
moritz HEAD refers to the commit that's currently checked out10:56
igemnace you can use any ref there10:56
mra90 igemnace: and what "ref" is?10:57
moritz so your command says "create branch new_remote_branch at origin, starting from the current (local) commit"10:57
something that references a commit10:57
like a branch name, a tag, a sha1, HEAD, HEAD~5 or such things10:57
← xelxebar left11:03
→ xelxebar joined11:03
mra90 moritz: but I will push my local files onto it so it doesn't matter11:04
I have one more issue, when I do git branch -r to list all my remote brnahches I see a branch my_name/branch_name11:05
but there is no way to remote that remote branch11:06
I try git push my_name --delete branch_name11:06
git says " remote ref does not exist"11:06
→ T_UNIX joined11:07
moritz mra90: try git fetch --prune11:07
maybe it's gone from the remote already, but your local repo still references it11:07
mra90 no its stil listed after that11:08
← mayurvpatil left11:10
mra90 no matter what I do it is still listed as remote branch11:10
← m1dnight_ left11:11
← hofmann3900 left11:11
→ m1dnight_ joined11:11
← m1dnight_ left11:11
→ m1dnight_ joined11:12
moritz and you're sure you didn't have a typo in your command?11:12
mra90 yes I am sure ;p11:13
I even use auto compete11:13
what is even more curious this branch is not listed on github which is my remote in this case11:13
the only problem is git branch -r still lists it11:13
moritz oh, do you have multiple remotes?11:13
'git fetch' only pulls from one by default11:14
← queip left11:14
moritz git fetch --prune --all11:14
→ emsjessec joined11:14
→ mayurvpatil joined11:16
mra90 moritz: yes now its gone! Thanks al ot11:19
→ queip joined11:20
→ gloomy_ joined11:20
→ lankanmon joined11:21
← gloomy left11:22
→ neure joined11:23
neure hi11:23
how do i replace origin url with another?11:23
git remote set-url ?11:24
selckin git remote set-url11:24
← Cork left11:25
neure how do I reset my local clone to origin (throwing away any local changes and history) after pointing origin to elsewhere?11:25
git fetch --prune ?11:25
that didnt seem to work11:26
xcm → Guest1430711:27
← Guest14307 left11:27
← fakhraee left11:27
selckin why not new clone ?, anyway fetch, and then git reset --hard any local branches to the rmeotes i guess11:27
→ xcm joined11:27
← OtakuSenpai left11:28
→ fakhraee joined11:29
← Murr left11:34
→ Murr joined11:34
→ rsrx joined11:37
← Murr left11:46
→ tufteddeer joined11:48
→ Murr joined11:50
→ mowcat joined11:50
→ greatgatsby joined11:51
→ charolastra joined11:53
charolastra is there a way to exclude certain files when pulling changes? it's for a test environment that needs some adaptation, but just there11:55
OnceMe git update-index --assume-unchanged11:56
selckin only shallow clones or certain depth, not file based11:56
depends what you mean with pulling changes ofc11:57
→ Cork joined11:57
OnceMe for more info https://git-scm.com/docs/git-update-index -- assume-unchanged option11:57
canton7 don't use assume-unchanged for that11:57
_ikke_ OnceMe: that won11:57
OnceMe: That won't help you if git has to update that file anyway11:57
canton7 !assume_unchanged11:58
gitinfo git update-index --assume-unchanged is sometimes suggested for keeping yourself from committing changes to a file, but it's actually a promise to Git that the file is identical to the committed version, to reduce unnecessary disk reads. Not only will Git feel free to discard the flag, it will also happily overwrite your changes whenever a checkout/merge/rebase/... updates it.11:58
jast a better choice is using sparse checkout11:58
!sparse11:58
gitinfo [!sparse_checkout] Sparse checkout can be used to restrict which files/folders are updated with all checkout and status operations. It cannot change the tree the checkout is rooted from. One common use case is locally keeping Git from updating some of the files tracked in your repository. See the "Sparse Checkout" section in man git-read-tree (https://gitirc.eu/git-read-tree.html).11:58
jast it's not perfect (e.g. if you're merging branches that have conflicting versions of a skipped files), but usually works decently11:59
← Murr left12:00
← jcbitter left12:01
→ jcbitter joined12:02
→ supernov1h joined12:04
→ subopt joined12:05
→ clime joined12:05
clime hello, HEAD:<path> is the part after : called path or something else?12:06
→ Murr joined12:06
← dviola left12:06
clime it's a treeish expresion but i am interested in the second part of it12:06
i guess either prefix or path_spec12:07
charolastra that sparse checkout seems to be what i'm looking for. but will have to look into it12:07
← jcbitter left12:08
clime or tree path maybe12:08
canton7 clime, man git rev-parse calls it "a path"12:09
gitinfo clime: the git-rev-parse manpage is available at https://gitirc.eu/git-rev-parse.html12:09
→ jcbitter joined12:09
charolastra dev and production should be the same. there is a test environment that e.g. just needs a different .js. so when pulling from the repo that fake .js should not be overwritten12:09
clime canton7: cool ok12:09
← Murr left12:12
→ regedit joined12:12
→ Murr joined12:13
← jcbitter left12:14
→ jcbitter joined12:15
← rtjure left12:16
← Murr left12:17
→ Murr joined12:19
← queip left12:28
→ gloomy joined12:28
← gloomy_ left12:30
← Murr left12:33
→ Murr joined12:34
→ queip joined12:34
← Murr left12:38
→ Murr joined12:39
→ TingelTangelBob joined12:39
→ nerosnm joined12:41
← uptime left12:42
→ snowkidimd joined12:43
→ uptime joined12:46
→ donofrio joined12:48
← BeerLover left12:52
← Murr left12:55
→ Murr joined12:55
→ deathwishdave joined12:59
← yyy- left12:59
→ yyy- joined13:00
→ howell joined13:01
← takyashi left13:02
← Murr left13:03
← figuinhas left13:04
→ Murr joined13:05
← clime left13:05
→ figuinhas joined13:06
← figuinhas left13:07
→ figuinhas joined13:08
← figuinhas left13:08
← ixian left13:09
← dege left13:09
→ bradleyprice joined13:10
→ figuinhas joined13:10
→ ixian joined13:10
← Murr left13:12
→ Murr joined13:12
← nerosnm left13:16
← snowkidimd left13:17
← gxt left13:17
→ snowkidi_ joined13:17
← bradleyprice left13:18
→ lucasb joined13:21
← greatgatsby left13:21
← Murr left13:21
→ Murr joined13:22
← netj left13:27
→ nerosnm joined13:28
→ ar1el joined13:28
→ netj joined13:30
→ gxt joined13:31
← igemnace left13:31
← mikecmpbll left13:32
← chachasmooth left13:38
← Murr left13:40
→ Murr joined13:40
→ chachasmooth joined13:40
→ hussam joined13:42
→ im0nde_ joined13:43
→ czart joined13:45
→ im0nde- joined13:45
← Murr left13:46
← tsdh left13:46
← im0nde left13:46
→ Murr joined13:46
← im0nde1 left13:46
← Newami left13:47
← nerosnm left13:47
← mayurvpatil left13:47
← OnceMe left13:50
→ mayurvpatil joined13:51
← Murr left13:54
→ igemnace joined13:55
→ Inline joined13:55
→ Murr joined13:59
← breakingsad left14:00
← queip left14:04
→ nishttal joined14:06
nishttal hi is there a way to see which commit added/changed a particular line ?14:07
steven- → steven14:08
→ greggerz joined14:08
→ queip joined14:10
← deathwishdave left14:12
mjt nishttal: git blame is _something_ of that sort14:13
← sQVe left14:13
mjt (and with -b it shows what you asks)14:14
nishttal ok perfect.. thanks14:15
← m1dnight_ left14:19
← supernov1h left14:19
→ m1dnight_ joined14:19
← m1dnight_ left14:19
→ m1dnight_ joined14:20
← m1dnight_ left14:20
→ m1dnight_ joined14:21
← m1dnight_ left14:21
→ m1dnight_ joined14:22
← m1dnight_ left14:23
← matheusmoreira left14:23
→ matheusmoreira joined14:24
→ pks_ joined14:24
→ OtakuSenpai joined14:25
← pks left14:25
pks_ → pks14:25
→ m1dnight_ joined14:26
← m1dnight_ left14:26
→ hojang joined14:27
→ m1dnight_ joined14:27
← m1dnight_ left14:28
→ m1dnight_ joined14:28
← czart left14:28
→ AtumT joined14:30
← fphilipe_ left14:35
→ bradleyprice joined14:38
← bradleyprice left14:38
→ bradleyprice joined14:39
← bradleyprice left14:40
→ bradleyprice joined14:40
→ fphilipe_ joined14:41
← bradleyprice left14:42
→ bradleyprice joined14:42
→ netcrash joined14:42
← netcrash left14:42
Celmor[m] I'm wondering what commands would be the equivalent to what my IDE does or at least the recommended method would be to "update the project" (as it's called in IDEA), I guess `git stash && git fetch origin master && git stash pop && git rebase FETCH_HEAD` or something like that, not sure about the pull vs. fetch and rebase (which branch)14:43
← mayurvpatil left14:44
GyrosGeier you can't rebase with local changes14:44
but you can always fetch14:44
jast how about: git pull --rebase --autostash14:46
→ nurdie joined14:46
GyrosGeier yup14:46
→ jbuchmaier joined14:46
GyrosGeier the --rebase can be omitted if you have a "branch.XXX.rebase" config setting14:46
→ SerialSmile joined14:46
← m1dnight_ left14:48
← hojang left14:49
← netj left14:50
GyrosGeier also, protip: commit often and reorganize commits before submitting14:50
← stdedos left14:51
GyrosGeier especially if you add a printf for debugging, the best thing you can do is commit it immediately with a message of 'DISCARD' or something such14:51
→ stdedos joined14:51
GyrosGeier then before submitting you can just do rebase -i to get rid of all the debug code14:51
→ netj joined14:52
← jbuchmaier left14:53
← OtakuSenpai left14:54
charolastra regarding sparse checkout. it requires to create a list of directories which should be checked out. does the inverse work? i.e. check out everything except those files in a blacklist?14:56
→ galaxie joined14:56
← dskull left14:56
→ dskull joined14:59
→ AbleBacon joined15:02
→ tang^ joined15:02
→ cdown joined15:02
→ thiago joined15:03
→ grawity joined15:04
→ victorqueiroz joined15:04
grawity wait, I just remembered how15:05
← grawity left15:05
→ m1dnight_ joined15:05
→ greatgatsby joined15:06
← m1dnight_ left15:06
→ zautomata joined15:07
→ m1dnight_ joined15:08
← cdown left15:10
→ elsheepo joined15:10
→ cdown joined15:10
→ deathwishdave joined15:12
← Noti left15:14
→ fragamus joined15:14
→ ThePacketBender joined15:17
← m1dnight_ left15:17
→ atesc joined15:17
← chele left15:19
→ TomyWork joined15:19
→ dege joined15:20
← duderonomy left15:22
→ SkarmoutsosV joined15:23
← mowcat left15:23
← atesc left15:26
← elsheepo left15:26
→ skyikot joined15:29
→ plexigras joined15:30
ChanServ set mode: +o15:32
→ leeN joined15:33
← bradleyprice left15:34
Eugene changed the topic to: Welcome to the #git that keeps on giving | First visit? Read: https://gitirc.eu | Current stable version: 2.22.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This channel is logged: https://gitirc.eu/log15:34
Eugene kicked Eugene (Eugene)15:34
→ Eugene joined15:34
← floppydh left15:34
→ bradleyprice joined15:35
← nurdie left15:36
← fragamus left15:36
→ davidfetter_work joined15:37
← netj left15:39
→ netj joined15:39
→ boombatower joined15:42
← bradleyprice left15:42
→ bradleyprice joined15:42
← kezimo left15:44
→ clime joined15:47
← TomyWork left15:48
→ solars joined15:54
→ orbyt_ joined15:55
Eugene Also, my !jokes are terrible, and you guys should all submit something funnier.15:55
gitinfo A complete listing of the git-jokes used in the /topic can be found at https://madeitwor.se/git-jokes (patches welcome)15:55
← figuinhas left15:56
→ figuinhas joined15:56
→ atesc joined15:58
→ mat001 joined15:58
← thiago left16:00
← mimajof left16:01
← RandomGuyOnIrc left16:01
← mat001 left16:09
← atesc left16:10
→ mat001 joined16:10
← omnireq left16:10
→ atesc joined16:11
← gloomy left16:11
← mat001 left16:12
→ dfee joined16:13
→ agowa338 joined16:13
→ omnireq joined16:14
← fphilipe_ left16:15
← SkarmoutsosV left16:16
← charolastra left16:19
→ ldh__ joined16:24
← tufteddeer left16:25
→ thefatma joined16:25
→ achen_ joined16:25
→ tufteddeer joined16:25
→ kezimo joined16:30
← kezimo left16:31
← bradleyprice left16:31
→ kezimo joined16:31
→ bradleyprice joined16:31
← kermit left16:32
im0nde_ → im0nde16:32
← atesc left16:33
← bradleyprice left16:34
→ bradleyprice joined16:34
← moldybits left16:35
← queip left16:35
→ queip joined16:36
→ impermanence8 joined16:37
→ hojang joined16:37
← impermanence8 left16:37
→ impermanence95 joined16:38
← impermanence95 left16:38
→ nurdie joined16:38
→ impermanence35 joined16:38
← nurdie left16:39
→ nerosnm joined16:40
← deathwishdave left16:41
→ mat001 joined16:42
← orbyt_ left16:42
← nerosnm left16:45
← cdown left16:46
→ thiago joined16:52
→ Lucas_Gray joined16:53
→ orbyt_ joined16:53
→ moldybits joined16:58
→ duderonomy joined17:00
← dskull left17:01
← duderonomy left17:02
← Jackneill left17:03
→ dskull joined17:04
→ czart joined17:05
← mojisun left17:09
→ mojisun joined17:09
← lucasb left17:10
← nishttal left17:11
← orbyt_ left17:12
→ duderonomy joined17:13
← TingelTangelBob left17:13
→ orbyt_ joined17:14
← orbyt_ left17:15
← mooasaurus left17:15
→ mooasaurus joined17:16
← duderonomy left17:16
→ wootehfoot joined17:25
← Murr left17:26
→ orbyt_ joined17:27
→ fphilipe_ joined17:30
← fphilipe_ left17:35
← achen_ left17:36
← thefatma left17:36
← zautomata left17:38
→ m1dnight_ joined17:39
→ duderonomy joined17:46
← clime left17:52
→ lucasb joined17:55
← agowa338 left17:56
← yyy- left17:57
← goldleader left17:58
→ lachesis joined17:58
→ goldleader joined18:00
← Lucas_Gray left18:01
← bradleyprice left18:06
→ bradleyprice joined18:07
→ Sasazuka joined18:08
← nuc left18:11
← boombatower left18:12
→ nuc joined18:12
← planetcall|work left18:16
→ kermit joined18:17
→ freeman42x joined18:18
→ UrsoBranco joined18:21
← figuinhas left18:22
→ gloomy joined18:22
← hojang left18:23
← steveeJ left18:23
← netj left18:24
→ netj joined18:24
← discopatrick left18:25
← jleclanche left18:25
→ steveeJ joined18:25
← kapilp left18:26
→ discopatrick joined18:26
→ CryptoDavid joined18:26
→ jleclanche joined18:26
→ kapilp joined18:27
← plexigras left18:27
→ nerdcore joined18:28
← sauvin left18:29
nerdcore is this channel for discussing the git source control management system?18:30
it's not clear from the topic :P18:30
bin_bash yes18:30
← neure left18:31
nerdcore ty wanted to send someone here just wanted to be sure first :)18:32
← queip left18:33
← SerialSmile left18:35
→ queip joined18:39
← leeN left18:43
← nerdcore left18:45
← skyikot left18:49
→ fphilipe_ joined18:49
← bradleyprice left18:50
→ skyikot joined18:50
→ bradleyprice joined18:50
← solars left18:54
← fphilipe_ left18:54
→ Ch3ck3rs_ joined18:55
← flavius left18:57
← orbyt_ left18:57
→ goiko joined18:59
→ orbyt_ joined18:59
← tufteddeer left19:02
→ tufteddeer joined19:03
← bradleyprice left19:06
→ nerosnm joined19:07
→ bradleyprice joined19:07
← bradleyprice left19:07
→ bradleyprice joined19:07
→ Newami joined19:08
← jcbitter left19:09
→ jcbitter joined19:11
← nerosnm left19:11
← UrsoBranco left19:11
← Ch3ck3rs_ left19:11
← Mattiaslndstrm left19:12
← jcbitter left19:16
→ jcbitter joined19:17
→ Ch3ck3rs joined19:18
← T_UNIX left19:19
← Ch3ck3rs left19:19
→ Ch3ck3rs joined19:19
← jcbitter left19:22
robertparkerx Hi I have a branch [ahead 1, behind 23] after I reset the head to clear out contamination19:24
How do I catch it back up19:24
→ jcbitter joined19:25
→ boombatower joined19:25
haymawk robertparkerx: are you trying to catch it back up to another branch?19:27
robertparkerx Well just so its normal19:27
don't I force push or something19:27
haymawk that would force the remote to match what you have locally and remove the 23 commits on the remote. Is that what you want?19:28
robertparkerx would that remove []19:29
haymawk 1 ahead means you have a commit locally that isn't on the server. 23 behind means there are 23 commits on the server that you dont' currently have19:29
to get the 23 commits locally you need to do a 'git pull'19:29
← emsjessec left19:30
robertparkerx I want to removve the 23 commits19:31
haymawk from the remote server? 'git push --force-with-lease' will do it19:32
← czart left19:34
← bradleyprice left19:34
→ bradleyprice joined19:34
← bradleyprice left19:35
robertparkerx That was it19:35
Thank you19:35
→ bradleyprice joined19:35
→ violentE joined19:35
→ mat001_ joined19:36
haymawk np19:37
← mat001 left19:39
← Shentino left19:39
→ Shentino joined19:40
→ SkarmoutsosV joined19:46
← impermanence35 left19:48
← bradleyprice left19:50
→ bradleyprice joined19:51
→ remote joined19:52
← orcainbox left19:58
→ gh0st3d joined20:00
gh0st3d Hey guys. Trying to get more proper with git workflows... If I commit and push to the origin and then realize I need to change one little line of code, what's the proper thing to do? Until now I've just been adding another commit and pushing again20:01
← orcacomputers left20:01
→ mat001 joined20:02
→ durham joined20:03
→ Jackneill joined20:04
vishal ghormoon: !rewrite is usually not preferred, but if it is ok, you can commit --amend and push --force your oneline change20:04
gitinfo ghormoon: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum20:04
← mat001_ left20:05
← durham left20:05
← dfee left20:05
→ n3wborn joined20:05
← PacKetSlayer left20:06
→ PacKetSlayer joined20:06
← bradleyprice left20:08
→ bradleyprice joined20:09
gh0st3d Ok thank you! I'll read into that20:09
← queip left20:10
→ Lucas_Gray joined20:11
→ UrsoBranco joined20:13
← subopt left20:15
→ thefatma joined20:16
→ achen_ joined20:16
→ queip joined20:16
→ plexigras joined20:19
← gh0st3d left20:21
→ nerosnm joined20:21
→ fstd_ joined20:32
← bradleyprice left20:33
→ bradleyprice joined20:33
← nerosnm left20:34
← bradleyprice left20:35
→ bradleyprice joined20:35
← jakobvarmose left20:35
← fstd left20:36
fstd_ → fstd20:36
→ jakobvarmose joined20:37
→ nerosnm joined20:38
→ MaliusArth joined20:41
← MaliusArth left20:41
← gloomy left20:44
← Lucas_Gray left20:46
← CryptoDavid left20:46
← Cabanossi left20:48
robertparkerx if the feature branch exist and I'm already checke out to the feauture branch, when I push do I have to continue to type : git push -u origin feature_120:49
→ fphilipe_ joined20:51
→ dfee joined20:51
vishal robertparkerx: -u sets the upstream in the repo configuration, so you only have to do it once unless the upstream needs to change for some reason20:53
robertparkerx ty vishal20:53
← skyikot left20:55
→ Cabanossi joined20:55
← cliluw left20:55
← fphilipe_ left20:56
← abelvesa_ left20:57
→ cliluw joined20:57
→ m0viefreak joined20:57
← SkarmoutsosV left20:59
← synthmeat left20:59
→ clime joined21:02
→ MaliusArth[m] joined21:04
← rsrx left21:09
← cvz left21:09
← Jackneill left21:10
← xorander left21:10
→ xorander joined21:12
→ hofmann3900 joined21:13
→ CryptoDavid joined21:14
← tufteddeer left21:14
→ tufteddeer joined21:14
← bradleyprice left21:16
← dudek left21:17
→ bradleyprice joined21:17
← AbleBacon left21:18
← bradleyprice left21:19
→ bradleyprice joined21:20
← pks left21:20
← tombusby left21:21
→ tombusby joined21:21
← bradleyprice left21:22
→ bradleyprice joined21:22
→ impermanence joined21:23
← bradleyprice left21:27
← jubal left21:28
→ leeN joined21:28
→ jubal joined21:29
→ pks joined21:29
← howell left21:31
→ nurdie joined21:32
→ ChosunOne joined21:35
← plexigras left21:35
→ bradleyprice joined21:35
← tufteddeer left21:36
← nerosnm left21:36
→ LaScoumoune joined21:36
→ yyy- joined21:36
← nurdie left21:36
→ plongshot joined21:37
→ butterthebuddha joined21:37
→ tufteddeer joined21:37
← LaScoumoune left21:37
← mattcen left21:39
→ mattcen joined21:40
← armyriad left21:50
→ armyriad joined21:50
→ dustinm- joined21:50
← dustinm left21:52
→ TingelTangelBob joined21:52
← butterthebuddha left21:52
← thiago left21:53
→ butterthebuddha joined21:56
← butterthebuddha left21:59
← wootehfoot left22:00
→ butterthebuddha joined22:00
← yyy- left22:03
← butterthebuddha left22:04
← wadadli left22:04
← Khan left22:04
← ajain left22:04
← dege left22:05
→ LaScoumoune joined22:06
← queip left22:08
← leeN left22:08
← bradleyprice left22:10
→ bradleyprice joined22:15
→ sz0 joined22:15
← tombusby left22:16
← clime left22:16
← gxt left22:17
→ fatalhalt joined22:18
→ tombusby joined22:18
→ gxt joined22:18
→ queip joined22:19
← hussam left22:23
← greggerz left22:24
← frikinz left22:29
→ clime joined22:29
← orbyt_ left22:31
→ webstran- joined22:31
← webstrand left22:31
→ orbyt_ joined22:32
webstran- → webstrand22:32
← inkbottle left22:32
← LaScoumoune left22:33
← evanc left22:34
→ evanc joined22:34
→ dviola joined22:36
← queip left22:36
→ LaScoumoune joined22:36
← oh4 left22:37
← impermanence left22:37
← Iroha left22:37
→ oh4 joined22:38
← LaScoumoune left22:40
→ queip joined22:41
→ Iroha joined22:41
← skered left22:42
→ LaScoumoune joined22:42
← LaScoumoune left22:46
← dfee left22:46
← victorqueiroz left22:47
← Cabanossi left22:48
← Sleepy63 left22:48
→ victorqueiroz joined22:49
→ dfee joined22:50
→ chachasmooth_ joined22:50
← chachasmooth left22:51
← Ch3ck3rs left22:53
→ Ch3ck3rs joined22:53
→ Cabanossi joined22:54
→ skered joined22:58
→ Sleepy63 joined22:58
← bradleyprice left23:02
→ bradleyprice joined23:02
← n3wborn left23:03
Soni how does git handle URIs?23:05
like, for remotes, or for "git fetch"23:05
→ causaui1 joined23:05
← causa-sui left23:07
← bradleyprice left23:07
Ori_B ...by parsing them? I'm not sure what the question is.23:11
are you asking about the 'git-remote-foo' stuff?23:12
← mattcen left23:13
Soni does it just accept anything I throw at it as long as it starts with a keyword followed by a ':'?23:13
← mra90 left23:14
→ fphilipe_ joined23:16
← Anthaas left23:16
Ori_B yes, any prefix where is_urlschemechar() returns true.23:16
https://github.com/git/git/blob/16a465bc018d09e9d7bbbdc5f40a7fb99c21f8ef/url.c#L423:16
→ nic-hartley joined23:16
→ Anthaas joined23:17
→ elichai2 joined23:19
← Ch3ck3rs left23:20
← fphilipe_ left23:21
→ Ch3ck3rs joined23:21
Soni so I could do something like `git fetch bash:"$(cat foo.bash)"` and it'd work?23:24
since when does github use ipv623:26
← CryptoDavid left23:26
→ wadadli joined23:27
Soni huh, how come I'm connected to my quassel core over ipv6 but I can't seem to open github...23:27
(and browser ipv6 tests don't seem to work either)23:27
ah it's probably my router23:28
well anyway I can't look at that23:28
Ori_B: can I just embed raw shell scripts in an so-called "URL"23:29
well fuck you too https://github.com/git/git/blob/16a465bc018d09e9d7bbbdc5f40a7fb99c21f8ef/url.c#L2823:30
→ mattcen joined23:31
rewt how would it know to run bash to figure the actual url?23:32
vishal what are you really trying to do?23:32
rewt just putting bash: in front doesn't mean "run bash", just as http: doesn't mean "run http"23:32
→ nabil joined23:32
Soni ln -s /usr/bin/bash /usr/bin/git-fetch-bash ?23:32
or w/e23:33
rewt is that documented anywhere?23:33
Soni anyway I'm gonna do my own URI sanitization and fuck your slashes :/23:33
Ori_B soni: by 'just work', you mean if you implemented an appropriate uri handler? sure.23:33
→ thiago joined23:34
Ori_B you'd probably need to urlencode the argument.23:34
← wymillerlinux left23:34
← mattcen left23:36
← duderonomy left23:37
→ nerosnm joined23:44
Ori_B rewt: which, the https://git-scm.com/docs/git-remote-helpers stuff?23:45
← boombatower left23:47
← m0viefreak left23:53
← mat001 left23:54
→ bradleyprice joined23:56
← nerosnm left23:56
→ mattcen joined23:56

Logs Search ←Prev date Next date→ Channels Documentation