IRCloggy #git 2019-10-26

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-10-26

→ doug16k joined00:00
→ Wetmelon joined00:02
→ raven-au joined00:04
→ YuGiOhJCJ joined00:06
← yawkat left00:10
← thebope left00:10
← dartmouthed left00:13
← jrnieder left00:18
← yonder left00:19
← lucasb left00:28
Hoffmanbearpig → Jesus_Christ00:28
← bitwinery left00:28
← leeN left00:29
→ bitwinery joined00:31
← dionysus69 left00:32
← Sasazuka left00:33
→ Codaraxis_ joined00:35
→ yawkat joined00:36
← Codaraxis left00:39
← VladGh left00:41
→ sz0 joined00:49
→ gxt joined00:55
← Levin^2 left00:58
→ jstimm joined00:58
← igemnace left00:59
→ HumanGeek joined01:01
← Brainium left01:03
← lacrymology left01:03
← Human_G33k left01:04
← Codaraxis_ left01:04
← lankanmon left01:06
→ lankanmon joined01:09
← oxymoron93 left01:09
← m0viefreak left01:10
→ orbyt_ joined01:11
← F0rTex left01:11
→ F0rTex joined01:12
b0nn git standards01:14
are there any, should there be some?01:14
rafasc what do you mean by that?01:16
b0nn (I'm sick of moving to a new team only to have to spend n time coming to grips with whatever git policies they've cooked up01:16
→ Ori_B joined01:16
rafasc that's one of the strengths of git. It doesn't force you to adopt any particular workflow.01:17
→ matheusm1reira joined01:18
b0nn ITYM weakness01:18
← matheusmoreira left01:19
← dijitol left01:19
rafasc I meant what I said.01:19
b0nn: what is the policy that is pissing you off?01:24
or is it just the adapting between policies?01:24
also: https://colabti.org/irclogger/irclogger_log/git?date=2019-10-24#l86 :^)01:26
rustyshackleford so imagine a branch, lets call it sandbox, that many people are working in. When a specific feature is done, I want to yank all relevant commits out of sandbox and into staging01:36
but they are interleaved with the rest of the work going on01:36
can anyone explain how this works?01:36
← edwardly left01:36
← bvdw left01:38
→ bvdw joined01:39
rafasc rustyshackleford: only merge in one direction: feature->"sandbox" Then feature itself remains its own thing.01:39
rustyshackleford i think theres some value in working on a shared branch01:40
knowing which other work will conflict with yours and working those out01:40
the problem then is selectively pulling work out of sandbox, and into staging01:41
all that work is interleaved with other work basically. But i'll bet git rebase can work its magic here01:41
rafasc You don't need to work on a shared branch to know that.01:41
rustyshackleford i mean what do you suggest then01:42
reviewing other team's feature branches?01:42
→ Goplat joined01:42
rafasc That's one way to do it.01:42
rustyshackleford other ideas?01:42
rafasc https://colabti.org/irclogger/irclogger_log/git?date=2019-10-24#l27201:43
rustyshackleford how did you do that? cool01:43
rafasc this one ^ someone mentioned yesterday.01:43
rustyshackleford I was trying to scroll back in the logs but irccloud is slow01:43
"When they're done, they rebase their work off the current state of feature1 and create a PR"01:44
how would that work in practice? thats not like a standard rebase is it?01:44
we need to grab specific commits which are all interleaved into other work01:44
rafasc what they describe doesn't "interleave"01:46
rustyshackleford how would this rebase go?01:46
rafasc it's a simple rebase.01:46
rustyshackleford type that rebase command for me then? I am not seeing it01:47
rafasc git rebase01:47
git rebase feature1 x;01:47
for example01:47
rustyshackleford where x is a commit hash?01:47
rafasc No, did you read the message?01:48
rustyshackleford rereading01:49
so they're all on separate branches. I misread earlier01:50
features X, Y and Z branch off of feature101:50
→ Codaraxis joined01:51
rustyshackleford X1 - Z1 - X2 - Y1 - X3 - Y201:53
lets say history looks something like that. I want to yank out all of the X's01:54
rafasc because what he described doesn't even result in something like that.01:55
you can git checkout -b new Y2; git rebase -i X1; and drop z1 y1 y2;01:56
→ oatmealraisin joined01:56
rafasc or create a branch on x1, then cherry-pick x2 and x3.01:56
But this will be a nightmare to do it on a regular basis.01:57
rustyshackleford yup sure seems like it01:57
rafasc Just don't create a situation where you'll interleave unrelated commits like that.01:57
rustyshackleford i don't know then. that many feature branches seems like a disaster as well01:57
this is what happens when you have like twice as many developers as you need lmao01:58
rafasc git history should tell the history of the software, not how devs struggled with git.01:58
keep x1,x2,x3 together. Same for y and z.01:59
rustyshackleford I do think it is helpful for X, Y, and Z to work together01:59
its mostly non overlapping but they might be in some of the same files. Helpful to work out those details01:59
and still somehow selectively merge them into the next release02:00
rafasc The issues you describe are a pattern when people use git as a "quick save". To get the full benefits of git, you need to compose your history like you're telling a story.02:01
dviola → Guest8185002:01
rustyshackleford and i'm trying to fix that by rewriting history basically02:01
→ dviola joined02:02
rafasc the colaboration can be done by merging or rebasing into a shared branch.02:02
That should be enough to see if they're touching conflicting areas.02:02
and as long as you don't merge back from this shared branch. You x,y,z remain completely function.02:03
rustyshackleford are you interested enough to draw me a diagram?02:03
rafasc of what?02:04
rustyshackleford actually no I get it02:04
well its more than 3 teams/features02:04
rafasc could be 10002:04
rustyshackleford does it scale well?02:05
rafasc what doesn't scale is having interleaved commits.02:05
how do you even debug something like that?02:05
rustyshackleford haha i don't know!02:06
lagothrix → Guest9231202:06
← Guest92312 left02:06
→ lagothrix joined02:06
rustyshackleford you don't think you could script it or whatever02:09
given a complete list of commits (you would have to identify them too)02:09
I don't see a way where its not a ton of overhead02:09
rafasc I don't know why you keep insisting in the workflow that is causing you trouble.02:10
→ beastDiv_ joined02:12
→ nurdie joined02:13
rafasc What you're saying it's like: It hurts when I poke my finger into my eye. Does anyone know if wrapping my finger in rubber will stop the hurting?02:13
← F0rTex left02:14
rafasc when the answer is: stop poking your eye.02:14
← AtumT left02:14
→ F0rTex joined02:14
← nurdie left02:17
→ Codaraxis_ joined02:18
→ edwardly joined02:19
← Codaraxis left02:22
rustyshackleford rafasc: well i'm not trying to be stubborn02:24
← Cabanossi left02:24
rustyshackleford you also have to sell it well right? and make it work for our other processes like CI tools, automated builds for QA, testing02:25
shared sandbox branch works very nicely for QA builds02:25
rafasc You're aware that people have QA/CI/CD without having a shared branch with commits from different features all interleaved.02:26
if you want to test them all, do: git merge X, git merge Y, git merge Z, test the result.02:27
rustyshackleford i'm so jealous of where you work02:27
rafasc use literally any popular branching workflow, and not one will suggest that interleaving commits is a good idea.02:28
rustyshackleford I can't redo the whole program you know? Its not only my decision02:28
if its disruptive, people will claim that this new way of doing things is worse. "well we never had this probably with the old way"02:29
ignoring that our current system is a disaster haha02:29
rafasc You asked for an opinion, I gave you my sincere one.02:29
Those are the kind of answers people that poke themselves in the eye usually give.02:30
rustyshackleford i've got our release train engineer on board so thats good02:30
that is a good metaphor haha02:31
it was like a week long fire I put out this week, related to branches and CI tools02:31
I did finally fix it, woo02:32
← ricks_ left02:33
rafasc https://www.endoflineblog.com/oneflow-a-git-branching-model-and-workflow02:33
This is more or less what I use, and what the other person described02:33
rustyshackleford the other group I have to sell is our business02:34
thanks for the link, checking it out now02:35
→ Cabanossi joined02:35
rustyshackleford "If your project needs to maintain multiple simultaneous yet incompatible release versions that way, then OneFlow won't work for you out of the box"02:35
→ ricks_ joined02:36
rafasc it's not complicated to adapt it. Basically make hotfixes in the oldest release branch you care about, then cascade merge it until the current release.02:38
make hotfix for 2.21.0, tag 2.21.1, merge the result into 2.22.0, bump to 2.22.2, .... merge the result into master02:39
← rafasc left02:48
→ xelxebar_ joined02:48
← xelxebar left02:48
→ n3wborn joined02:52
← dviola left02:55
→ vdamewood joined02:55
→ nav2002 joined02:58
← sz0 left02:59
← ferdna left03:02
→ zonixo joined03:04
← Eugene left03:07
→ natechan joined03:10
← sgn left03:17
lagothrix → Guest6518503:17
→ lagothrix joined03:17
← Guest65185 left03:20
← LearnAllTheTime left03:21
← Cabanossi left03:24
→ Eugene joined03:27
→ Cabanossi joined03:29
→ SleePy joined03:31
← Newami left03:32
← vdamewood left03:37
matheusm1reira → matheusmoreira03:42
← cd left03:44
← beastDiv_ left03:55
→ ferdna joined04:01
→ null1337 joined04:01
→ LearnAllTheTime joined04:02
← kjartan left04:10
→ kjartan_ joined04:11
← donofrio left04:17
→ fstd_ joined04:19
← fstd left04:23
fstd_ → fstd04:23
Jesus_Christ → Hoff04:36
← nav2002 left04:38
→ jokester joined04:45
→ g00s joined04:52
← theoceaniscool left04:53
← orbyt_ left04:54
→ nurdie joined04:57
→ nurdie_ joined04:58
→ pks_ joined05:01
← nurdie left05:01
← pks left05:03
pks_ → pks05:03
← bket left05:05
← ricks_ left05:05
→ ricks_ joined05:05
← ricks_ left05:05
→ ricks_ joined05:05
← crose left05:06
← g00s left05:07
→ bket joined05:07
← nurdie_ left05:10
→ libertyprime joined05:11
← omnireq left05:18
→ omnireq joined05:18
→ Mo joined05:22
→ sauvin joined05:22
← Shentino_ left05:31
→ Shentino_ joined05:31
← zonixo left05:37
← gxt left05:37
→ nav2002 joined05:56
ricks_ → rick_polly05:58
← xelxebar_ left06:04
→ xelxebar joined06:04
← natechan left06:07
← thiago left06:10
← gpanders left06:16
→ g00s joined06:18
→ deltam joined06:18
← Wetmelon left06:21
← oatmealraisin left06:22
← ferdna left06:25
→ gloomy joined06:26
← licnep left06:29
← libertyprime left06:35
← Goplat left06:40
→ libertyprime joined06:42
→ Mattiaslndstrm joined06:45
← kleisli left06:47
← libertyprime left06:57
← Heirlung left07:00
→ Heirlung joined07:01
← g00s left07:03
← nav2002 left07:04
← bambanx left07:04
→ g00s joined07:05
← akemhp_ left07:07
→ akemhp_ joined07:08
→ leprechau joined07:09
→ nurdie joined07:10
→ SilentGhost joined07:12
→ kjartan joined07:12
← kjartan_ left07:12
← nurdie left07:15
← akemhp_ left07:17
→ akemhp joined07:21
→ duderonomy joined07:22
→ akemhp_ joined07:26
→ dartmouthed joined07:27
← nabil_ left07:28
→ nabil joined07:28
← gloomy left07:33
← cbreak left07:35
→ cbreak joined07:35
← bvdw left07:38
→ bvdw joined07:39
→ beastDivision joined07:39
→ clime1 joined07:42
← leprechau left07:45
→ gxt joined07:46
← YuGiOhJCJ left07:48
← clime1 left07:52
→ feriman joined07:56
→ hqdruxn08 joined08:03
← hqdruxn08 left08:03
→ hqdruxn08 joined08:04
← hqdruxn08__ left08:04
← LearnAllTheTime left08:14
→ gloomy joined08:15
← gloomy left08:26
← duderonomy left08:29
← roadie left08:30
→ leeN joined08:31
→ gloomy joined08:34
→ Tahvok joined08:43
← akemhp_ left08:47
→ Fernando-Basso joined08:48
← akemhp left08:48
→ akemhp joined08:48
→ akemhp_ joined08:48
← gloomy left08:55
→ oxymoron93 joined08:56
→ gloomy joined08:56
← gloomy left08:56
→ Wizek joined08:58
→ lacrymology joined09:01
→ dijitol joined09:03
← akemhp left09:04
← akemhp_ left09:04
→ akemhp joined09:04
→ akemhp_ joined09:05
← akemhp left09:06
→ akemhp joined09:06
← bitwinery left09:14
→ akem__ joined09:19
← akemhp_ left09:22
← akemhp left09:22
→ akemhp joined09:22
← Codaraxis_ left09:22
→ Codaraxis_ joined09:23
← steven__ left09:28
→ steven__ joined09:29
← bvdw left09:30
→ bvdw joined09:30
← oxymoron93 left09:32
→ ThiefMaster joined09:33
→ enoq joined09:34
← tryte_ left09:34
→ tryte joined09:36
→ mika joined09:36
→ gpanders joined09:36
← ThiefMaster left09:38
→ nika joined09:40
→ ThiefMaster joined09:40
← lmariscal left09:45
→ lmariscal joined09:46
← rick_polly left09:50
→ Learath2 joined09:50
← Codaraxis_ left09:52
→ Codaraxis_ joined09:52
→ xall joined09:53
→ ricks_ joined09:54
← Eryn_1983_FL left09:54
→ xall_ joined09:55
← xall left09:58
→ kimamb joined10:00
→ m0viefreak joined10:00
→ nioncode joined10:01
→ oxymoron93 joined10:04
→ zonixo joined10:04
→ theoceaniscool joined10:05
← zonixo left10:09
→ nabil_ joined10:09
← g00s left10:10
← nabil left10:12
→ royal_screwup21 joined10:14
→ Eryn_1983_FL joined10:14
← alexandre9099 left10:14
← xall_ left10:23
→ agowa338 joined10:24
← jstimm left10:25
← akem__ left10:27
← akemhp left10:28
← beastDivision left10:31
← caskd left10:31
→ dionysus69 joined10:31
→ caskd joined10:32
← SCHAPiE left10:34
→ RhineDevil joined10:35
RhineDevil How can I get remote.*.fetch from a file by using `git config --file`?10:36
→ remedan joined10:43
→ SCHAPiE joined10:44
← lacrymology left10:45
← escherial left10:47
→ escherial joined10:49
_ikke_ RhineDevil: Do you want fetch a specific setting from a specific file?10:52
→ akemhp joined10:58
← akemhp left10:58
→ akemhp joined10:59
← royal_screwup21 left11:02
RhineDevil _ikke_, I meant remote.*.url11:02
I want to get all remotes url11:02
_ikke_ but why --file?11:03
RhineDevil _ikke_, commodity11:03
_ikke_ git config --file <..> --get-regex remote\..*\.url11:03
(with the necessary quoting / escaping11:04
)11:04
→ AtumT joined11:05
→ nabil__ joined11:08
→ akemhp_ joined11:10
← nabil_ left11:10
→ nabil_ joined11:11
← akemhp left11:13
→ jstimm joined11:13
← nabil__ left11:14
→ nabil joined11:14
← oxymoron93 left11:16
← nabil_ left11:16
← akemhp_ left11:18
→ royal_screwup21 joined11:22
→ mArtale joined11:23
← dionysus69 left11:27
← learning1 left11:27
→ learning1 joined11:31
→ soju joined11:32
→ xall_ joined11:34
← dartmouthed left11:36
← mArtale left11:39
← xall_ left11:39
← soju left11:45
→ akemhp joined11:48
→ soju joined11:48
→ dionysus69 joined12:05
← tsujp left12:18
→ oxymoron93 joined12:19
← akemhp left12:21
→ CryptoDavid joined12:22
→ dartmouthed joined12:22
→ tsujp_ joined12:24
← royal_screwup21 left12:26
← n3wborn left12:28
→ VLetrmx joined12:28
VLetrmx Hi12:28
← dijitol left12:29
→ tsujp joined12:31
← leeN left12:31
← tsujp_ left12:32
VLetrmx nevermind fixed it12:33
_ikke_ You're welcome ;-)12:33
VLetrmx default advice colour is yellow, which means it's invisible on a light coloured term12:33
I don't know who came up with that as a default, but I don't think it's a sensible default really12:33
_ikke_ on a black background it makes a lot of sense12:34
there is more output in git that is yellow by default12:34
VLetrmx yeah but you shouldn't assume a black background12:34
← oxymoron93 left12:35
_ikke_ Anything that outputs colors has to assume some color, unless you restrict the output to a very small subset of colors (and even that might cause issues)12:35
But you can either at the terminal level, or in gits case, program level override the colors to make sense for you12:36
putty's default blue color is very hard to read on a black background, so I always change it12:36
And I guess not only for putty12:37
I override it for urxvt as well12:37
VLetrmx most of the other colours used are fine on both light and dark terms12:38
→ Nokurn joined12:39
→ zonixo joined12:40
→ gareppa joined12:43
← gareppa left12:44
→ akemhp joined12:49
← dionysus69 left12:51
→ alexandre9099 joined12:52
→ royal_screwup21 joined12:55
← zonixo left12:55
→ lucasb joined12:59
→ FernandoBasso joined13:02
← Fernando-Basso left13:04
→ gareppa joined13:10
← akemhp left13:10
→ akemhp joined13:12
← akemhp left13:14
← Phylock left13:15
← royal_screwup21 left13:24
→ igemnace joined13:28
← agowa338 left13:30
→ dijitol joined13:34
← gxt left13:38
← bvdw left13:38
→ bvdw joined13:39
← gareppa left13:39
→ crose joined13:54
← MACscr left13:54
← nika left13:59
→ yonder joined14:01
→ fuzzface joined14:04
← Mattiaslndstrm left14:11
→ Phylock joined14:24
← rustyshackleford left14:27
← fuzzface left14:34
← feriman left14:44
→ Wetmelon joined14:45
→ thebope joined14:47
← Inline left14:49
→ perrier-jouet joined14:51
→ natechan joined14:54
← justanotheruser left14:54
→ kp__ joined14:57
nikivi If I by accident deleted .git/index file14:58
is it okay?14:58
or I need to do something like reclone the repo14:58
→ agowa338 joined14:58
← crose left14:59
nikivi ok I `git reset --hard origin/master` and its back14:59
← kp__ left14:59
_ikke_ yeah, indeed15:00
just git reset woudl work15:00
would15:00
→ alfredb joined15:04
← Phylock left15:10
→ royal_screwup21 joined15:10
→ f1x joined15:16
→ n000g joined15:16
→ m3pow joined15:17
→ LimitlessGreen joined15:17
→ justanotheruser joined15:17
← RhineDevil left15:19
← thebope left15:22
→ Mattiaslndstrm joined15:23
→ thiago joined15:34
→ ferdna joined15:36
→ nightduck joined15:38
← alfredb left15:39
→ lupine joined15:39
← Mattiaslndstrm left15:40
→ Mattiaslndstrm joined15:43
→ nika joined15:46
→ Brainium joined15:47
← nika left15:51
→ Goplat joined15:52
→ zonixo joined15:54
→ freedom joined15:54
← zonixo left15:58
cbreak or git read-tree HEAD? :)16:00
→ sentriz joined16:04
← f1x left16:04
← Mattiaslndstrm left16:05
← Heirlung left16:06
→ Heirlung joined16:10
→ gareppa joined16:14
← m1dnight1 left16:15
→ crose joined16:17
→ m1dnight1 joined16:17
→ Dreadnaught joined16:19
→ duderonomy joined16:20
→ im0nde_ joined16:21
← Kulrak left16:23
→ nika joined16:23
← im0nde left16:23
← duderonomy left16:25
← nika left16:28
→ f1x joined16:29
← natechan left16:35
→ natechan joined16:37
→ Mattiaslndstrm joined16:38
→ thebope joined16:43
← thebope left16:47
← iam730 left16:48
← perrier-jouet left16:54
→ ExeciN joined16:56
← Mattiaslndstrm left16:58
→ durham joined16:59
← gareppa left16:59
→ nyxyn joined17:02
← ferdna left17:03
← nyxyn left17:05
← Codaraxis_ left17:07
→ Codaraxis_ joined17:07
→ LearnAllTheTime joined17:08
← LearnAllTheTime left17:08
← f1x left17:11
→ f1x joined17:13
→ gareppa joined17:13
→ clime1 joined17:15
→ thebope joined17:19
← natechan left17:19
→ awer joined17:20
awer hi, new to git. I cant update changes to a 'dev' branch. i switched branches 'git checkpout dev'17:21
then checked and looked good 'git branch -a'17:21
then 'git add .'17:21
'git commit -m 'first commit'17:21
and i get "On branch dev - Your branch is up to date with 'origin/dev' - nothing to commit, working tree clean '17:22
cbreak awer: pastebin the result of !lol17:22
gitinfo awer: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all17:23
awer when ilook on git hub i dont see the files17:23
→ multiproc joined17:23
awer cbreak: just trying to learn bro...17:23
cbreak yes17:23
and seeing the output of that will help me explain to you what is wrong17:24
I can't mind read17:24
awer cbreak: please clairfy your message17:24
cbreak awer: pastebin the result of !lol17:24
gitinfo awer: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all17:24
cbreak that means you have to copy the command17:24
awer !lol17:24
cbreak that the bot gave you17:24
git log --oneline --graph --decorate --all17:24
awer ah..17:25
cbreak and paste it into a gist17:25
or something similar17:25
seeing git status helps too17:25
awer https://paste.ee/p/ykfDX17:26
On branch dev17:27
cbreak it says indeed that your dev branch is in sync with origin/dev17:27
awer Your branch is up to date with 'origin/dev'.17:27
cbreak git remote -v will tell you where origin is17:27
probably points at the repo on github you mentioned17:27
awer yes it does17:27
cbreak that's where your dev branch should be17:27
git ls-remote origin should show that commit as being in dev17:28
← offby1 left17:28
awer it is there though17:28
cbreak e0c554617:28
→ natechan joined17:28
cbreak awer: here it is: https://github.com/sp00ks-git/hat/commit/e0c5546d89a05da5220937419440e4642a34a4f917:29
you seem to work as root... don't do that :D17:29
← clime1 left17:29
cbreak anyway, the commit is there17:29
awer https://paste.ee/p/2AHua17:29
this is where im wanting to see it - https://github.com/sp00ks-git/hat/tree/dev17:30
→ clime1 joined17:32
awer cbreak: sometimes i do sometimes nto depends what im doing17:36
cbreak: so why does it not update there?17:37
cbreak did you push?17:41
awer yes17:42
'git push .' -> Everything up-to-date17:42
cbreak not .17:43
just git push17:43
awer also tried with --all17:43
cbreak anyway, it says that branch is at the commit you want to17:43
so it worked17:43
and you have what you want17:43
awer i dont have what i want17:43
i dont see it on the gui17:43
thats the problem17:43
cbreak it is there17:43
"Latest commit e0c5546 7 days ago "17:44
that's what it says17:44
awer exactly17:44
i updated 5 minutes ago17:44
and have changes from 5 minutes ago17:44
cbreak the branch you want is from back then17:44
awer i want that branch that was last updated 7 days ago to be updated again now with my new changes17:45
cbreak it is already updated with everything on dev17:45
→ duderonomy joined17:45
cbreak if you made a commit recently17:45
then it's not on dev17:45
e0c5546d89a05da5220937419440e4642a34a4f9 is from last week17:45
and that's what dev is on17:45
← agowa338 left17:46
← ExeciN left17:46
cbreak awer: take a look again at what you posted in your lol output17:46
it shows that you made more commits after the commit on dev17:47
awer e0c5546 (HEAD -> dev, origin/dev) re-design17:47
cbreak yes.17:47
re-design is from 7 days ago17:47
awer that was when i managed t get it to work last time17:47
→ rindolf joined17:47
cbreak that is the newest commit17:47
you did not make any commits on dev since last week17:47
awer yes correct17:48
rindolf hi all, where can i find esr?17:48
cbreak so if you are looking for new commits, they should be on master17:48
_ikke_ https://pkgs.alpinelinux.org/packages?name=esr&branch=edge ?17:48
ugh17:48
sorry17:48
j416 rindolf: what is esr?17:48
awer but now, i have made changes on master and want them on dev17:48
i guess thats the issue?17:48
cbreak you can merge them17:48
it'll be fast-forward17:48
awer right17:48
cbreak git merge master17:48
rindolf j416: https://en.wikipedia.org/wiki/Eric_S._Raymond17:49
j416 I see17:49
hey, you found him.17:49
gj17:49
rindolf j416: heh17:49
j416++17:49
j416 \^^/17:50
awer cbreak: thanks bro17:51
→ Mattiaslndstrm joined17:52
← thebope left17:52
← Brainium left17:56
← gareppa left17:59
→ ricks__ joined18:00
← thiago left18:01
→ nika joined18:01
← nika left18:01
← durham left18:02
→ durham joined18:02
← ricks_ left18:02
← staafl_r19 left18:11
→ oatmealraisin joined18:13
← Cabanossi left18:15
→ mischief joined18:16
→ Cabanossi joined18:19
← Heirlung left18:20
← CryptoDavid left18:23
→ Heirlung joined18:24
← natechan left18:26
→ orbyt_ joined18:26
→ fuzzface joined18:26
← fuzzface left18:40
→ akemhp joined18:43
← ricks__ left18:44
→ gareppa joined18:46
← gareppa left18:55
→ rustyshackleford joined19:00
→ magic_ninja_work joined19:08
→ Brainium joined19:09
← jelmer left19:10
→ akemhp_ joined19:13
→ nowhere_man joined19:14
→ jelmer joined19:14
→ natechan joined19:15
← akemhp left19:15
← waveclaw left19:19
← mrCyborg left19:21
→ akem__ joined19:21
← dijitol left19:23
← akemhp_ left19:24
→ ricks_ joined19:24
→ dijitol joined19:25
→ st-gourichon-fid joined19:30
← natechan left19:32
→ gloomy joined19:36
← bvdw left19:38
→ bvdw joined19:39
→ thiago joined19:39
→ waveclaw joined19:46
← clime1 left19:46
← kimamb left19:50
← jstimm left19:51
→ akemhp_ joined19:57
← Codaraxis_ left19:59
→ Codaraxis_ joined20:00
← akem__ left20:00
← gloomy left20:01
→ greatgatsby joined20:02
← multiproc left20:02
→ LimitlessGreen2 joined20:02
← LimitlessGreen left20:03
→ perrier-jouet joined20:05
→ MACscr joined20:07
← thiago left20:15
→ thiago joined20:15
→ de-vri-es joined20:15
→ feriman joined20:18
→ clime1 joined20:20
→ roadie joined20:21
← Codaraxis_ left20:27
← kreyren left20:27
→ Codaraxis_ joined20:27
→ crispydrone joined20:28
crispydrone Hi, can someone explain this behavior to me?20:29
mkdir worktree20:29
why does "git worktree list" list an incorrect worktree20:30
← theoceaniscool left20:30
→ kreyren joined20:30
orbyt_ crispydrone You're creating a directory called "worktree"?20:34
What are you expecting `git worktree list` to show?20:34
crispydrone i would expect it to show nothing, or to show worktree20:35
And yeah, I create a directory called worktree20:35
orbyt_ What is the output?20:35
crispydrone the exact output is `<path>/git_dir 0000000 [master]20:36
where path is wherever i put `git_dir`20:36
orbyt_ That output sounds normal20:38
crispydrone why? Consider the output of `git status` which then says it isn't a worktree. That seems confusing to me20:38
→ beastDivision joined20:39
→ KeyJoo joined20:40
→ thebope joined20:41
← beastDivision left20:42
orbyt_ crispydrone What does `git status` say?20:44
crispydrone `fatal: this operation must be run in a work tree`, which is expected. The confusing thing to me is just that running `git worktree list` in the same location outputs the current directory20:45
← kreyren left20:48
→ kreyren joined20:48
→ staafl_r19 joined20:50
← freedom left20:51
→ Inline joined20:53
← gordonfish left20:53
← royal_screwup21 left20:55
→ leprechau joined20:55
→ cd joined20:59
→ bitwinery joined21:00
← BonusPlay left21:00
→ BonusPlay joined21:00
→ wildlander joined21:00
← bitwinery left21:02
→ bitwinery joined21:02
← m3pow left21:03
← khisanth_ left21:18
← crispydrone left21:20
→ SupaHam joined21:23
← clime1 left21:24
← enoq left21:25
→ g00s joined21:27
← greatgatsby left21:34
← thiago left21:37
→ khisanth_ joined21:43
→ kjartan_ joined21:44
← kjartan left21:45
→ thiago joined21:47
snappy note to self: don't name branches as filenames contained in a tree, makes it difficult to do a git checkout to the branch.21:51
BtbN That's why switch is a thing now.21:51
← Guest81850 left21:54
snappy ahh that's actually a good point.21:54
cbreak snappy: tip: --21:54
snappy cbreak: so that's great if you want to specify a file instead of a branch, but not the other way around?21:55
cbreak git checkout x --21:55
git checkout -- x21:55
→ SuperL4g joined21:55
snappy ohhh i se21:55
i see21:55
got it.21:55
→ dviola joined21:55
snappy nice, i don't think i'll switch to switch, so just need to be on the right side of -- :)21:55
cbreak git checkout ./x21:55
git checkout refs/heads/x21:55
snappy (or do i mean the left)21:55
← SuperLag left21:57
← feriman left21:57
→ SuperLag joined22:00
← SuperL4g left22:01
← thebope left22:02
← magic_ninja_work left22:14
→ macaronus joined22:28
→ LimitlessGreen26 joined22:29
← LimitlessGreen2 left22:30
← duderonomy left22:32
→ Newami joined22:33
← Newami left22:33
→ royal_screwup21 joined22:34
← royal_screwup21 left22:35
→ thomasross joined22:36
→ duderonomy joined22:36
→ thebope joined22:41
← gpanders left22:45
→ gpanders joined22:45
→ skered joined22:46
← rindolf left22:55
← dijitol left22:56
← cbreak left22:58
→ cbreak joined22:59
← thebope left23:03
→ Case_Of joined23:04
→ rafasc joined23:09
← dviola left23:20
← ricks_ left23:21
→ ricks_ joined23:22
← Wizek left23:27
→ bambanx joined23:29
→ thebope joined23:32
→ n3wborn joined23:32
← thebope left23:32
→ thebope joined23:33
← KeyJoo left23:42
← wildlander left23:43
← m0viefreak left23:48
← lucasb left23:48
→ Ignacy joined23:50
← Heirlung left23:51
skered This might bleed into more of an ssh question but is it possible to limit an ssh to a given git repo? I know you can apply ForceCommands to given ssh keys but don't know if that helps in this case.23:52
I'd rather not create a new user for this.23:52
→ dviola joined23:53
Ignacy What do you mean by this skered?23:55
skered Sorry ssh-key.23:55
→ kleisli joined23:55
skered So you can access a git repo via ssh://. Can you control auth via ssh-keys.23:55
I have a user where I'm using this and this user has multiple git repos behind their user account.23:56
Ignacy i'm not familiar enough with git23:56
hmm23:56
and you want to limit privilege of certain keys23:56
skered Yeah.23:56
rafasc Have you considered using gitolite?23:57
skered I just started reading about that.23:57
→ kleisli_ joined23:58
← ricks_ left23:59

Logs Search ←Prev date Next date→ Channels Documentation