IRCloggy #git 2018-09-08

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.

2018-09-08

netj left00:00
Regon left00:00
netj joined00:00
aLeSD left00:02
xoxo left00:03
notnull left00:03
aLeSD joined00:03
notnull joined00:03
notnull left00:03
notnull joined00:03
TinkerT left00:05
wpcarro joined00:10
cagomez left00:12
cagomez joined00:13
wpcarro left00:15
cagomez left00:17
publio left00:20
qpdb joined00:21
Essadon joined00:23
Essadon left00:24
fstd_ joined00:24
fstd left00:27
fstd_fstd00:27
cagomez joined00:27
Achylles left00:31
deehuck joined00:33
cagomez left00:33
yyy- left00:34
Arcatech left00:35
deehuck left00:38
Sasazuka left00:38
graphene left00:47
graphene joined00:47
SirFunk joined00:49
applecrumble joined00:53
texinwien left00:54
ilmostro left01:04
ilmostro joined01:06
zalt_ joined01:06
graphene left01:07
ToBeFree joined01:07
ToBeFree left01:07
ToBeFree joined01:07
gitinfo set mode: +v01:07
graphene joined01:08
zalt left01:08
finalbeta joined01:08
ToBeFree left01:09
Mattiaslndstrm joined01:10
Mattiasl_ left01:11
xaa__ left01:13
thiago joined01:13
njbair left01:14
njbair joined01:14
TheRuckus left01:15
tomfarr joined01:16
F0rTex left01:17
lanlink joined01:18
F0rTex joined01:18
profmac left01:23
supernovah joined01:24
TinkerT joined01:37
shicks2525 joined01:40
sentriz left01:41
sentriz joined01:42
veegee left01:43
jim hi, I need to do it again... how do I tell git I want a local branch to track a remote one?01:44
inovas left01:48
rafasc jim: git branch --set-upstream-to=...01:49
inovas joined01:50
rafasc and be sure you give the remote tracking branch.01:50
git checkout master; git branch --set-upstream-to=origin/master01:50
TinkerT left01:50
LiftLeft2 joined01:51
LiftLeft left01:53
jim so, git checkout master ; git branch --set-upstream-to=origin/master?01:56
Mattiaslndstrm left01:57
Goplat joined01:58
chat left02:00
chat joined02:01
profmac joined02:09
fission6 joined02:10
venb joined02:11
njbair left02:12
njbair joined02:12
jelmer_ joined02:13
jelmer_ left02:31
jelmer_ joined02:31
jj15 left02:35
jj15 joined02:36
applecrumble left02:37
AtumT left02:37
rafasc jim: yep, that is basically copy paste from my line above :)02:42
fission6 left02:42
jj15 left02:43
thiago left02:45
Silenced joined02:48
LiftLeft2LiftLeft02:52
lagothrix left02:53
lagothrix joined02:53
duderonomy left02:53
darkbit left02:53
Guest47855 joined02:55
Silenced left02:58
TinkerT joined02:58
kfoonamalik joined03:01
orbyt_ left03:04
plos joined03:07
Guest18 left03:10
tribrid joined03:10
dre_ left03:12
TinkerT left03:12
MACscr left03:13
deehuck joined03:16
orbyt_ joined03:20
deehuck left03:20
a3Dman left03:21
PLLunlock left03:21
PLLunlock joined03:22
texinwien joined03:26
Garen left03:27
Garen joined03:27
a3Dman joined03:28
zsocw joined03:30
zsoc left03:30
kartch_finnix joined03:30
felixsanz joined03:32
felixsanz left03:32
motoko-chan joined03:33
felixsanz joined03:33
felixsanz left03:33
dreiss joined03:35
texinwien left03:35
jim rafasc, thanks for that, I ended up looking at the book so I make sure to understand its surroundings03:38
felixsanz joined03:39
felixsanz left03:39
jim glad you told me, it clued me into where to look03:39
rafasc no worries. :)03:39
m0viefreak left03:39
felixsanz joined03:39
rafasc keep in mind that the option to do the same thing on push is named slightly different.03:39
felixsanz left03:39
sylario left03:40
rafasc -u or --set-upstream03:40
stoopkid left03:41
rafasc and branch has a now deprecated --set-upstream.03:41
jim: so just keep in mind that :P03:42
felixsanz joined03:42
felixsanz left03:42
felixsanz joined03:44
felixsanz left03:44
timj1 joined03:44
profmac left03:44
felixsanz joined03:45
felixsanz left03:45
felixsanz joined03:46
felixsanz left03:46
felixsanz joined03:46
felixsanz left03:47
timj left03:47
felixsanz joined03:47
felixsanz left03:47
stoopkid joined03:48
ilmostro left03:53
ilmostro joined03:55
dreiss left03:55
wpcarro joined03:55
TinkerT joined03:55
profmac joined03:57
Arcatech joined03:58
wpcarro left04:00
mrCyborg|zzz left04:05
mrCyborg|zzz joined04:05
st-gourichon-f left04:05
new1__ joined04:06
Garen left04:07
TinkerT left04:08
profmac left04:09
return1_ left04:09
new1__ left04:10
return joined04:11
dreiss joined04:14
hays_hays04:15
kfoonamalik left04:19
duderonomy joined04:19
tribrid left04:20
PLLunlock left04:23
PLLunlock joined04:23
zsocw left04:25
duderonomy left04:26
jim so --set-upstream-to=... in git-branch is not deprecated?04:26
dc13ff joined04:27
piggah joined04:29
wreed left04:33
rafasc jim, correct. And is now the recommended way to set up tracking for existing branches.04:34
wreed joined04:38
dreiss left04:42
duderonomy joined04:47
jkyle left04:47
mikemcowie joined04:47
tribrid joined04:47
sword left04:49
craftyguy Is there a way to basically "git diff sha1..sha2" and then blame the lines in the diff?04:49
tvw joined04:50
finalbeta left04:50
wpcarro joined04:50
dendazen_ joined04:50
finalbeta joined04:50
duderonomy left04:51
sword joined04:52
jungsubk joined04:53
TinkerT joined04:54
kartch_finnix left04:55
wpcarro left04:55
jungsubk left05:00
profmac joined05:01
Silenced joined05:01
kfoonamalik joined05:01
rafasc what would expect from such command?05:01
pks_ joined05:02
rafasc whatever shows in the diff, will be blamed to the author of sha2...05:02
pks left05:02
pks_pks05:02
RoriconKnight left05:03
craftyguy rafasc: not when the diff is over a range of commits, right?05:03
RoriconKnight joined05:03
Arcatech left05:04
RoriconKnight left05:05
mikemcowie left05:06
rafasc why not? you're just comparing against a different base, but sha2 is responsible for the changes.05:06
mikemcowie joined05:07
mikemcowie left05:07
craftyguy rafasc: oh I see what you mean. yea, I guess I'd like to be able to display the blame right along with the diff (limit blame to *only* lines in diff)05:08
sauvin joined05:08
rafasc https://github.com/Osse/git-scripts/blob/master/git-blamediff05:08
osse: you're around?05:09
craftyguy rafasc: interesting the name seems to suggest it does what I want :P05:09
I'll give it a try05:09
rafasc a regular user has built a tool that seems to do that.05:09
never tried it though.05:10
craftyguy sure. thanks for finding it, I failed :)05:10
rafasc I didn't look for it. I just knew it existed cause osse is a regular around here :)05:12
cfoch joined05:13
susame joined05:13
duderonomy joined05:13
craftyguy ah, well you searched your brain or something for it :P05:13
I searched the internets, but I probably was not using the right terms05:14
rafasc for the sake of interested, I just tried and it outputs garbage out.05:15
tribrid left05:15
craftyguy boo05:16
rafasc or should I say, I can't interpret whatever it is outputting.05:17
seems to work on the simpler commits though..05:17
boombatower left05:18
Silenced left05:20
craftyguy I can't try it now, but will look at it more later when I have the time. Maybe the fix is something I can help with05:20
rafasc I think you wouldn't be the first. :)05:21
PLLunlock left05:24
ferdna left05:25
rafasc craftyguy: https://github.com/eantoranz/difflame05:28
finalbeta left05:29
ilmostro left05:30
finalbeta joined05:30
rafasc But I often have more luck using git log -S/-G/-L05:30
PLLunlock joined05:31
ilmostro joined05:32
craftyguy rafasc: wow, that looks very promising05:32
rafasc and add -p, if you want to actually look at the diffs.05:33
BPL left05:35
kfoonamalik left05:36
mikemcowie joined05:36
rafasc craftyguy: what are you looking for?05:37
git bisect can also be an option if you can test for the presence of what are you trying to find.05:38
apxm joined05:39
craftyguy I work with a project that sees patch series merged regularly. when things break, sometimes I can spot candidates in the diff, but then I have to go blame the file, find the line, etc to get the commit. Sometimes it is multiple commits.05:40
so I end up doing "git diff", look, "git blame <interesting file>", look, "git diff", look, "git blame <another interesting file>" , etc05:40
rafasc are you aware of git bisect?05:41
craftyguy yes I am. I use that too05:41
rafasc ok, just checking.05:41
craftyguy but that is more useful if I don't have a clue about what broke05:41
rafasc sometimes it's faster than looking manually.05:43
especially if you use bisect run.05:43
dendazen_ left05:44
rafasc but yeah, depending on the issue it might be easier to just look at the logs.05:44
jkyle joined05:45
rafasc Sometimes I do both, continue searching while it runs.05:46
craftyguy yea same here05:46
tristanp left05:49
freimatz joined05:50
netj left05:50
netj joined05:51
RoriconKnight joined05:53
pawle joined05:53
ocds joined05:54
junaidnaseer2 joined05:58
ocds left05:59
inovas left06:00
prakashdanish joined06:01
pawle left06:01
inovas joined06:01
ocds joined06:03
keepLearning512 joined06:04
Toadisattva left06:06
duderonomy left06:11
tombusby left06:11
tombusby joined06:12
tombusby left06:13
tombusby joined06:13
duderonomy joined06:13
tribrid joined06:13
motoko-chan left06:14
madewokherd left06:14
neure joined06:17
stoopkid left06:21
MACscr joined06:21
navidr left06:24
dreiss joined06:25
duderonomy left06:26
lightstalker joined06:26
tvw left06:28
duderonomy joined06:29
tribrid left06:31
susame left06:33
dreiss left06:34
Bobguy left06:35
lanlink left06:35
duderonomy left06:37
wpcarro joined06:39
themill joined06:42
wpcarro left06:43
Hounddog left06:47
Hounddog joined06:47
duderonomy joined06:48
dreiss joined06:50
tristanp joined06:50
susame joined06:52
tristanp left06:55
duderonomy left06:56
apxm left06:56
duderonomy joined06:58
Envil joined07:01
susame left07:01
prakashdanish left07:02
teodorg joined07:03
schleppel joined07:04
PLLunlock left07:07
plos left07:08
plos joined07:08
dreiss left07:10
lordjancso joined07:11
zegerjan joined07:12
joelroa joined07:15
duderonomy left07:15
return left07:19
return joined07:19
libregeekingkid joined07:19
duderonomy joined07:21
lordjancso left07:22
martinus__ joined07:24
plexigras joined07:27
duderonomy left07:28
duderonomy joined07:29
nBurn joined07:31
Mat001 left07:31
wpcarro joined07:34
dc13ff left07:37
wpcarro left07:38
Goplat left07:39
duderonomy left07:42
zegerjan left07:43
duderonomy joined07:46
felixsanz joined07:50
felixsanz left07:50
felixsanz joined07:52
felixsanz left07:52
duderonomy left07:52
felixsanz joined07:53
felixsanz left07:53
felixsanz joined07:54
felixsanz left07:54
duderonomy joined07:55
felixsanz joined07:55
felixsanz left07:56
felixsanz joined07:56
felixsanz left07:56
leeN joined07:59
dege joined08:00
orbyt_ left08:00
jkyle left08:00
cfoch left08:02
mikemcowie left08:02
dege left08:05
kes joined08:07
freimatz left08:10
chat left08:11
duderonomy left08:14
beerdrop left08:18
GreenJello left08:18
GreenJello joined08:20
Carlsberg joined08:20
chat joined08:22
zsocw joined08:23
tvw joined08:26
GreenJello left08:26
GreenJello joined08:28
soee joined08:30
keepLearning512 left08:32
beerdrop joined08:32
czart joined08:33
njbair left08:34
njbair joined08:34
okovko joined08:34
K1rk joined08:36
joelroa left08:37
Guest89225 left08:40
paskl_ joined08:40
sourcream joined08:42
joelroa joined08:42
rafasc left08:44
tvw left08:44
Mrdoor joined08:45
paskl_ left08:45
tvw joined08:47
andai left08:47
BallChang-CN_ joined08:48
dsdeiz left08:48
Guest89225 joined08:50
paskl joined08:50
BallChang-CN left08:51
Quetzal2 joined08:52
PedolordIV joined08:54
PedolordIV left08:55
PedolordIV joined08:55
RoriconKnight left08:55
EbbaReiger joined08:55
Carlsberg left08:57
graphene left09:00
graphene joined09:00
Raimondii joined09:01
Raimondi left09:03
RaimondiiRaimondi09:03
tribrid joined09:04
finalbeta left09:05
finalbeta joined09:05
libregeekingkid left09:06
Silenced joined09:06
EbbaReiger left09:08
SteffanW joined09:09
mikecmpbll joined09:11
return left09:12
return joined09:13
pfleck joined09:14
meek joined09:15
zegerjan joined09:15
zegerjan left09:16
zegerjan joined09:16
xrt joined09:16
soee_ joined09:17
meek left09:18
honnda324 joined09:18
chris349 left09:19
texinwien joined09:19
soee left09:20
honnda324 left09:20
catsup left09:20
catsup joined09:20
catsup left09:21
libregeekingkid joined09:22
catsup joined09:22
SteffanW left09:22
chris349 joined09:23
joelroa left09:24
njbair left09:24
estodiMania joined09:24
njbair joined09:25
return left09:25
return joined09:25
zegerjan left09:27
libregeekingkid left09:27
zegerjan joined09:28
libregeekingkid joined09:29
Arcatech joined09:32
estodiMania left09:33
vera_zhang left09:33
return left09:36
pfleck left09:36
return joined09:37
return left09:38
return joined09:38
leeN left09:38
return left09:39
return joined09:39
tvw left09:44
plos left09:51
ilmostro left09:51
ilmostro joined09:53
zegerjan left09:54
gxt left09:56
gxt joined09:59
Arcatech left09:59
magellanicloud joined10:00
lankanmon left10:01
zegerjan joined10:02
Regon joined10:05
Silenced left10:10
doev joined10:10
inovas left10:11
inovas joined10:13
xaa__ joined10:15
wpcarro joined10:16
tribrid left10:21
sourcream left10:23
xrt left10:23
wpcarro left10:24
freimatz joined10:25
libregeekingkid left10:25
fatalhalt left10:36
tarkus joined10:39
yyy- joined10:41
okovko after git rebase HEAD~2 HEAD -i, and i edit HEAD~1, how can i git checkout HEAD some_file?10:46
when i type git log after stopping at HEAD~1, HEAD now refers to what was HEAD~110:46
oprypin okovko, HEAD is where you are at right now10:47
so it's obvious why it refers to... where you are right now10:47
grawity you have to refer to the branch by name10:47
before starting the rebase, HEAD probably pointed to the tip of master10:47
libregeekingkid joined10:47
grawity or something like that10:48
so `git checkout master some_file` would do the job10:48
okovko ah okay, thanks, so HEAD doesn't always point to the tip of the branch?10:48
grawity no10:49
HEAD points to the thing you currently have checked out10:49
okovko woops, that was a bad misunderstanding10:49
thanks for clarifying10:49
grawity mid-rebase, when you're editing some commit, HEAD points to that commit -- because that's what you have checked out10:49
okovko but let's say i have some other commit i need to refer to that isn't the tip of master10:50
it doesn't show up in git log anymore, so how could i refer to that?10:50
grawity the same way as always really10:50
it doesn't show up in git log, because git log starts at HEAD10:50
but the commit is still in master10:50
so you can find its commit ID from `git log master`10:50
or use master~1 etc. if that's what you need10:51
okovko thank you for clearing this up for me!10:51
Ekaterina joined10:51
texinwien left10:51
sentriz left10:52
njbair left10:52
njbair joined10:53
Ekaterina left10:55
tvw joined10:56
Ekaterina joined10:56
lankanmon joined10:56
nikio_ joined10:57
z|bandito left10:57
okovko grawity: if you still have a minute, when i performed the steps i got a merge conflict at the end, even though everything was performed within one branch. i'm not really understanding what is being merged and why there is a conflict. basically, i want to transfer a hunk from a commit to its parent, and i'm not expecting a merge conflict11:00
borkr joined11:01
staafl_ joined11:02
AtumT joined11:03
m0viefreak joined11:04
grawity sorry, I don't really have any idea about rebasing11:07
the full log of your terminal (!repro) would be useful in general though11:07
gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see11:07
okovko sure, one sec11:07
topdownjimmy left11:08
njbair left11:09
Ekaterina left11:09
topdownjimmy joined11:09
tvw left11:10
njbair joined11:10
a3Dman left11:11
pfleck joined11:12
j416 if you are right after the rebase, ORIG_HEAD will point to what HEAD was at before the rebase.11:14
you can also find it in the reflog.11:14
z|bandito joined11:14
a3Dman joined11:15
j416 you can use that to compare the state or log before/after11:15
okovko j416 does that work during the rebase, or only right after?11:18
j416 after.11:18
maybe during11:18
not sure11:18
okovko i'll give that a try in a sec11:18
j416 never tried, never had a use for it11:18
okovko i finished my log and i'm posting it in a sec11:18
j416 you can use the branch name during the rebase11:18
libregeekingkid left11:21
okovko okay, this is quite ugly https://gist.github.com/okovko/90df91be0d0e085b0e43f0343c83185211:23
this is a download link for the text file with the contents of my terminal output http://termbin.com/005v if that's any better11:24
neure left11:25
okovko i'll try just copy pasting it by highlighting in my terminal.. i tried using xclip to put the file the script command generated into my clipboard and pasting that11:26
Harias joined11:26
neure joined11:27
okovko grawity okay, here is a clean gist https://gist.github.com/okovko/90df91be0d0e085b0e43f0343c831852, if you still have a sec11:30
SteffanW joined11:30
okovko it would be really crisp if i could generate a log using script that isn't full of creepy characters, because it shows the part of the git interface that's in the editor (for example right after git rebase -i)11:31
j416 asciinema maybe11:32
libregeekingkid joined11:32
dpyro left11:34
oprypin okovko, what's really creepy is your shell prompt but w/e11:34
okovko it's just oh-my-zsh :P11:34
dpyro joined11:34
dpyro left11:35
okovko i disabled my little extension that shows the vi mode my shell is in to make it a little less ugly ^^11:35
oprypin i think the most important thing for readability is to never change the horizontal position of the command input11:36
freimatz left11:36
oprypin 2nd most important is to never change the delimiter that indicates the start11:36
of the command input11:36
this just murders those points11:36
jnavila joined11:37
okovko oprypin you're right, i'll figure out how to toggle it in zsh and make it the bare minimum for the next time i make a terminal history gist11:37
DusteD joined11:38
andrewm87 joined11:39
yyy-yyy11:45
jnavila left11:46
zsocw left11:49
Essadon joined11:50
okovko oprypin i updated the gist so it's legible like you requested, now https://gist.github.com/okovko/90df91be0d0e085b0e43f0343c83185211:50
to reiterate the question, it's that i'm unsure why there is a merge conflict at the end and if anyone can clarify that for me it would help out a lot. googling for this was not successful11:51
andrewm87 left11:53
soee_ left11:53
soee joined11:53
nbunjeva3 joined11:53
TheRuckus joined11:54
magellanicloud left11:55
graphene left11:56
nbunjeva1 left11:56
sunri5e joined11:57
graphene joined11:57
felixsanz joined11:58
felixsanz left11:58
felixsanz joined11:59
felixsanz left11:59
pfleck left12:00
felixsanz joined12:00
felixsanz left12:00
felixsanz joined12:02
felixsanz left12:02
cybrNaut joined12:03
okovko i actually did find a resource that answers my question in an obscure stack overflow answer after googling a lot of variations, thanks guys, here it is if anyone is curious https://stackoverflow.com/questions/45059039/how-do-i-move-partial-changes-hunks-between-commits12:03
turns out that i need to edit both the commit that i want to move the hunk to, and also remove that hunk from the commit that introduced it prior to the rebase12:04
felixsanz joined12:04
felixsanz left12:04
Harias left12:04
oprypin i've never used `git rebase` with two positional arguments, so i'm inclined to guess that there's a better way12:05
felixsanz joined12:05
felixsanz left12:05
felixsanz joined12:06
felixsanz left12:06
felixsanz joined12:06
felixsanz left12:06
okovko oprypin i didn't set an upstream so i had to be explicit, but it's just the default behavior you'd expect with git rebase -i12:07
czart left12:07
okovko i'm starting to wish git had a regex cli interface instead of making me pop open vim every time12:08
zsoc joined12:08
zsoc left12:08
zsoc joined12:08
okovko like regex option for patch instead of selecting "e"12:08
manually editing patch files is a drag..12:08
j416 btw ORIG_HEAD did the trick during rebase, it's nicer than having to use branch~#, thanks12:12
libregeekingkid left12:19
zegerjan left12:20
zsoc left12:23
PedolordIV left12:26
PedolordIV joined12:26
g00s left12:26
govg left12:27
g00s joined12:27
okovko oprypin looks like the optimal approach instead of git rebase is to use git format-patch, because then you can apply that patch to all the branches you potentially invalidated12:28
man it seemed like a trivial thing to do, to clean up local commits before pushing by moving some hunks around, but performing this is a huge drag12:29
zegerjan joined12:30
okovko i wonder how i could get started writing a git extension to do this elegantly?12:30
piggah left12:32
polyzen joined12:37
okovko left12:50
ocds left12:51
negaduck left12:52
tristanp joined12:53
madewokherd joined12:55
okovko joined12:56
st-gourichon-fid joined12:56
tristanp left12:57
zegerjan left12:58
dre_ joined12:59
negaduck joined12:59
osse joined13:01
danielh1234 joined13:12
j416 okovko: good to know!13:15
ty13:15
ocds joined13:16
j416 okovko: you don't need format-patch to apply a patch in the same repo. Use cherry-pick instead.13:17
okovko j416 i didn't look into detail into that method but i think the idea was that if you want to move hunks between commits A and Z, you can format a patch from A to Z then apply it as an alternative to git rebase -i --rebase-merges13:18
but then you have to manually edit the patch file which isn't particularly appealing either13:19
i'm not sure how cherry pick operates when it comes to commit ranges13:19
is that another potential alternative?13:19
j416 man git-cherry-pick look for -p13:21
gitinfo the git-cherry-pick manpage is available at https://gitirc.eu/git-cherry-pick.html13:21
j416 hm maybe it doesn't have patch mode13:21
yo can cherry-pick without committing and add -p as needed13:22
okovko sounds even more painful than rebase or patch13:24
ocds left13:25
nikio_ left13:27
Mat001 joined13:28
chris349 left13:33
prakashdanish joined13:33
avar joined13:35
avar left13:35
avar joined13:35
dre_ left13:35
SteffanW left13:36
nbunjeva3 left13:37
Darren joined13:38
DarrenGuest5647313:38
j416 ¯\_(ツ)_/¯13:40
nuc left13:42
atlas_ joined13:43
nuc joined13:44
ToBeFree joined13:44
ToBeFree left13:44
ToBeFree joined13:44
gitinfo set mode: +v13:45
chris349 joined13:47
Mattiaslndstrm joined13:48
royal_screwup21 anyone here have experience with golang + godep? I'm importing a local packages in my .go file like so: Import "greet" . I ran godep save ./... and I'm getting this error: https://thepasteb.in/p/98hRXqV7kz2ck13:49
PedolordIV left13:50
zmt01 joined13:50
ferdna joined13:50
Guest56473 left13:53
finalbeta left13:55
xaa__ left13:55
finalbeta joined13:55
xaa__ joined13:55
royal_screwup21 anyway, fixed it. Apparently godep can't trace local dependency if they aren't version controlled13:56
opalepatrick joined14:06
xaa__xaa14:06
royal_screwup21 what does this mean: "If you include the repository URL in the package's import path, go get will fetch, build, and install it automatically. Eg: go get github.com/<user>/mypackage" Does this mean that if you want to go get a package, that package HAS to be a github.com clone?14:06
opalepatrick left14:07
lomex joined14:08
graphene left14:08
graphene joined14:09
canton7 royal_screwup21, you'll probably get better answers in a go channel, not a git channel14:10
since these are go questions14:10
royal_screwup21 ah yup,sorry about that, the go-nuts channels seems to super inactive today :(14:10
canton7 yeah, things tend to be quieter on IRC at weekends, since everyone is at home and away from their computers14:11
upperdeck joined14:12
stoopkid joined14:13
unreal left14:18
DusteD left14:20
DusteD joined14:20
lankanmon left14:23
czart joined14:23
Silenced joined14:23
lankanmon joined14:24
mud joined14:25
xtungvu90 joined14:28
zegerjan joined14:30
zegerjan left14:30
zegerjan joined14:30
dc13ff joined14:37
ShekharReddy joined14:38
ilmostro left14:40
ilmostro joined14:41
prakashdanish left14:42
notnull left14:43
notnull joined14:44
notnull left14:44
notnull joined14:44
Darren joined14:44
DarrenGuest6531214:44
mud left14:45
wreed left14:46
ilmostro left14:46
ilmostro joined14:49
zegerjan left14:51
tristanp joined14:53
tomfarr left14:54
zegerjan joined14:57
tristanp left14:58
junaidnaseer2 left15:01
opalepatrick joined15:01
doev left15:02
kfoonamalik joined15:04
lanlink joined15:05
opalepatrick left15:07
lomex left15:08
Guest65312 left15:10
RuckusBringer joined15:17
zegerjan left15:18
borkr left15:19
TheRuckus left15:20
dsdeiz joined15:20
dsdeiz left15:20
dsdeiz joined15:20
tomfarr joined15:22
ajbura joined15:23
ajbura` joined15:23
ajbura left15:24
ajbura`ajbura15:24
pfleck joined15:30
applecrumble joined15:32
BallChang-CN_ left15:32
profmac left15:32
BallChang-CN joined15:32
DusteD left15:34
BallChang-CN left15:37
BallChang-CN joined15:37
Bobdude joined15:39
BallChang-CN left15:42
pfleck left15:42
darkbit joined15:42
BallChang-CN joined15:42
darkbit left15:43
darkbit joined15:44
ajbura left15:44
mofai left15:46
BallChang-CN left15:47
BallChang-CN joined15:47
duderonomy joined15:49
ToBeFree left15:50
zmt00 joined15:56
zmt01 left16:00
DusteD joined16:01
duderonomy left16:02
BPL joined16:02
BPL My factory local branch is tracking origin/factory and it's pointing out to the same commit than remote upstream. It says it's "78 ahead 30 behind", I understand this message refers it's N commits ahead from the remote branch is tracking. Anyway, my question being, how do i "sync" local and tracked branch with upstream? :/16:05
j416 BPL: rebase, merge, or reset16:07
duderonomy joined16:08
joelroa joined16:08
Mattiaslndstrm left16:13
BPL j416: could you please be more specific? I'm a little bit lost here, I've made a git rebase --abort and after waiting a bit the gui i'm using refreshed and now is telling me Pull(30) and Push(78). If I try to push it'll tell me "hint: Updates were rejected because the tip of your current branch is behind", how to proceed now?16:13
danielh1234 left16:14
jyk joined16:14
multi_io left16:14
multi_io joined16:15
lanlink left16:17
BPL meh, never mind, i've checkout another local branch, deleted the conflicted one, checkout origin/factory, reset hard to upstream/factory and made git push --force-with-lease, done :P16:20
jkyle joined16:23
orbyt_ joined16:24
applecrumble left16:24
atlas_ left16:25
darkbit left16:27
j416 BPL: not without more info16:27
BPL: but it seems you chose the 'reset' path.16:27
BPL j416: yeah, i'm sure i could have solved the issue in a better way but hey, at least now I've got my fork in sync with remote :/16:28
j416 ¯\_(ツ)_/¯16:28
zmt00 left16:29
Guest89225 left16:32
freimatz joined16:37
fission6 joined16:37
zmt00 joined16:41
Guest89225 joined16:41
maarhart joined16:42
maarhart left16:42
Silenced left16:42
maarhart joined16:42
maarhart left16:42
doev joined16:42
duderonomy left16:43
maarhart joined16:43
maarhart left16:43
maarhart joined16:43
maarhart left16:43
maarhart joined16:43
zegerjan joined16:46
joelroa left16:47
averell left16:48
jnavila joined16:50
BallChang-CN left16:52
BallChang-CN joined16:52
tristanp joined16:54
averell joined16:54
cxc99 does anyone know how in general you would step over the auto-complete "" in an IDE instead of having to type " or use the arrow key?16:55
mescalinum joined16:56
thiago joined16:56
boshhead joined16:56
boshhead left16:56
boshhead joined16:56
BallChang-CN left16:57
jhaenchen joined16:57
BallChang-CN joined16:57
basteh joined16:58
tristanp left16:58
okovko cxc99 use a snippets plug in and make your own binds. the defaults for that behavior don't seem to make anyone happy16:59
Guest89225 left16:59
Onionnion joined17:00
cdown left17:03
cdown joined17:06
aax joined17:09
Guest89225 joined17:11
jkyle left17:12
xaa left17:13
keepLearning512 joined17:13
j416 cxc99: that's not a Git question but what editor is it?17:14
the general way would be "disable it in the editor configuration"17:15
cxc99 most editors, but this is intellij17:16
Goplat joined17:18
ferdna left17:18
zegerjan left17:20
hermann_1ordung left17:20
maarhart left17:20
finalbeta left17:21
aax left17:21
finalbeta joined17:21
maarhart joined17:21
aax joined17:21
joelroa joined17:22
shicks_ joined17:24
nbunjeva1 joined17:24
keepLearning512 left17:25
j416 wouldn't say most editors.17:26
never used intellij, sorry.17:26
shicks2525 left17:26
j416 maybe google "disable quote matching intellij".17:26
zegerjan joined17:26
BPL do you know how to delete all local branches? ie: `git branch | grep -v "master" | xargs git branch -D17:27
` will delete all of them except master... but I'm not sure if one "active" local branch can be deleted.17:27
jkyle joined17:28
Guest89225 left17:30
canton7 I think 'git update-ref' can delete the current branch? Why do you want to do that, anyway?17:31
lomex joined17:33
maarhart left17:33
cxc99 ah thanks couldn't figure out what it was actually called :)17:33
okovko left17:34
okovko joined17:34
maarhart joined17:35
ilmostro left17:36
dc13ff left17:37
Guest89225 joined17:37
maarhart left17:38
ilmostro joined17:38
BPL canton7: I was testing this script https://bpaste.net/show/06a92a9173c2 which I'd like to use to sync all my forks with their remotes. But to make it work I think I need first to remove all the local branches first. Or maybe not, for instance, not sure if related but if i remove all local branches except "master" and run the script i'll get this error https://dl.dropboxusercontent.com/s/yq7d4w7b6kaq1q7/cmd_2018-09-08_19-37-56.png17:39
fflam joined17:39
ilmostro left17:40
canton7 BPL, right, so the branch pr_accept on origin has commits which the pr_accept branch on upstream doesn't have17:41
BPL, which is why it's refusing to push -- if it did let you push, you'd be removing commits which exist on origin17:42
maarhart joined17:42
BPL canton7: I see, i was looking at the gui and you're completely right, it wasn't because of master not deleted afterall :/17:42
canton7: So, guess the script is doing the right thing by failing in those cases?17:43
ilmostro joined17:43
canton7 sure, git's refusing to throw away data17:43
maarhart left17:48
BPL canton7: One last question, I'm checking my fork at github and i can see all branches are even with upstream except 'master', any idea?17:50
canton7 that script specifically excludes master17:50
BPL oh, yeah, sure, my first question grep -v :/17:51
canton7 what are you trying to achieve though? Why do you have a fork which is identical to upstream in every way?17:51
BPL canton7: I'm just messing around and getting more familiar with git tbh, I've got some outdated forks i'd like to sync so i can check the state of the project and what needs to be done, nothing special actually17:53
canton7 cool. Most forks exist either to apply some modifications on top of upstream, or to develop contributions back to upstream. In the former updating is going to be a partially manual process, and the latter you only need to update master when you want to develop another contribution17:55
Mattiaslndstrm joined17:55
dviola joined17:55
joelroa left17:59
govg joined17:59
BPL I see, I guess it makes sense, if you're assigned or self-assigning to a particular ticket that way seems to be really fast. In this case is more about grasping an overall view of my outdated forks, but also to learn some new stuff about git as I just barely know the basics and because of that i end-up wasting a lot of time with non-coding git related things, and that's bad :)18:00
canton7 if you've just got outdated forks hanging around, why not delete them?18:01
BPL mmm, that's actually a good suggestion :) . Delete and clone them again18:01
sorry, delete and fork them again18:02
canton7 my point was more, if they're not being used, why have them at all?18:02
profmac joined18:03
profmac_ joined18:03
BallChang-CN left18:03
profmac_ left18:03
jim joined18:04
jim left18:04
BPL well... I'm the type of guy who likes to stack books on the worktable, even if I don't read them straightaway I like to have them as a reference :) . But yeah, sure you've got a point there18:05
jakogut joined18:05
VladGh joined18:06
BPL although i guess if you're just using projects as a reference or to not contribute on it at all you should just clone it directly without forking it :/18:07
canton7 yeah. stars are github's way of bookmarking a project18:08
BPL never used the stars thing, i know they exist but don't know very well it's purpose, I thought they were to measure how popular a repo was... :/18:09
Zarthus they serve many purposes18:09
but most of it is superficial and nonsignificant18:09
canton7 "how many people have bookmarked this repo" is a reasonable measure of how popular it is18:09
graphene left18:10
chris349 left18:11
graphene joined18:11
graphene left18:12
graphene joined18:13
jim joined18:14
bast3h joined18:16
xaa__ joined18:16
xaa__ left18:17
dpyro joined18:18
Hounddog left18:18
tarkus left18:18
basteh left18:19
Hounddog joined18:19
aax left18:19
zalt_zalt18:21
m0viefreak left18:22
chris349 joined18:25
bastey joined18:26
soee left18:26
bast3h left18:29
applecrumble joined18:29
jnavila left18:31
dviola left18:32
inovas left18:33
sQVe joined18:36
supernovah left18:36
inovas joined18:40
sQVe left18:40
mizu_no_oto joined18:40
lomex left18:44
Silenced_v2 joined18:49
Arcatech joined18:52
okovko left18:52
xtungvu90 left18:53
tristanp joined18:55
Silenced_v2 left18:56
jnavila joined18:59
tristanp left18:59
_abs_ joined18:59
gxt BPL: Instead of deleting and cloning again, just fetch and merge.19:00
texinwien joined19:02
dege joined19:04
Mat001 left19:08
Onionnion left19:10
spacesuitdiver joined19:15
ShekharReddy left19:17
mlopezviedma_ joined19:18
maarhart joined19:19
rafasc joined19:23
andai joined19:26
gareppa joined19:26
justanotheruser left19:28
Arcatech left19:29
Toadisattva joined19:30
justanotheruser joined19:31
zsoc joined19:34
justanotheruser left19:35
gareppa left19:36
mlopezviedma_ left19:36
mlopezviedma joined19:37
maarhart left19:39
wpcarro joined19:41
mooasaurus left19:41
Silenced_v2 joined19:42
justanotheruser joined19:46
wreed joined19:48
graphene left19:49
graphene joined19:50
applecrumble left19:51
aw1 joined19:52
Wetmelon joined19:53
joft joined19:53
ilmostro left19:55
wpcarro left19:56
graphene left19:56
ilmostro joined19:57
graphene joined19:57
roler joined19:57
Silenced_v2 left19:57
jyk left20:03
mizu_no_oto left20:03
vavkamil joined20:08
profmac left20:08
profmac joined20:09
dviola joined20:10
tristanp joined20:12
bast3h joined20:17
bast3h left20:17
tristanp left20:18
dansan left20:19
bastey left20:20
piggah joined20:24
jakogut left20:26
jakogut joined20:27
st-gourichon-fid left20:28
st-gourichon-fid joined20:28
kes left20:30
lomex joined20:35
Quetzal2 left20:38
aw1 left20:39
babyflakes joined20:39
babyflakes left20:40
st-gourichon-fid left20:45
jhaenchen left20:45
st-gourichon-f joined20:46
freimatz left20:49
jhaenchen joined20:49
jhaenchen left20:49
jhaenchen joined20:49
mizu_no_oto joined20:49
schleppel left20:50
st-gourichon-f left20:51
plexigras left20:52
mizu_no_oto left20:52
st-gourichon-fid joined20:52
jhaenchen left20:54
plexigras joined20:54
BenderRodriguez left20:54
lomex left20:55
timj joined20:57
st-gourichon-fid left20:59
jhaenchen joined20:59
timj1 left21:00
plexigras left21:00
Dougie187 joined21:01
plexigras joined21:01
st-gourichon-fid joined21:02
jhaenchen left21:04
junaidnaseer2 joined21:05
CheckDavid joined21:07
zegerjan left21:08
st-gourichon-fid left21:13
st-gourichon-fid joined21:13
BPL left21:14
jhaenchen joined21:14
joft left21:17
jnavila left21:18
thiago left21:18
st-gourichon-f joined21:19
spacesuitdiver left21:19
thiago joined21:19
jhaenchen left21:19
applecrumble joined21:20
st-gourichon-fid left21:20
DusteD left21:23
liefer joined21:23
jhaenchen joined21:24
st-gourichon-f left21:25
martinus__ left21:25
st-gourichon-fid joined21:26
st-gourichon-fid left21:28
jhaenchen left21:28
Essadon left21:31
jhaenchen joined21:31
st-gourichon-fid joined21:32
jhaenchen left21:36
jhaenchen joined21:36
plexigras left21:38
plexigras joined21:39
st-gourichon-fid left21:40
st-gourichon-fid joined21:41
jhaenchen left21:41
minimal_life joined21:42
Toadisattva left21:42
Toadisattva joined21:43
Arcatech joined21:44
jhaenchen joined21:44
wcpan joined21:47
junaidnaseer2 left21:48
Envil left21:53
plexigras left21:55
gxt left21:56
RuckusBringer left21:57
jhaenchen left21:58
TheRuckus joined21:58
gxt joined21:58
jhaenchen joined22:02
minimal_life left22:04
junaidnaseer2 joined22:06
st-gourichon-fid left22:08
e_l1997 left22:09
st-gourichon-fid joined22:09
al-damiri joined22:09
jhaenchen left22:10
jhaenchen joined22:11
courrier joined22:14
Arcatech left22:15
govg left22:15
theoceaniscool left22:16
m0viefreak joined22:17
st-gourichon-f joined22:24
st-gourichon-fid left22:24
realnot left22:26
Mattiaslndstrm left22:27
TripFandango left22:30
jhaenchen left22:30
vavkamil left22:31
TripFandango joined22:31
st-gourichon-f left22:31
Arcatech joined22:32
st-gourichon-fid joined22:32
boombatower joined22:34
Muzer joined22:34
jhaenchen joined22:35
CrystalMath joined22:35
CrystalMath hi all, is it common practice to check out every branch into a specific folder?22:36
junaidnaseer2 left22:36
CrystalMath like, clone the repository22:36
strugee_ joined22:36
CrystalMath many times22:36
and then switch each folder into its own branch22:36
because i don't know if i'm doing something wrong but jumping between branches is super inconvenient22:37
sometimes i need something that was done in a different branch22:37
Guest89225 left22:39
jhaenchen left22:40
rafasc CrystalMath: you're cloning the repo multiple times to be able to have multiple branches checked out?22:42
CrystalMath yes22:42
rafasc that's silly :)22:42
use git worktree isntead.22:42
CrystalMath is there some other way?22:42
rafasc man git worktree22:43
gitinfo the git-worktree manpage is available at https://gitirc.eu/git-worktree.html22:43
jhaenchen joined22:43
st-gourichon-fid left22:43
chris349 left22:43
CrystalMath rafasc: that's very interesting!22:43
rafasc you'll be able to have a branch checked out on another directory, but it will still belong to the same repo.22:43
st-gourichon-fid joined22:44
CrystalMath so, how does that clash with the branch that's checked out in the current directory?22:44
is it common practice to create a subfolder named "branches"22:44
because the name of a branch might clash22:44
with the name of a directory in the tree22:44
rafasc No duplicate data transfered, and more important, you wont have the problem being out of sync in some directories because you forgot to update it.22:45
CrystalMath: the worktree should be created outside the current repo.22:46
CrystalMath ah, but how will it know what repo i am referring to then?22:46
oh, i can just22:46
cd to the repository22:46
rafasc No one cares how you organize yourself.22:46
CrystalMath and then use ../22:46
yeah, sorry22:46
tristanp joined22:46
rafasc the worktree uses something like symbolic link to refer to the original repository.22:47
wpcarro joined22:47
jhaenchen left22:48
tristanp left22:48
CrystalMath thank you, this helps a lot!22:49
rafasc on your current repo, you can do something like: git worktree add ../my_other_worktree <branch>.22:49
jhaenchen joined22:49
rafasc the other worktree works as if it is a cloned repo.22:49
the only restriction is that you can only checkout a branch in one place at a time.22:50
inovas left22:50
Guest89225 joined22:50
TheRuckus left22:50
tristanp joined22:51
tristanp left22:51
CrystalMath the other directories say they're not git repositories22:51
wpcarro left22:52
inovas joined22:52
rafasc can you post a transcript of your session?22:52
czart_ joined22:52
CrystalMath [coderain@theoracle mm_rewrite]$ git status22:53
rafasc what does git worktree list; say?22:53
CrystalMath fatal: Not a git repository: /home/coderain/projects/monolithium/repository/.git/worktrees/mm_rewrite22:53
if i cd to the original one22:53
and do that22:53
it prints 5 lines22:53
/home/coderain/projects/monolithium/master ae4db17 [master]22:53
/home/coderain/projects/monolithium/mm_rewrite c50efc0 [mm_rewrite]22:53
/home/coderain/projects/monolithium/manager_work 882bf02 [manager_work]22:53
/home/coderain/projects/monolithium/ide_driver_work 4549cab [ide_driver_work]22:53
/home/coderain/projects/monolithium/unit_tests 045be77 [unit_tests]22:53
jhaenchen left22:54
rafasc each of those is a worktree..22:54
jakogut left22:54
rafasc cd /home/coderain/projects/monolithium/mm_rewrite; git status; complains?22:54
CrystalMath yes22:54
st-gourichon-fid left22:55
rafasc it shouldn't...22:55
git version?22:55
st-gourichon-fid joined22:55
CrystalMath 2.11.0, i'm on debian stable22:55
jhaenchen joined22:55
CrystalMath is it a bug?22:55
Guest89225 left22:55
jakogut joined22:56
czart left22:56
CrystalMath oops, i know the problem22:56
i renamed "repository" to "master"22:56
with mv22:56
but the links seem to be pointing to "repository"22:56
so i guess i have to delete them and recreate them22:57
rafasc CrystalMath: do you have worktree move?22:57
it's recent I think.22:57
CrystalMath add, list, lock, prune, unlock22:58
chris349 joined22:58
rafasc newer versions have move, since you dont, just add the new ones and run worktree prune afterwards22:59
to remove the dead links.22:59
st-gourichon-fid left22:59
st-gourichon-f joined22:59
jhaenchen left23:00
CrystalMath yes, everything works now, thanks :)23:01
rafasc CrystalMath: also, I would perhaps suggest another naming convention..23:01
because you can cd master; checkout dev;23:01
mikecmpbll left23:01
dege left23:01
CrystalMath hehe, i come from an SVN background23:01
and branches there are literal copies of everything23:01
rafasc problem with that is that worktrees are not bound to the branch it was created from...23:02
CrystalMath yes23:02
rafasc you'll eventually be confused if you checkout something else on the master directory.23:02
CrystalMath hmm...23:03
jhaenchen joined23:03
rafasc as you can see, worktree list already tells which branch is checked out there.23:03
finalbeta left23:04
st-gourichon-f left23:04
st-gourichon-fid joined23:04
CrystalMath but this still helps a ton23:05
cbreak joined23:05
rafasc instead of having all those, I would probably just have two worktrees. One 'main' where you work on, and an alt where you checkout other branches as needed.23:05
as the name implies, worktree are trees you work on. If they're just there standing still, you're doing something "wrong". :P23:07
bed time, good luck with your project :)23:07
jhaenchen left23:08
rafasc left23:08
jhaenchen joined23:08
tristanp joined23:10
jhaenche_ joined23:13
jhaenchen left23:13
tristanp left23:14
kasual joined23:14
CrystalMath ok i now i started seriously messing things up23:16
*ok now23:17
tristanp joined23:17
tristanp left23:18
st-gourichon-fid left23:18
st-gourichon-fid joined23:19
jhaenche_ left23:20
tristanp joined23:20
jhaenchen joined23:21
tristanp left23:21
dre_ joined23:21
fahadash left23:22
jhaenchen left23:26
jhaenche_ joined23:26
tristanp joined23:26
fatalhalt joined23:27
jhaenche_ left23:31
fission6 left23:31
st-gourichon-fid left23:32
st-gourichon-fid joined23:32
st-gourichon-f joined23:35
st-gourichon-fid left23:36
CheckDavid left23:36
hbautista joined23:37
Guest89225 joined23:37
tristanp left23:39
fission6 joined23:40
MACscr|lappy joined23:41
tristanp joined23:41
jhaenchen joined23:43
AtumT left23:43
fission6 left23:44
jhaenchen left23:47
jhaenchen joined23:51
_abs_ left23:51
mescalinum left23:52
tristanp left23:56

Logs Search ←Prev date Next date→ Channels Documentation