IRCloggy #git 2019-07-29

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-07-29

← z8z left00:00
→ abf_ joined00:02
← alyptik left00:02
← hussam left00:03
→ caskd joined00:05
→ igemnace joined00:06
← fphilipe left00:14
← cd left00:15
← rafasc left00:19
← thiago left00:19
→ thiago joined00:28
← mowcat left00:31
← jayjo left00:31
→ jayjo joined00:31
→ mowcat joined00:33
← Muzer left00:34
← AtumT left00:39
→ Muzer joined00:47
← m0viefreak left00:48
→ fphilipe joined00:49
→ jubal joined00:50
← yyy- left00:51
→ jsnal joined00:51
→ null1337 joined00:55
→ polydo_s joined00:57
→ plongshot joined00:59
← polydo_s left01:01
← jsnal left01:03
→ beastDivision joined01:04
← beastDivision left01:15
← yonder left01:15
→ atesc joined01:17
→ alyptik joined01:21
→ macroprep joined01:25
← fphilipe left01:26
subopt → _subopt_in_repos01:29
→ macroprep_ joined01:37
← alyptik left01:38
← ash_worksi left01:38
← macroprep left01:41
← altendky left01:41
← CryptoDavid left01:42
← igemnace left01:46
→ libertyprime joined01:52
← Muzer left01:52
→ omnireq joined01:55
← omnireq left01:56
← libertyprime left01:57
→ libertyprime joined01:57
← F0rTex left01:59
→ F0rTex joined02:00
kreyren Need info https://pastebin.com/raw/YMtuYwam02:02
helping end-user02:02
→ Tobbi_1 joined02:02
Tobbi_1 → Tobbi_02:02
← libertyprime left02:02
→ libertyprime joined02:03
wyoung kreyren: I would love to look at that URL but pastebin is full of ads.02:04
→ Muzer joined02:04
→ natechan joined02:05
kreyren got it, github has security function on git pushes that exposes email which has to be disabled for this push02:06
rewt that's a raw link ... raw text, no ads02:06
lagothrix → Guest6555702:07
← Guest65557 left02:07
→ lagothrix joined02:07
← kp__ left02:09
← jubal left02:10
→ randomdude999_ joined02:14
← randomdude999 left02:14
randomdude999_ → randomdude99902:14
wyoung kreyren: Fun.02:15
I wonder when MS will do their re-branding of github.02:16
← macroprep_ left02:16
→ profmac joined02:16
wyoung They will probably renamed it to visual studio hub or something lkke that.02:16
← atesc left02:18
→ jubal joined02:19
→ backthen joined02:20
backthen I've been using sub modules. But often times I get that there is no branch02:21
and I have to name this no-name branch to an actual branch and then merge it to master02:22
rasputozen wyoung: visual studio hub has a nice ring to iit02:23
→ polydo_s joined02:23
← polydo_s left02:28
→ iam730 joined02:36
→ yonder joined02:48
→ Goplat joined02:54
← dviola left02:55
← randomdude999 left02:56
← nic-hartley left02:59
→ kent\n joined03:00
← welovfree left03:01
← kent\n left03:07
← shored left03:07
→ shored joined03:07
→ kent\n joined03:07
→ polydo_s joined03:17
← polydo_s left03:22
→ fphilipe joined03:22
→ liberiga joined03:22
→ Sasazuka joined03:25
← MACscr left03:25
← Sasazuka left03:28
← mud left03:29
→ atesc joined03:32
← CodeSlingerPaul left03:33
→ Frobozz joined03:37
→ ash_worksi joined03:38
_subopt_in_repos → subopt03:39
← subopt left03:39
← atesc left03:41
← plongshot left03:42
← ash_worksi left03:42
← natechan left03:49
← liberiga left03:50
→ macroprep joined03:50
→ elsheepo joined03:54
→ macaronus joined03:54
← macroprep left03:56
← fphilipe left03:56
→ igemnace joined03:57
→ howdoi joined03:58
→ jokester joined03:58
→ atesc joined03:59
← yonder left03:59
← atesc left04:00
← kerframil left04:03
→ limarfrek joined04:03
← mowcat left04:03
→ dartmouthed joined04:04
→ mrCyborg joined04:06
→ macroprep joined04:06
← jcbitter left04:10
→ jcbitter joined04:11
limarfrek → kerframil04:12
→ dviola joined04:13
← xcm left04:16
→ ash_worksi joined04:17
→ xcm joined04:17
→ yonder joined04:26
→ fphilipe joined04:27
→ LordVoldePort joined04:31
→ natechan joined04:31
← elsheepo left04:42
← natechan left04:42
→ fjellfras joined04:51
→ hussam joined04:54
→ donofrio joined04:55
← causasui left04:57
→ causasui joined05:00
→ pks_ joined05:01
← pks left05:03
pks_ → pks05:03
matheusm1reira → matheusmoreira05:04
→ g00s joined05:06
→ fphilipe_ joined05:07
← fphilipe left05:09
← kerframil left05:09
→ roadie joined05:13
← dviola left05:16
← macroprep left05:18
→ pyfgcr joined05:29
← orbyt_ left05:30
← pyfgcr left05:38
← serialoverflow left05:46
→ rick8024 joined05:54
→ serialoverflow joined05:56
← fphilipe_ left05:56
rick8024 → KnoP05:56
→ tsdh joined06:05
→ det joined06:05
← ferdna left06:06
det Is there a nice command line to checkout files from the current branches upstream?06:06
Ideally something like `git checkout UPSTREAM -- <files ...>`06:06
← causasui left06:06
← Joel left06:09
Marmotte det: use @{upstream} or @{u}06:11
← pks left06:11
Marmotte det: you can find that and many other in the gitrevisions man page06:15
→ pks joined06:16
det Marmotte, thank you, I will check it out06:17
→ Joel joined06:20
→ Noti joined06:20
← g00s left06:20
→ rick8024 joined06:21
← yonder left06:23
← KnoP left06:23
← rick8024 left06:27
→ fphilipe_ joined06:28
→ beastDivision joined06:34
← Noti left06:35
→ pks_ joined06:35
← pks left06:36
pks_ → pks06:36
→ Noti joined06:37
→ crtcji joined06:37
← thiago left06:37
← iam730 left06:40
← beastDivision left06:41
← xcm left06:47
→ xcm joined06:47
← chachasmooth left06:47
→ chachasmooth joined06:48
→ alyptik joined06:49
← chachasmooth left06:49
→ chachasmooth joined06:50
← ash_worksi left06:51
cixx_ → cixx06:52
→ tehp joined06:54
← im0nde left06:55
→ im0nde_ joined06:55
→ chele joined06:57
→ crose joined06:58
→ feriman joined07:01
→ Jackneill joined07:03
← alyptik left07:08
→ pks_ joined07:10
← feriman left07:11
← pks left07:12
pks_ → pks07:12
→ dsag joined07:13
dsag hi there07:13
i Have just pulled a particular branch in a repo07:13
→ rnmhdn joined07:14
rnmhdn I have multiple users in my server07:14
dsag now that before merging that commits to my master, i realized that master is ahead of my branch07:14
now when i tried to git checkout master07:14
i get an error07:14
rnmhdn that all use the same linux user07:14
but have different gitlab accounts07:14
dsag error: pathspec 'master' did not match any file(s) known to git.07:14
rnmhdn how can they pull ?07:14
dsag when i do git fetch --all07:15
and do git branch -a07:15
i still dont seem to see my master branch07:15
how can i fix this07:15
rnmhdn so one linux account should be able to pull one gitlab repo through two gitlab accounts07:15
→ randomdude999 joined07:16
→ KnoP joined07:16
→ neunon joined07:18
ChanServ set mode: +o07:19
Eugene changed the topic to: Welcome to #git | First visit? https://gitirc.eu | Current stable version: 2.22.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This channel is logged: https://gitirc.eu/log | git-clone has nothing to do with reproduction. So stop that.07:20
← nowhereman left07:20
Eugene kicked Eugene (Eugene)07:20
→ Eugene joined07:20
→ qgTG_ joined07:21
→ beastDivision joined07:21
← xcm left07:22
rnmhdn wtf?07:22
→ xcm joined07:22
Eugene !jokes07:22
gitinfo A complete listing of the git-jokes used in the /topic can be found at https://madeitwor.se/git-jokes (patches welcome)07:22
→ n3wborn joined07:22
Eugene rnmhdn - the answer you need is: don't use `git pull` as a !deploy mechanism.07:23
gitinfo rnmhdn: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html07:23
osse I agree with the psychopath.07:23
Eugene Thaht's never been proven07:23
→ feriman joined07:24
← dsag left07:25
→ SkarmoutsosV joined07:26
→ savolla joined07:29
qgTG_ → qgTG07:35
→ malmalmal joined07:35
im0nde_ → im0nde07:37
← libertyprime left07:41
← xcm left07:41
→ xcm joined07:42
→ nabil_ joined07:42
→ Makaveli7 joined07:52
← rnmhdn left07:53
→ rick8024 joined07:56
← KnoP left07:58
rick8024 → KnoP07:58
→ inkbottle joined08:03
→ pyfgcr joined08:03
→ TomyWork joined08:04
← beastDivision left08:11
← inkbottle left08:13
→ gloomy joined08:15
→ libertyprime joined08:20
← ramsub07 left08:27
← backthen left08:27
→ bruce_lee joined08:28
→ backthen joined08:28
flughafen was it githooks i need to use if i wanted to make that *.changes files automatically put my stuff on the top? (these ar ejust single entries generally taht are _always_ added on top)08:29
osse if you want to do thing automatically with git then githooks is just about the only way08:29
← WhereIsMySpoon left08:29
flughafen what about github?08:29
→ WhereIsMySpoon joined08:30
osse apples and oranges08:30
← tehp left08:30
flughafen i want to do git and github08:30
WhereIsMySpoon is there a way to run a diff, but exclude certain changes? say someone's done a find/replace on 'foo' to 'baz' and i really dont care about those changes, can i omit those from the diff?08:30
← backthen left08:30
osse WhereIsMySpoon: generally that sounds difficult08:31
if they're in a different file then it's easier08:32
WhereIsMySpoon nah, spread around multiple files08:32
with changes i do want to view in teh same files as those changes i dont\08:33
osse maybe git diff -G can be used08:34
← savolla left08:35
WhereIsMySpoon that would give me those changes i dont want to see, not the ones i do08:36
osse Depends on the regex08:36
I was thinking a regex that doesn't match the thins you don't want to see08:36
cdunklau WhereIsMySpoon: what will you do once you have this?08:37
like, what will you use this for08:37
→ yyy- joined08:37
← queip left08:37
← gloomy left08:39
WhereIsMySpoon cdunklau: view the diff im currently viewing without all this find/replace clutter08:39
its noise that makes it harder to review the code08:39
← Goplat left08:41
cdunklau WhereIsMySpoon: are they in different commits08:41
they probably should be :)08:41
→ dege joined08:41
WhereIsMySpoon no, because we squash all changes into vendor/nonvendor commits for our prs08:41
cdunklau you do that before reviewing?08:41
WhereIsMySpoon its impossible to review otherwise08:41
cdunklau hmm08:41
WhereIsMySpoon vendored changes mean nothing else loads08:42
cdunklau well, okay, i'm out of ideas08:42
WhereIsMySpoon thanks anyway :)08:42
→ planetcall|work joined08:42
→ queip joined08:44
→ gloomy joined08:44
osse would be nice with a negative -G08:45
WhereIsMySpoon using -G seems to return lines that are unrelated to my regex08:45
=/08:45
← malmalmal left08:46
WhereIsMySpoon does -G only work on a per-file basis or something?08:47
osse no08:48
or... what do you mean by that?08:49
WhereIsMySpoon as in if i do -G "foo" and the number of foos in the file changes, will all changes in that file be shown in the diff?08:50
regardless of whether the line a change is in contains or contained a foo08:50
maybe im misunderstanding -G08:51
osse i think you're right08:51
I didn't expect that08:52
← roadie left08:52
WhereIsMySpoon me either08:52
:/08:52
osse I think I wound save the diff to a file and edit it08:52
WhereIsMySpoon hmeh08:53
ok, thanks for the help once again osse :)08:53
youre always helpful08:53
are you a git dev?08:54
osse I have 3-4 commits in my name in the git repo...08:55
But I don't consider myself a git dev08:55
← n3wborn left08:56
WhereIsMySpoon well you're super helpful either way :) thanks08:57
cya round!08:57
← WhereIsMySpoon left08:57
→ mimajof joined08:57
← Onionnion left09:02
→ aruns joined09:05
→ polman joined09:07
← ajbura left09:22
→ irdr joined09:24
→ Envil joined09:27
→ clime joined09:28
→ rick8024 joined09:29
← KnoP left09:32
rick8024 → KnoP09:32
→ Celmor[m] joined09:34
→ Oebele joined09:35
← Makaveli7 left09:35
← catsup left09:38
→ catsup joined09:39
← catsup left09:39
→ catsup joined09:40
→ roadie joined09:40
← queip left09:44
→ Makaveli7 joined09:45
← abf_ left09:51
→ queip joined09:51
→ floppydh joined09:55
→ YuGiOhJCJ joined10:00
← hussam left10:03
→ Novae joined10:03
→ rnmhdn joined10:05
← lankanmon left10:06
← yyy- left10:08
→ malmalmal joined10:09
→ cd joined10:11
← KnoP left10:20
→ KnoP joined10:21
→ Lucas_Gray joined10:21
→ lhunath joined10:28
→ mebus joined10:28
→ Pseudonosaur joined10:28
→ kadoban joined10:28
→ olbat[m] joined10:28
→ pd09041999[m] joined10:28
→ mattcen joined10:28
→ kapilp joined10:32
→ yyy- joined10:35
→ Wryhder joined10:35
← Lucas_Gray left10:35
Wryhder → Lucas_Gray10:36
→ inkbottle joined10:39
rnmhdn x has cloned a repo to my system with his own account10:40
how can I push to that repo with my account?10:40
cdunklau rnmhdn: what's the remote's url?10:41
rnmhdn gitlab10:41
cdunklau that's not a valid url10:42
rnmhdn why do you need the remote URL it's a private repo anyway10:42
cdunklau rnmhdn: what does it start with?10:42
rnmhdn: did you try pushing? what happened?10:42
rnmhdn you mean if they have cloned with https or git?10:42
it asks for their password10:42
but I also have credentials to that repo10:42
cdunklau rnmhdn: yes, what protocol is the url set for10:43
rnmhdn it has both https and git10:43
they have probably used https initially to clone10:43
cdunklau a remote can't have more than one url10:43
anyway, change the remote's URL10:44
rnmhdn it is the same url10:44
cdunklau does it have a username@ in it10:44
rnmhdn moment10:44
no10:44
cdunklau rnmhdn: and you're looking at what git has, right?10:44
git remote -v10:44
rnmhdn shit10:44
yes it has username in it10:45
cdunklau there you go10:45
rnmhdn https://arn24@gitlab.com/rndn/londo10:45
so I just change remote?10:45
cdunklau yes, probably to SSH because http remotes suck10:46
rnmhdn can I use differnt accounts with a git url?10:46
git remote set-url origin [email@hidden.address]10:47
cdunklau git url means SSH10:47
so yes10:47
it'll use your SSH key10:47
rnmhdn so my friend has to put his key in my system then?10:47
ok thanks10:47
cdunklau rnmhdn: no, they cloned with https10:47
rnmhdn I mean from now on10:48
cdunklau rnmhdn: are you trying to make it so your friend can use your machine?10:48
rnmhdn no10:48
I'm trying to ditch you so you won't tell me10:48
!deploy10:48
gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html10:48
rnmhdn lol10:48
cdunklau rnmhdn: it's hard to help effectively unless we know the actual situation10:49
rnmhdn yes but some people don't help you if you tell them what you are doing:D:P10:49
→ omnireq joined10:49
rnmhdn thanks for your help tho;)10:50
cdunklau rnmhdn: and lots of people won't even try to help if you seem like you're not being truthful10:50
it's hard enough to help people on the internet as is10:50
rnmhdn when you are trying to ditch people you don't expect them to notice you are not being truthful:D10:50
I'm sorry :D10:50
thank you.10:50
cdunklau rnmhdn: people also remember when certain people are difficult to help, so a lot of the time they won't even try next time10:51
rnmhdn oops :-s10:53
← inkbottle left10:53
← Makaveli7 left10:55
← pyfgcr left10:58
→ plasticle joined10:58
← crtcji left11:00
Habbie cdunklau, without wanting to disagree with anything you said (certainly for the purpose of solving a problem), i recently ran across https://gist.github.com/bjmiller121/f93cd974ff709d2b968f which is pretty nifty11:01
cdunklau Habbie: except for the "a remote can't have more than one url" part :)11:03
i didn't know that, nifty11:03
Habbie ack11:03
it's still only one remote for pulling, obviously11:03
cdunklau seems to be a questionable use case though :D11:04
Habbie i haven't figured out a use case for it either11:04
i do have a repo that i'd like to be in sync with another repo all the time, but this won't help me do that11:04
← gloomy left11:04
cdunklau sounds like one of those "it sounded like a good idea at the time!" things11:05
Habbie 'easy backups'11:05
cdunklau yeah until it isn't easy11:05
Habbie yes11:06
← crose left11:08
← fjellfras left11:10
← rnmhdn left11:11
→ Atlenohen joined11:14
→ emsjessec joined11:14
← Lucas_Gray left11:15
← Cabanossi left11:15
→ derk0pf joined11:18
derk0pf $echo *.jpg > .gitigonre; that ignores all *.jpg even in dirs, right?11:18
osse qyes11:18
yes11:18
assuming that actually adds '*.jpg" to the file11:19
derk0pf osse: ty a lot <<11:19
cdunklau derk0pf: also it wipes your existing .gitignore :)11:19
well, .gitigonre11:19
derk0pf hm, sure?11:19
osse yes11:19
cdunklau which presumably you don't care about anyway :D11:19
derk0pf i tought it just add the line11:19
but it would be a bad habit11:19
osse >> adds. > overwrites11:19
derk0pf ty11:19
for noticing11:19
yo11:19
roger roger11:19
thanks11:20
nice tipp11:20
:311:20
osse and if you have jpg files in the current directory then echo *.jpg won't actually echo *.jpg11:20
cdunklau oh lol11:20
derk0pf woah11:20
what a whiz11:20
cdunklau shells are bad mmmkay11:20
derk0pf :>11:20
^no11:20
anyhow11:20
selckin howto recognise <18 year olds11:22
→ gloomy joined11:22
derk0pf i actualy had to put it in qouting marks osse11:22
osse yeo11:23
→ czart joined11:23
osse yep11:23
→ Lucas_Gray joined11:26
→ learningc joined11:26
← Lucas_Gray left11:28
← aruns left11:30
→ lankanmon joined11:31
→ rnmhdn joined11:32
→ Lucas_Gray joined11:33
→ Viking667 joined11:36
Viking667 Good evening. I forked a repo a while ago, now I want to pull the changes from that repo into my own fork, which git pull command do I need?11:37
(i.e. I want to fast forward my own to the current state of the other repo)11:38
osse Viking667: forked, as in you have a fork on github?11:39
→ nuala joined11:40
← gloomy left11:40
→ nabil__ joined11:41
→ AtumT joined11:42
← nabil_ left11:44
→ nabil_ joined11:45
← nabil__ left11:46
← nuala left11:47
Viking667 osse: yes. The project is called dolphinsmalltalk/Dolphin, I have brickviking/Dolphin11:47
→ lucasb joined11:47
Viking667 I did that on the instructions of the person maintaining Dolphin.11:47
→ subopt joined11:49
← rnmhdn left11:50
→ CodeSlingerPaul joined11:52
cdunklau Viking667: so you want to pull in the changes from dolphinsmalltalk/Dolphin11:53
?11:53
wyoung Viking667: I could edit .git/config and add in the original repo you forked from. Then you do a git pull nameOfOriginalRepoYouAddedToGitConfig11:54
cdunklau my usual workflow for this is to add the upstream as a remote called "upstream" and pull from that11:54
wyoung s/could/would/11:54
cdunklau: How you been buddy! Long time!11:54
cdunklau ...hi11:54
→ quizzi joined11:54
osse Viking667: add the original repo as another remote, fetch from it, then do whatever11:55
Viking667: !sync11:55
gitinfo Viking667: [!pull_upstream] To incorporate changes from an "upstream" or forked-from repository: git remote add upstream $URL; git fetch upstream; git merge upstream/$BRANCH. https://help.github.com/articles/syncing-a-fork/11:55
Viking667 hm, git fetch upstream looks familiar, I suspect git merge could be the bit where I become unstuck.11:56
wyoung Nice, hand holding instructions. I like :)11:56
Viking667 Okay, thanks.11:56
Yah, it's been ages since I've used anything but "git clone" and "git pull"11:56
cdunklau Viking667: git pull is just a fetch, and a merge11:57
wyoung cdunklau: How's life?11:57
Viking667 I'm surprised I still remember "git commit -m ...."11:57
cdunklau wyoung: i don't really want to talk to you11:57
Viking667 would "git pull upstream" work?11:57
cdunklau Viking667: if you wanted to fetch, then merge FETCH_HEAD, sure11:57
wyoung Fair call. A bit rude but kind of what I expect from you.11:57
cdunklau k11:58
Viking667 okay. Thanks, cdunklau11:58
← zamba left11:58
cdunklau wyoung: meh, so is assuming we're buddies11:59
osse Viking667: you said you wanted to fast-forward your state. merge is the tool of choice then11:59
Viking667: in particular merge --ff-only, which will scream at you if fast-forwarding isn't possible11:59
← quizzi left11:59
← khisanth_ left12:00
Viking667 lol. I did "git pull upstream" and it complained I hadn't specified a branch.12:00
do I just tack -b master on the end? Or isn't that how it works?12:00
→ Cabanossi joined12:00
← Noti left12:00
Viking667 whoops, I missed that last comment.12:01
osse if master is the branch you want then yes, but without -b12:01
→ Noti joined12:02
Viking667 so, "git merge upstream/master"12:03
← netj left12:03
→ quizzi joined12:03
→ netj joined12:04
→ zamba joined12:04
osse after fetching yes12:05
Viking667 Thanks for that.12:07
→ enoq joined12:09
Viking667 okay. Something's weird. when it prompts me for a github username, do they mean complete with email address, or without that?12:09
Never mind, I figured it out. Okay, I'm out of here...12:11
Habbie username, not email address - but instead, i strongly recommend using ssh12:11
Viking667 thanks for the help. It was ssh prompting me.12:11
Habbie oh12:11
then the username is git12:11
Viking667 to be exact, ssh-askkey...12:11
wha?12:11
Habbie sorry12:11
i assumed github12:11
i guess i'm wrong12:12
Viking667 yes, it asked me for my username at github.12:12
Habbie ssh would not do that12:12
cdunklau Viking667: what's your remote's URL12:12
Habbie https sould do that12:12
*would12:12
Viking667 github.com/brickviking/Dolphin12:12
cdunklau Viking667: what command did you run?12:12
Viking667 Not sure whether I used git: or https:12:12
uhm, git push12:13
→ khisanth_ joined12:13
Viking667 so it'll be whatever I set up initially12:13
osse git remote -v will show12:13
Viking667 thanks.12:13
cdunklau Viking667: git remote -v12:13
look for origin12:13
osse 2l8 bruh12:13
Viking667 yup. 218?12:14
cdunklau osse: fite me12:14
Viking667: that's an L12:14
Viking667 departs before fighting breakes oute...12:14
← plasticle left12:14
cdunklau Viking667: fiting*12:14
:312:14
Viking667 meh. Whatever.12:14
good morftervenight...12:15
← Viking667 left12:15
← zamba left12:15
← malmalmal left12:18
→ nuala joined12:19
→ zamba joined12:19
→ malmalmal joined12:20
→ pyfgcr joined12:26
← malmalmal left12:27
← zamba left12:37
→ plasticle joined12:38
→ zamba joined12:39
→ d3mon joined12:40
← d3mon left12:40
→ d3mon joined12:40
← d3mon left12:40
→ randomdude999_ joined12:41
← randomdude999 left12:41
randomdude999_ → randomdude99912:41
← YuGiOhJCJ left12:41
wyoung Who's fighting?12:42
osse no one, we're just kidding12:43
Oh... The Yemeni12:44
← ezio left12:47
→ randomdude999_ joined12:47
← randomdude999 left12:47
randomdude999_ → randomdude99912:47
→ malmalmal joined12:48
→ tlaxkit joined12:52
← zamba left12:53
← Newami left12:53
→ zamba joined12:56
→ Makaveli joined13:02
Makaveli → Guest7090613:03
← Guest70906 left13:04
→ Makaveli joined13:04
Makaveli → Guest8594213:05
← SkarmoutsosV left13:05
→ revoltingPeasant joined13:05
← austin987 left13:06
revoltingPeasant I accidentally did a `git stash apply` on my local master branch. I'm pretty sure the stash was just junk but I cant remember when I made it. anyway now I'm unable to do `git checkout ./` as I'm getting "JunkFile.cpp: needs merge", can I safely back out of this situation. I'd hate to affect the master branch in any way.13:08
osse revoltingPeasant: sounds like the stash applying failed. git reset --hard will take care of it13:09
revoltingPeasant osse: thank you very much.13:09
osse revoltingPeasant: do you live in an anarcho-syndicalist commune?13:10
← queip left13:11
revoltingPeasant slaughter the bourgeoisie!13:11
osse: ah no, I just need a wash13:12
osse https://www.youtube.com/watch?v=t2c-X8HiBng13:12
revoltingPeasant classic13:13
cdunklau i prefer strange women sitting in ponds, distributing swords13:13
osse you like having some moistened bint lobbing scimitars at you?13:15
→ albel727 joined13:15
cdunklau shut UP13:16
→ localhorse joined13:16
osse Viking667 should've been around now13:16
→ queip joined13:17
← Kulrak left13:21
← randomdude999 left13:21
← Cabanossi left13:23
→ Kulrak joined13:23
→ alyptik joined13:25
← omnireq left13:26
← tsdh left13:26
→ griffindy joined13:31
cdunklau i fart in your general direction!13:31
← alyptik left13:31
← netj left13:33
→ crose joined13:33
← yyy- left13:34
→ netj joined13:34
→ Cabanossi joined13:34
→ yyy- joined13:34
→ altendky joined13:38
→ zen_coder joined13:38
zen_coder where do I specify which git commit should be used by a certain submodule?13:38
osse zen_coder: you go to the submodule, git checkout the commit you want, go back, git add path/to/submodule and commit13:38
← netj left13:39
→ StucKman joined13:39
→ netj joined13:39
← LordVoldePort left13:39
→ rnmhdn joined13:39
→ randomdude999 joined13:40
StucKman I know this is about a private site and not the tool, but maybe is kind enough to helpme: given repo A in GitHub and its clone repo B, can I update repo B from repo A directly, without using my network?13:40
← quizzi left13:40
← macaronus left13:40
→ gordonfish joined13:40
osse StucKman: not using plain Git. I think Github's web UI can do it13:41
StucKman that's exactly what I can't find13:41
all I see is This branch is 387 commits behind repo A13:41
zen_coder osse: that is how you do it when you first add a submodule?13:42
→ quizzi joined13:42
Habbie i've never spotted that in github's web ui13:42
i would also like this for some branches13:42
→ elichai2 joined13:42
osse zen_coder: yes13:43
← queip left13:44
zen_coder osse: how do I remove a submodule? just remove the entry from the `.gitmodules` ?13:45
→ uebera|| joined13:45
osse zen_coder: git rm the/path, and that13:46
→ rafasc joined13:46
osse zen_coder: I think actually git rm takes care of the .gitmodules file13:47
StucKman Habbie: ok, I'm not the only one :) :(13:47
my option is to discard the clone and redo it13:47
Habbie why would you discard the clone?13:48
← quizzi left13:48
StucKman Habbie: so I can clone it again13:49
← derk0pf left13:49
Habbie StucKman, no wait - what is your goal?13:49
← ChrisLane left13:49
→ derk0pf joined13:49
StucKman Habbie: git pull on repo B, which is a clone of repo A, without a third clone with both A and B as remotes13:50
Habbie 'which is a clone' or 'which is a fork'?13:50
→ quizzi joined13:50
→ ChrisLane joined13:50
→ queip joined13:50
StucKman yes, fork, clone, isn't it the same thing?13:50
(ok, GH says you can fork a repo on their site, and clone on your computer)13:51
but internally the op is the same, git clone13:51
maybe the fork is a git clone --bare13:52
zen_coder osse: can I remove multiple submodules in one command?13:52
_ikke_ They have some custom logic to p13:52
osse zen_coder: probably yes13:52
_ikke_ Limit duplication13:52
osse StucKman: googling reveals nothing so I guess it can't be done13:53
StucKman osse: yeah, I suspected the same13:53
Habbie StucKman, the point is that your question is hard to understand if you mix the terms :)13:54
← learningc left13:57
→ mat001 joined13:59
→ derk0pf_ joined14:00
← derk0pf left14:00
→ Es0teric joined14:02
← Guest85942 left14:04
← Oebele left14:04
→ hussam joined14:05
← derk0pf_ left14:07
→ derk0pf joined14:10
← derk0pf left14:13
→ derk0pf joined14:15
← Lucas_Gray left14:17
→ Lucas_Gray joined14:17
→ thiago joined14:21
← clime left14:23
← Jackneill left14:25
← roadie left14:28
→ roadie joined14:31
→ boombatower joined14:32
→ Jackneill joined14:38
→ bluezone joined14:39
← mimajof left14:44
← malmalmal left14:47
← Lucas_Gray left14:50
← Es0teric left14:51
→ Lucas_Gray joined14:51
→ greggerz joined14:56
← profmac left14:58
→ oatmealraisin joined14:59
← Noti left15:02
→ malmalmal joined15:03
← mat001 left15:04
← subopt left15:05
← Lucas_Gray left15:06
→ subopt joined15:07
← floppydh left15:07
→ Lucas_Gray joined15:07
← kjartan left15:08
→ oxymoron93 joined15:10
→ AbleBacon joined15:11
→ kjartan joined15:11
→ welovfree joined15:12
→ AbleBacon_ joined15:12
← AbleBacon_ left15:13
← welovfree left15:14
→ agowa338 joined15:14
← chele left15:15
← derk0pf left15:17
→ trebuh joined15:20
trebuh Hello, is there a way to specify a username per host in the config: for example github.com -> trebuh gitlab.com.treb.uh etc. ?15:21
canton7 trebuh, I don't follow your example?15:22
→ profmac joined15:24
trebuh I want to specify a different username if the remote is matching a pattern. For instance, if github.com then the username I use should be trebuh, if gitlab.com it should be foo, if git.mycompany.com it should be bar.15:24
Habbie you can just put those in each of the remotes in your .git/config15:24
→ Piraty joined15:25
trebuh I would like to avoid the per repository config if possible.15:25
rafasc lets clarify something here: what kind of username are you referring here?15:25
Piraty hmm. `git diff v1..v2 -- somePath` and `git log --patch v1..v2 -- somePath` don't give the same patch !?15:26
← thiago left15:26
canton7 trebuh, ssh username? value of 'core.user' in the git config15:26
← Lucas_Gray left15:26
canton7 trebuh, some other sort of username?15:27
→ fflam joined15:27
trebuh the core.user username, it would be the same for all repo hosted at git.mycompany.com for example. Hence I do not have to configure it on a per repo basis.15:28
→ mikeputnam joined15:29
rafasc if by core.user you mean user.name, that doesn't make much sense.15:30
← R2robot left15:30
rafasc if you are willing to modify the structure you have your repos, you can use 'conditional includes'15:30
→ R2robot joined15:30
→ derk0pf joined15:31
→ def_jam joined15:31
trebuh Oh that would work, if the repo is into ~/foo/ then use this config etc. ?15:31
→ eb0t_ joined15:31
canton7 rafasc, oops15:32
← eb0t left15:32
← eblip left15:33
→ alyptik joined15:33
rafasc trebuh: that's the gist of it.15:34
trebuh I looked into it and that would work well for me. Thanks.15:35
rafasc you can do stuff like: if the repo is under ~/repos/github/ use github username, etc..15:35
trebuh rafasc: perfect.15:35
rafasc you might want to consider setting user.useConfigOnly15:37
so git doesn't try to guess your username in some circumstances.15:38
← alyptik left15:38
← neunon left15:40
→ neunon joined15:40
→ Lucas_Gray joined15:41
→ leeN joined15:41
trebuh I'll have a look, thanks for the insight15:43
→ deathwishdave joined15:44
← oxymoron93 left15:47
→ jarlopez joined15:55
jarlopez I'm walking through a `git add --patch <a lot of files>` and forgot to stage a specific hunk. How can I go back to the hunk I missed, without having to re-run `git add --patch ...`?15:56
→ joe2 joined15:56
jarlopez I see that there's a `g` command when interactively adding15:56
→ mat001 joined15:57
← mat001 left15:57
→ mat001 joined15:57
← revoltingPeasant left15:58
→ nabil__ joined15:59
← shored left15:59
→ shored joined15:59
← nabil_ left16:01
→ thiago joined16:05
← subopt left16:05
→ subopt joined16:07
← subopt left16:13
joe2 → revoltingPeasant16:14
← zen_coder left16:15
← thiago left16:15
→ iam730 joined16:16
→ strk1 joined16:17
strk1 Use of uninitialized value in concatenation (.) or string at /usr/share/perl5/Git/SVN/Log.pm line 225, <$fh> line 73238.16:17
I keep getting the above error since a loooong time16:17
git-svn is 1:2.17.1-1ubuntu0.416:17
strk1 → strk16:17
→ causasui joined16:18
→ thiago joined16:18
← nabil__ left16:19
wyoung Take me down to the pardise city where the drupol's are green and the cdunklau's are pretty!16:19
← igemnace left16:19
→ nabil joined16:20
← Lucas_Gray left16:20
bin_bash no16:21
wyoung bin_bash: Oh won't you please take me home!16:22
→ igemnace joined16:22
→ nabil_ joined16:23
← fphilipe_ left16:25
← nabil left16:26
ongo so I porked my git commit history pretty badly, long story, but I need to revert to an old commit and remove all commits that are above it (everything is pushed)16:27
do I just check out that SHA and force push?16:27
wyoung I cry when angels deserve to DIIIEE!!!!!16:27
→ fphilipe_ joined16:28
ongo 1. git reset sha 2. commit -m "undo" 3. git push -f origin master?16:28
igemnace ongo: are you certain you want to remove published history for this change? others working with you will have to do work to recover16:29
ongo yes16:29
the history is just confusing and looks absolutely atrocious16:29
we are aware of it and want to clean up the history16:29
Habbie your 3 steps will -add- a commit resetting the -content- state to what you want16:29
it will not clean up the history16:30
igemnace reset --hard to that commit then push -f. and make use of rebase -i next time16:30
Habbie for that, read up on reset --hard16:30
ongo thanks16:30
→ omnireq joined16:30
← fphilipe_ left16:33
→ orbyt_ joined16:33
→ borkr joined16:33
→ mowcat joined16:35
← feriman left16:35
← revoltingPeasant left16:36
← Piraty left16:37
→ jammm joined16:40
→ publio joined16:42
ongo my god I feel dirty after that16:43
→ fphilipe_ joined16:43
→ pfloyd joined16:43
ongo is it a good idea to rebase like 50 commits on master to cleanup the history, commit messages, etc.16:44
pfloyd if I'm in the midst of a merge conflict (.git/MERGE_HEAD exists, etc) and I want to quickly get the list of the conflicting files (even if I've resolved the conflict, but haven't committed yet), is there a git command that can show me the conflicting files only? Kind of like grap'ing for "both modified:" prior to resolving the conflict, but which would work both before and after resolving the conflict?16:45
← orbyt_ left16:45
← agowa338 left16:45
TomyWork pfloyd, git status should show you that16:47
sounds like an x-y problem though16:48
!xyproblem16:48
!xy16:48
gitinfo You are asking about a solution, but we can help you a lot better if you could describe the actual problem you are trying to solve.16:48
pfloyd TomyWork: no it won't if I've resolved the conflict, it'll go from "both modified:" to "modified:" and appear like other files that did not have a conflict.16:49
what was unclear about my question? "git merge" => conflict. I want to be able to identify what files had a conflict both before AND after I resolve the conflict.16:49
but priot to a "git commit"16:49
TomyWork so basically you want the list of files that will be in the commit message by default?16:49
under "conflicted"16:50
pfloyd correct16:50
TomyWork hmmm16:50
pfloyd the reason I want to identify these is I have hooks to check whether certain users are allowed to commit changes and if a file was merged (i.e. MERGE_BASE == post-merge) I don't want to flag it as them committing it, since they aren't changing it.16:50
← fphilipe_ left16:51
TomyWork i could change any file in a merge commit16:51
not just conflicting files16:51
pfloyd what I'm doing now works, but is slow. I use git show MERGE_HEAD:<file> and get its md5sum, and get md5sum of what's on disk. if they are the same, I don't flag it for checking against the restricted list. works fine, but very slow16:51
would be faster if I could say "git show-conflict-files" to give me the list of files I *do* want to check access restrictions for :)16:52
→ Onionnion joined16:53
pfloyd guess I could parse .git/MERGE_MSG but that seems also like a hack16:53
TomyWork i'm still not sure how that would help you prevent unauthorized changes16:53
i mean, conflicted or not, i can change the file in a merge commit16:54
doesn't really matter16:54
pfloyd I'm simply trying to filter out files that they aren't actually changing (i.e. would have been a fast forward merge for that file)16:54
→ pR0Ps joined16:55
pfloyd of course they can, and if they modify this same file and that's part of the commit, I can detect that with my current implementation since the md5(MERGE_BASE) != md5(file_on_disk), but again this is slow.16:56
TomyWork and you want to speed that up by only checking the conflicted files with a checksum?16:56
why not speed it up by using git diff?16:57
maybe with the -s flag16:57
→ Makaveli joined16:57
TomyWork i think you still get zero/nonzero exit status to indicate whether there was a change16:58
Makaveli → Guest2835116:58
TomyWork or parse the output of something like "git diff --numstat" to get a list of actually changed files16:58
pfloyd what exactly would I diff though if I'm in a merge conflict and don't know if it was resolved or not?16:58
← Guest28351 left16:59
pfloyd a shit, meeting time. have to resume this in a bit16:59
TomyWork i'm on my way out, though16:59
→ Sasazuka joined16:59
← yyy- left17:00
TomyWork i'm not sure how this all fits together17:00
you have a merge in progress, implying that you are on the machine of the person doing the merge17:01
but you also want to restrict that same person's access? what if they just delete your pre-commit hook?17:01
← borkr left17:01
→ wootehfoot joined17:01
TomyWork this sounds like something you should probably check on the remote side, prior to receiving the commit17:02
← AKPWD left17:02
TomyWork and then you can just diff vs. the previous state17:02
→ Raging_Hog joined17:03
TomyWork i'm out, bye17:03
← TomyWork left17:03
← pyfgcr left17:05
← trebuh left17:07
→ duderonomy joined17:08
→ nabil__ joined17:11
← nabil_ left17:14
← strk left17:15
→ orbyt_ joined17:20
→ noark9 joined17:26
→ savolla joined17:26
→ Newami joined17:29
← shored left17:29
→ navidr joined17:29
→ shored joined17:29
← orbyt_ left17:30
← mooasaurus left17:31
→ mooasaurus joined17:31
→ hsn joined17:31
← planetcall|work left17:32
← Raging_Hog left17:32
hsn Even after I do git reset --hard ,it still thinks that files are changed using git status. It has to do something with crlf conversion. How to turn it off?17:32
← Sasazuka left17:33
→ orbyt_ joined17:33
← thiago left17:34
→ thiago joined17:34
_ikke_ hsn: does git config core.autocrlf return something?17:34
← orbyt_ left17:34
hsn setting core.autocrlf to true or false didnt have any effect17:34
_ikke_ ok17:34
git ls-files --eol <filename>17:34
what does that return?17:34
hsn or i have to do checkout after set it?17:34
← czart left17:34
→ orbyt_ joined17:35
hsn i/crlf w/crlf attr/text eol=crlf grepwin-install-context.reg17:35
git config --get core.eol is set to crlf17:36
_ikke_ Ok, there is a .gitattributes file that sets line ending normalization17:37
i/crlf is what causes the problem17:38
git add --renormalize grepwin-install-context.reg17:38
← iam730 left17:38
hsn this file .gitattributes has "* text eol=crlf"17:38
_ikke_ That can potentially cause issues17:39
because binary files (images) would be affected as well17:39
← Stoot left17:39
rafasc * text=auto eol=crlf would be safer.17:40
_ikke_ yes17:40
And unless the fileformat requires crlf, I would remove that as well17:40
rafasc (although, it may be also a good idea to.. ^17:40
_ikke_ * text=auto17:40
hsn text=auto fixed the problem17:42
→ MACscr joined17:47
← jarlopez left17:48
→ cliluw joined17:49
→ pyfgcr joined17:55
← StucKman left18:03
→ Sasazuka joined18:04
← shored left18:05
→ shored joined18:06
← noark9 left18:10
→ energizer joined18:10
→ fphilipe_ joined18:11
energizer I see this command `git diff --name-only origin/master ...` What does the `...` mean?18:14
_ikke_ energizer: are the dots connected to master?18:15
energizer _ikke_: oh yes they are18:16
← fphilipe_ left18:17
rafasc !dots18:17
gitinfo A..B = stuff that happened between A and B (if A and B are related; otherwise refer to "man gitrevisions"), A...B = (a) in history viewers: stuff that isn't in both A and B yet; (b) in "git diff": stuff that happened in B since the two diverged; (c) in "git checkout": the merge base of A and B. "master.." is the same as "master..HEAD" and "..master" is the same as "HEAD..master", and so forth.18:17
energizer so what's three dots?18:18
cdunklau energizer: there are FOUR DOTS18:19
i think it's just 2 or more, isn't it18:19
rafasc energizer: it is explained in the factoid.18:19
energizer rereads18:19
← rnmhdn left18:19
cdunklau rafasc: specifically thing... is not18:19
but the numberr of dots doesn't matter, as long as its at least 2, i thought18:20
rafasc read the (b)18:20
cdunklau: no. Two means one thing, three means another.18:20
energizer frankly, the answer to my question isn't clear from that snippet18:21
cdunklau okay, that's not all that clearly discussed in the factoid, to be fair18:21
ah wait now i get it18:21
_ikke_ All commits from A and all commits from B, but NOT commits that they have in common18:21
cdunklau energizer: A..B is the first thing, A...B is the second thing, which has multiple interpretations based on (a), (b), ...18:21
→ Es0teric joined18:22
← Jackneill left18:22
cdunklau energizer: so master... (3 dots) means master...HEAD i suppose18:22
rafasc correct18:22
_ikke_ HEAD is implied18:23
...master means HEAD...master18:23
cdunklau yeah the confusion was about 2 vs. 3 dots18:23
← savolla left18:23
_ikke_ man gitrevisions also explains it18:23
gitinfo the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html18:23
rafasc and in case of the diff, means: all changes that was done in the current branch since it diverged from master.18:23
energizer oh i see how it could be obvious from the snippet once you have the right mental model :)18:24
rafasc the factoid also recommends reading gitrevisions, to get the full picture.18:24
otherwise we would need to print the entire manpage here, which is not productive.18:25
← Es0teric left18:25
cdunklau rafasc: i can assure you that energizer and I intend no ill will18:26
→ mat001_ joined18:26
→ SkarmoutsosV joined18:27
rafasc cdunklau: I am not saying that. :) it's all good.18:27
← orbyt_ left18:27
← AtumT left18:27
rafasc gitrevisions is one of those things that are kind of git magic until you really spare some time to learn it.18:27
← jayjo left18:29
← mat001 left18:30
→ orbyt_ joined18:30
foo I rebase'd staging with dev2/view-data-loading. When I do git log, it shows this: (HEAD -> staging, origin/staging2, origin/staging, origin/dev2/view-data-loading, dev2/view-data-loading) ... can someone help me understand what this means? I'm specifically wondering how origin/staging2 got mixed up in here.18:31
← jcbitter left18:31
Habbie apparently HEAD is equal to origin/staging218:31
_ikke_ HEAD is pointing to staging, which is the same commit as origin/staging218:32
Hard to give a better explanation without more details18:32
foo Habbie: oh. So just because origin/staging2 is in here, it doesn't mean someone from another feature branch (that I rebased from) ever merged or pulled from staging2... if someone else rebased on staging2 from their feature branch, basically as I did, then this would show both staging and staging2 are the same.18:32
→ jcbitter joined18:32
foo Habbie / _ikke_ ^ I think I'm in sync. It makes sense for both to be the same18:33
thank you18:34
← deathwishdave left18:38
→ AtumT joined18:39
→ AtumT_ joined18:41
← tlaxkit left18:41
← AtumT left18:44
→ czart joined18:45
→ Stoot joined18:47
→ fuzzface joined18:48
← orbyt_ left18:52
→ Inline joined18:53
← jammm left18:53
← mowcat left18:54
→ revoltingPeasant joined18:57
→ TomTom joined18:57
← bluezone left18:59
← jcbitter left19:02
→ jcbitter joined19:03
← Stoot left19:03
← irrgit left19:04
→ Es0teric joined19:08
→ orbyt_ joined19:09
→ yokisuci joined19:10
→ rnmhdn joined19:14
← czart left19:15
→ plexigras joined19:15
→ gabe joined19:16
→ benharri joined19:17
→ mat001 joined19:19
→ randomdude999_ joined19:20
← randomdude999 left19:20
randomdude999_ → randomdude99919:20
→ mArtale joined19:21
← mArtale left19:22
← mat001_ left19:22
→ randomdude999_ joined19:23
← randomdude999 left19:23
randomdude999_ → randomdude99919:23
← greatgatsby left19:28
→ Stoot joined19:30
← rnmhdn left19:33
← emsjessec left19:34
→ emsjessec joined19:35
→ yyy- joined19:36
← tombusby left19:37
→ irrgit joined19:38
→ feriman joined19:39
← jubal left19:39
→ tombusby joined19:42
← BoneTone left19:44
← emsjessec left19:44
← qgTG left19:45
← revoltingPeasant left19:46
→ ucodespace joined19:51
→ AtumT joined19:52
← AtumT_ left19:52
← yokisuci left19:56
→ dpl joined19:56
→ yokisuci joined19:57
→ wildlander_ joined19:58
← yokisuci left19:58
← wildlander left19:58
→ yokisuci joined19:59
→ savolla joined20:01
→ sunri5e joined20:03
→ n3wborn joined20:03
← sunri5e left20:04
← wootehfoot left20:05
← jcbitter left20:05
← is_null left20:06
→ jcbitter joined20:07
→ reveer_ joined20:08
→ sunri5e joined20:10
→ Giant81 joined20:11
← kjartan left20:12
→ fphilipe_ joined20:13
→ kjartan joined20:14
→ newdimension joined20:15
← oatmealraisin left20:16
← sunri5e left20:17
→ salad joined20:18
← fphilipe_ left20:18
→ sunri5e joined20:19
← yokisuci left20:25
← orbyt_ left20:30
→ fphilipe_ joined20:31
→ yonder joined20:32
← fphilipe_ left20:36
← Atlenohen left20:37
→ Atlenohen joined20:37
← howdoi left20:42
→ jubal joined20:42
← Newami left20:44
dino82 Hi all, I'm following this guide to sync two repositories https://medium.com/@_oleksii_/how-to-synchronize-two-remote-git-repositories-e63b78892901 but when I get to the 'git fetch upstream' part, git appears to be appending 'info/refs' to my upstream, causing a fatal error: 'not valid: is this a git repository?' Did I miss a step?20:45
← randomdude999 left20:45
→ clime joined20:46
← energizer left20:46
← savolla left20:47
← mat001 left20:47
→ randomdude999 joined20:47
_ikke_ dino82: sounds like it's trying dumb http20:50
dino82 Yes the upstream is using `https://....../project.git`20:51
← kapilp left20:51
_ikke_ Is it a custom git hosting solution?20:51
dino82 The upstream is Github and the origin is Bitbucket20:52
Trying to get Github master into Bitbucket master20:52
→ Jackneill joined20:54
dino82 If I leave the .git off the end, it says the repository doesn't exist, if I keep it there, it appends `/info/refs` to the URL m aking it invalid20:57
canton7 dino82, your url is wrong. Git's trying to talk smart http, and the other side isn't responding20:59
so it tries dumb http20:59
(and that involves adding /info/refs)20:59
dino82 Ok, will verify the correct URL21:00
URL was verified, I'm passing credentials inline (this being a jenkins job) `git remote set-url upstream https://\${GH_USER}:\${GH_PASSWORD}github.com/orgName/project-Name.git`21:03
→ mat001 joined21:03
canton7 missing @?21:03
dino82 err yes I mispasted, there is an @ between the creds and github.com21:04
canton7 private repo?21:04
dino82 yeah21:04
← feriman left21:04
_ikke_ dino82: do you have 2-factor setup?21:04
dino82 If I had to switch over to using ssh:// to resolve this, I can try to get that through21:04
canton7 if your creds aren't correct, github responds with a 40421:04
cdunklau dino82: does the password have non-ascii21:04
dino82 No this is a basic service account21:04
cdunklau and by that i mean non-alphanum21:05
dino82 I'm not certain what the password is, I'm a lowly user in this Jenkins setup (contractor)21:05
cdunklau dino82: all the -v's?21:05
dino82 I can verify the user creds work because I used them to do a test checkout21:06
cdunklau dino82: that is, stick in a -vvv21:06
dino82 Will try. After setting `git remote add upstream` I run `git remote -v` and it returns my origin as the bitbucket repo and upstream as the github repo21:07
cdunklau dino82: i'm asking less about if the creds are right, and more about if the creds have a thing you have to percent-quote21:07
→ causa_sui joined21:07
→ m0viefreak joined21:07
cdunklau it's kind of a wild guess, but hey, maybe21:07
rafasc https://confluence.atlassian.com/bbkb/info-refs-not-valid-is-this-a-git-repository-313467635.html21:08
← causasui left21:09
dino82 Yeah I checked that, 1,2) Both repositories are created and have branches, the bitbucket has a dummy master branch that I will be syncing over, 3) I don't think I'm hitting any limits, GH is an enterprise account and BB is a locally hosted instance21:10
rafasc and 'info/refs' can show up on smart http protocol.. GET http://server/simplegit-progit.git/info/refs?service=git-receive-pack etc...21:11
https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols21:11
← fuzzface left21:12
dino82 Is this an issue that is resolved by using ssh:// ?21:12
cdunklau if you can use ssh, do it21:13
dino82 I prefer ssh but I'd need to jump through a hoop to make it so, trying anything I can before requesting it21:13
The document I was referencing was using https:// exclusively so I try to emulate that21:14
cdunklau dino82: did you throw in some -vvv in the push21:14
→ savolla joined21:15
dino82 cdunklau Yeah it doesn't get that far, it errors at the `git fetch upstream`21:15
cdunklau well, -vvv in the fetch then21:15
← pyfgcr left21:15
← Jackneill left21:15
cdunklau hmm that doesn't seem to tell much21:16
dino82 That errored saying unknown switch v21:16
← TomTom left21:17
cdunklau dino82: git fetch -v should not give you that error21:17
dino82 https://pastebin.com/eqAVF08021:18
→ is_null joined21:20
cdunklau dino82: i don't see git fetch -v there21:21
dino82 I didn't paste that one, but it didn't yield any different output21:22
← Cabanossi left21:23
→ bashfulshell joined21:24
← reveer_ left21:26
dino82 Welp I'll try the ssh route, else I have no idea how else to sync these two repos21:27
← clime left21:28
← gabe left21:28
→ Cabanossi joined21:30
← AbleBacon left21:38
← is_null left21:39
→ is_null joined21:43
← mat001 left21:45
→ mat001 joined21:46
← enoq left21:48
→ jayjo joined21:49
← hsn left21:49
← is_null left21:51
→ greatgatsby joined21:52
← SkarmoutsosV left21:56
→ is_null joined21:56
← Es0teric left21:57
← savolla left21:59
→ azwieg103 joined22:01
→ kneeki joined22:02
← is_null left22:04
← greggerz left22:05
← griffindy left22:07
← dpl left22:08
← crose left22:09
← plexigras left22:10
← yyy- left22:15
→ dpl joined22:15
→ orbyt_ joined22:16
← salad left22:17
→ mat001_ joined22:17
→ alyptik joined22:18
← mat001 left22:20
→ jsnal joined22:22
← jsnal left22:25
→ is_null joined22:27
← pR0Ps left22:28
madduck i am trying to figure out a means to keep an export of a git repo up to date with HEAD from post-merge/post-commit . I can use git-archive and unpack stdout to an "export" directory. However, this will accumulate files removed from the repo. Short of removing all files from the export directory before unpacking the archive tar, can you fathom a better way?22:30
→ cfoch joined22:31
→ oatmealraisin joined22:32
→ fphilipe_ joined22:32
← is_null left22:34
rasputozen when i stage a file and commit, the new tree object that gets created for that commit will contain the version of the file i staged along with the versions of all the files git is tracking that HEAD was pointing to when i comitted, right?22:34
osse rasputozen: Yes22:34
rasputozen osse: ic ty22:34
← alyptik left22:36
← fphilipe_ left22:37
→ Newami joined22:37
← malmalmal left22:39
← dpl left22:39
rafasc rasputozen: your 'staging area' also has information about every single file.22:40
commit essentially takes its contents and makes a commit out of it.22:41
~= git commit-tree -p HEAD $(git-write-tree)22:43
← leeN left22:45
rasputozen from what i read the index file records 3 versions for every file, the wdir, stage, and repo - so according to this last comment of yours i assume youre inferring that git takes these stage versions of all the tracked file (which will be the same as the repo versions if the user hasnt added anything) and uses this list to populate the new tree of the commit22:45
→ alyptik joined22:46
← greatgatsby left22:48
← boombatower left22:49
rafasc rasputozen: depends on how technical you want to dive in: https://github.com/git/git/blob/master/Documentation/technical/index-format.txt22:51
yes, the index format may cache some other data.22:51
But when someone says index, I assume they're saying index entries. (which is the stage part)22:52
← dartmouthed left22:53
→ Es0teric joined22:54
rasputozen yea22:55
← omnireq left22:56
← rafasc left23:02
→ ferdna joined23:03
→ ntropix joined23:03
→ qgTG joined23:06
← lucasb left23:06
→ jstimm joined23:06
← alyptik left23:09
→ dviola joined23:11
← azwieg103 left23:14
← CodeSlingerPaul left23:22
← silverwhitefish left23:22
→ klebs joined23:23
← oatmealraisin left23:24
→ cdown_ joined23:26
klebs hello everyone! I am in a bit of a jam and am hopeful somebody here might know how to unblock my development! on a project I am working on, I needed to find the source of a bug that was buried about two weeks back in the git history. I have found the previous functional commit, and would now like to interactively rebase the broken tip onto the wo23:28
rking branch, step by step, checking each change incrementally, all the way through until the problem is fixed. the problem i am having is that when I go to rebase (starting from a temp branch at the current_broken_tip executing "git rebase -i last_working_branch") the interactive rebase silently skips over the commit with the problem in it!23:28
→ silverballz joined23:28
klebs what i want it to do is actually stop at every single commit and let me inspect and modify the staging area, applying only what i want23:29
← cdown left23:29
cdown_ → cdown23:29
klebs i can't figure out why typing "git rebase --continue" is gliding over some commits and not others23:29
does anybody here know what my problem might be? and what i can do to fix it?23:29
i don't mind if the rebase writes new history in a completely different direction, starting from my last_known_working and ending up at my current_broken_tip (with the fix implemented during the interactive rebase along the way) -- all other commits in the project history arent relevant to my current line of development except these two23:30
→ Jogie joined23:32
← n3wborn left23:33
← dege left23:36
← mat001_ left23:39
→ mat001 joined23:39
→ fullbit joined23:41
← bruce_lee left23:42
→ brainproxy joined23:46
→ oatmealraisin joined23:53
← m0viefreak left23:53
→ jimmm joined23:54
← mat001 left23:54
jimmm → enone23:54
→ pR0Ps joined23:55
← enone left23:58

Logs Search ←Prev date Next date→ Channels Documentation