IRCloggy #git 2018-05-15

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-05-15

imp → CarGirl00:00
← beefjoe left00:01
← drodger left00:02
← rafasc left00:02
← jelmer left00:04
← Schrostfutz left00:04
→ jelmer joined00:07
← Neo4 left00:10
→ adamantium_ joined00:10
← mad_hatter left00:12
→ drodger joined00:13
← nitric left00:13
← adamantium left00:14
adamantium_ → adamantium00:14
→ epelesis joined00:14
→ durham_ joined00:14
CarGirl → imp00:15
← drodger left00:15
→ duderonomy joined00:16
← cagomez left00:16
← epelesis left00:16
← Jackneilll left00:17
← durham left00:17
→ Jackneilll joined00:17
→ mad_hatter joined00:18
→ epelesis joined00:18
← exotime left00:18
→ drodger joined00:18
← ProCycle left00:19
← durham_ left00:19
← thiago left00:20
← ferdna left00:20
← epelesis left00:21
← applecrumble left00:21
← Singmyr left00:21
→ exotime joined00:21
→ epelesis joined00:22
→ cagomez joined00:23
→ rchavik joined00:24
→ andyhuzhill joined00:24
← morenoh149 left00:24
← jimmyrcom_ left00:25
← sim590 left00:25
→ morenoh149 joined00:25
→ durham joined00:26
← cagomez left00:27
← duderonomy left00:29
→ durham_ joined00:30
← durham left00:31
→ camsbury joined00:33
← _aeris_ left00:34
→ _aeris_ joined00:34
→ sim590 joined00:36
→ igemnace joined00:38
← xaxxon left00:39
← a3Dman left00:39
← TomyLobo left00:40
← sim590 left00:41
→ a3Dman joined00:42
→ Garen_ joined00:44
← Oatmeal left00:45
← Garen left00:46
← sameerynho left00:51
→ sim590 joined00:51
← goweol left00:52
→ goweol joined00:52
← durham_ left00:55
← sim590 left00:58
← Gurkenglas left00:59
→ sim590 joined01:00
→ Arcaelyx joined01:00
→ nevyn joined01:00
→ duderonomy joined01:03
← Have-Quick left01:04
← Sasazuka left01:08
→ cagomez joined01:10
← _ADN_ left01:11
← camsbury left01:12
← Puffball left01:13
← cagomez left01:15
← rsrx left01:16
← manuelschneid3r left01:19
← dsdeiz left01:21
→ dsdeiz joined01:22
← dsdeiz left01:22
→ dsdeiz joined01:22
→ celo_0 joined01:24
← dsdeiz left01:25
→ keep_away joined01:25
→ gian-carlo joined01:26
← pfleck left01:26
→ Changhe joined01:27
→ dsdeiz joined01:27
← dsdeiz left01:27
→ dsdeiz joined01:27
← morenoh149 left01:28
→ finalbeta joined01:28
→ morenoh149 joined01:29
← keep_away left01:29
→ keep_away joined01:29
← keep_away left01:30
→ keep_learning joined01:31
← a3Dman left01:31
→ Oatmeal joined01:33
← jamiejackson left01:33
→ wreed joined01:34
→ camsbury joined01:35
→ anjen joined01:36
→ jameser joined01:36
← camsbury left01:37
← shinnya left01:38
→ dreiss joined01:38
→ jimmyrcom_ joined01:39
→ a3Dman joined01:39
→ muelleme joined01:42
→ arooni_team_b joined01:44
→ mlopezviedma_ joined01:45
← mlopezviedma left01:45
← ilbot3 left01:46
← muelleme left01:47
→ thiago joined01:47
← anjen left01:48
← morenoh149 left01:51
→ smallville7123 joined01:52
→ livingstn joined01:53
← Mattiaslndstrm left01:53
← Oatmeal left01:54
→ ilbot3 joined01:57
← egc left01:58
→ egc joined01:59
→ camsbury joined01:59
← camsbury left01:59
→ ArcaTech joined02:00
→ relipse joined02:02
← arooni_team_b left02:02
← Khisanth left02:02
← Xiti left02:04
← smallville7123 left02:04
← mlopezviedma_ left02:05
← ustekne left02:05
→ mlopezviedma joined02:05
→ arooni_team_b joined02:07
← livingstn left02:07
→ Xiti joined02:07
→ ferdna joined02:09
→ houami joined02:10
→ livingstn joined02:10
← arooni left02:13
arooni_team_b → arooni02:13
← houami left02:14
← goweol left02:15
→ Khisanth joined02:15
→ Goplat joined02:18
→ cheater joined02:21
cheater hi02:21
is there a tool that will show me a graph where the horizontal axis is time and on the vertical axis there are different committers, and the graph shows when they committed?02:22
→ morenoh149 joined02:22
← epelesis left02:23
→ smallville7123 joined02:26
← livingstn left02:26
← morenoh149 left02:27
← Changhe left02:28
← relipse left02:28
→ lagothrix joined02:31
← tchan left02:34
← lagothri2 left02:35
← wreed left02:36
← Praxi left02:37
→ goweol joined02:37
→ smallville7123_ joined02:40
← goweol left02:41
karstensrage cheater, have you tried git gui?02:42
← smallville7123 left02:42
cheater i use git gui, but i don't think it has that option?02:42
karstensrage ok just suggesting if you hadnt tried it it might have something of value02:43
other than that i dont know of anything that does that02:43
← adamantium left02:43
→ livingstn joined02:45
→ BallChang-CN joined02:47
← smallville7123_ left02:47
← linuxmodder left02:51
→ linuxmodder joined02:53
→ epelesis joined02:54
→ smallville7123 joined02:55
← epelesis left02:56
← YuGiOhJCJ left02:57
cjohnson github's contributors page does this02:58
→ vdamewood joined03:00
→ orbyt_ joined03:01
← smallville7123 left03:04
← crimson_king left03:05
→ crimson_king joined03:06
→ sanscoeur joined03:07
← vdamewood left03:09
← m00sehead left03:10
← a3Dman left03:14
← crimson_king left03:14
← NinjaBruxo left03:15
→ NinjaBruxo joined03:17
→ howdoi joined03:17
← celo_0 left03:20
← livingstn left03:21
← PaulePanter left03:23
← Khisanth left03:25
→ penguinPerplexed joined03:26
→ a3Dman joined03:26
← matthiaskrgr left03:30
→ morenoh149 joined03:31
← philippirrip left03:31
→ matthiaskrgr joined03:32
→ philippirrip joined03:32
matthiaskrgr → Guest8195803:32
→ vdamewood joined03:33
← vdamewood left03:33
← d3r3k left03:34
→ boombatower joined03:34
→ vdamewood joined03:34
← penguinPerplexed left03:38
← drodger left03:40
→ smallville7123 joined03:42
→ drodger joined03:42
→ kfoonamalik joined03:45
→ penguinPerplexed joined03:45
→ Khisanth joined03:52
← sentriz left03:55
← dendazen left03:56
← sanscoeur left03:57
→ sentriz joined03:57
→ schleppel joined03:57
→ j0z joined03:59
← xdej left04:00
→ jcarpenter2 joined04:00
← Khisanth left04:06
← orbyt_ left04:07
← dsantiago left04:11
→ energizer joined04:13
→ dsantiago joined04:13
→ user21_zulip joined04:17
→ user231 joined04:17
→ d3nk joined04:18
← doppo left04:19
d3nk hi in this: git clone ssh://[user@]server/project.git . Where do I provide the port number?04:19
→ Khisanth joined04:20
Peng_ Have you read "git help clone"04:20
← user21_zulip left04:20
d3nk oops, thanks.04:20
→ user21_zulip joined04:21
← user21_zulip left04:23
→ user_zulip joined04:24
← user231 left04:26
← smallville7123 left04:26
← user_zulip left04:26
→ doppo joined04:26
← doppo left04:31
→ Have-Quick joined04:31
→ doppo joined04:32
→ crtcji joined04:35
← doppo left04:38
→ rkazak joined04:39
← kent\n left04:40
→ goweol joined04:40
→ pnepe6 joined04:41
← robattila256 left04:44
← morenoh149 left04:44
← Have-Quick left04:45
← dreiss left04:45
→ Have-Quick joined04:50
← boombatower left04:51
→ eshlox joined04:52
→ kent\n joined04:54
← j0z left04:56
→ dege joined05:00
← Khisanth left05:03
→ tvw joined05:04
→ doppo joined05:08
→ Darcidride_ joined05:08
→ Darcidride__ joined05:09
← Have-Quick left05:09
← Darcidride_ left05:10
← Darcidride left05:10
← linuxmodder left05:10
→ robattila256 joined05:13
→ Khisanth joined05:16
→ sauvin joined05:17
← igemnace left05:19
← kini left05:19
→ igemnace joined05:20
→ linuxmodder joined05:23
→ dimi1947 joined05:23
← linuxmodder left05:24
→ linuxmodder joined05:24
→ cagomez joined05:25
← foul_owl left05:26
→ venmx joined05:26
→ mohabaks joined05:27
← jcarpenter2 left05:29
← synthmeat left05:29
← cagomez left05:29
← linuxmodder left05:30
→ synthmeat joined05:33
← crtcji left05:33
← jimmyrcom_ left05:35
→ muelleme joined05:37
→ linuxmodder joined05:37
→ theDiabolicalKid joined05:38
→ foul_owl joined05:39
← gian-carlo left05:39
← penguinPerplexed left05:39
← theDiabolicalKid left05:40
→ veegee joined05:40
→ KeyJoo joined05:40
→ penguinPerplexed joined05:41
← KeyJoo left05:41
← mar77i left05:41
→ mar77i joined05:41
→ KeyJoo joined05:41
← penguinPerplexed left05:42
→ penguinPerplexed joined05:43
→ PaulePanter joined05:43
→ ExeciN joined05:43
→ qswz joined05:46
qswz what's better between: https://stackoverflow.com/a/10421385/3183756 and https://stackoverflow.com/a/39943727/318375605:46
← el_tigro1 left05:48
osse qswz: If you need this once (or a few times), the short answer. If you do this a lot, the long answer.05:49
qswz Thanks ok05:50
→ Ekho joined05:52
→ kini joined05:55
← RougeR left05:56
← inovas left05:57
→ jcarpenter2 joined05:58
← doug16k left05:59
→ jungsubk joined05:59
→ Raging_Hog joined06:00
→ theDiabolicalKid joined06:00
← penguinPerplexed left06:01
→ pfleck joined06:01
→ inovas joined06:02
← theDiabolicalKid left06:02
→ penguinPerplexed joined06:02
→ solarjoe4 joined06:02
← pfleck left06:06
← venmx left06:07
← dminuoso left06:08
→ mda1 joined06:10
→ ok91 joined06:11
← metts left06:13
← kfoonamalik left06:14
← muelleme left06:17
→ theDiabolicalKid joined06:19
→ chubbyDeveloper joined06:19
← theDiabolicalKid left06:19
← TinkerT left06:19
→ TinkerT joined06:20
← penguinPerplexed left06:20
← chubbyDeveloper left06:21
→ penguinPerplexed joined06:21
→ pihpah joined06:21
← penguinPerplexed left06:22
→ penguinPerplexed joined06:22
→ borkr joined06:27
← rkazak left06:27
← penguinPerplexed left06:27
→ penguinPerplexed joined06:28
→ smallville7123 joined06:28
→ dreiss joined06:31
→ Masplus joined06:36
← penguinPerplexed left06:37
← smallville7123 left06:37
→ chele joined06:39
← Guest81958 left06:40
→ Guest81958 joined06:40
← Guest81958 left06:40
→ Guest81958 joined06:40
→ glebihan joined06:41
Guest81958 → matthiaskrgr06:41
→ JeroenT joined06:41
← glebihan left06:41
→ glebihan joined06:43
→ smallville7123 joined06:43
← pihpah left06:43
→ penguinPerplexed joined06:43
→ pfleck joined06:44
← foul_owl left06:45
→ tkore joined06:46
← mniip left06:46
← penguinPerplexed left06:47
→ penguinPerplexed joined06:47
→ pihpah joined06:49
← pfleck left06:50
← andyhuzhill left06:52
→ wandering_vagran joined06:52
← dreiss left06:52
← penguinPerplexed left06:56
→ penguinPerplexed joined06:56
← \void left06:58
← mohabaks left06:58
→ oxymoron93 joined06:58
→ Tobbi joined06:59
← ok91 left07:01
→ ok91 joined07:01
← ArcaTech left07:01
→ andyhuzhill joined07:02
← ferdna left07:03
→ foul_owl joined07:04
← smallville7123 left07:10
→ cur8or joined07:11
← andyhuzhill left07:17
→ andyhuzhill joined07:17
→ cdown_ joined07:18
→ Arcaelyx_ joined07:18
→ TomyWork joined07:19
← cdown left07:20
cdown_ → cdown07:20
← pihpah left07:21
← andyhuzhill left07:21
← armyriad left07:22
→ mikemcowie joined07:22
→ armyriad joined07:22
← Arcaelyx left07:22
→ andyhuzhill joined07:22
← cfoch left07:22
← vdamewood left07:23
← raulp left07:26
→ _xor joined07:33
→ theDiabolicalKid joined07:34
← theDiabolicalKid left07:34
→ mniip joined07:34
→ zefferno joined07:35
← thiago left07:38
← robattila256 left07:39
cheater cjohnson: not really. it has a somewhat similar view, but it's not all in one graph, instead with one graph per user, and it's not a scatter plot, it's a commit volume plot.07:40
→ floppydh joined07:41
← fatalhalt left07:43
→ mosab joined07:43
→ doug16k joined07:44
← armyriad left07:45
→ rfuentess joined07:45
→ rajpratik71 joined07:47
→ armyriad joined07:48
→ fatalhalt joined07:49
← arecaceae left07:51
→ arecaceae joined07:52
← mosab left07:53
← energizer left07:53
→ energizer joined07:54
→ abba joined07:55
→ mikecmpbll joined07:55
→ LeMike_ joined07:56
→ zayafa joined07:56
← byte512 left07:57
← veegee left07:59
→ SerialSmile joined08:00
→ bahamut24 joined08:01
→ theoceaniscool joined08:01
→ byte512 joined08:03
→ Es0teric joined08:07
→ bolovanos joined08:08
← energizer left08:09
← bolovanos left08:12
← byte512 left08:13
→ bolovanos joined08:15
← Es0teric left08:15
→ Es0teric joined08:16
← rajpratik71 left08:17
← Es0teric left08:21
← errr left08:22
→ revoltingPeasant joined08:24
← JeroenT left08:25
→ JeroenT joined08:26
→ settermjd joined08:26
→ byte512 joined08:26
← andyhuzhill left08:27
→ andyhuzhill joined08:27
→ Tobbi_ joined08:28
← settermjd left08:30
← Darcidride__ left08:30
→ Darcidride joined08:30
← andyhuzhill left08:31
→ andyhuzhill joined08:32
→ _ADN_ joined08:32
← mikecmpbll left08:32
→ settermjd joined08:33
← djb-irc left08:33
→ mikecmpbll joined08:34
← byte512 left08:34
→ dre_ joined08:34
→ Novae joined08:35
→ Xiti` joined08:35
→ errr joined08:35
→ byte512 joined08:35
→ manuelschneid3r joined08:35
→ plexigras joined08:37
← dimi1947 left08:37
← settermjd left08:38
← Xiti left08:38
→ T_UNIX joined08:41
→ dimi1947 joined08:42
→ arraen joined08:44
← mikemcowie left08:44
← cdown left08:44
→ mosab joined08:45
→ doev joined08:47
← saidelike_ left08:47
← khoyo left08:48
→ Neo4 joined08:48
→ WhiskerBiscuit joined08:50
→ saidelike joined08:52
→ sh1ba joined08:53
← sh1ba left08:53
→ ismithers joined08:59
→ venmx joined09:00
← Goplat left09:00
← WhiskerBiscuit left09:01
← andyhuzhill left09:01
→ andyhuzhill joined09:02
→ khoyo joined09:03
← doev left09:04
← borkr left09:04
→ no_gravity joined09:05
no_gravity I edited a bunch of files and now noticed that the checked out branch is the wrong one.09:06
How do I go about this?09:06
← dimi1947 left09:06
← dre_ left09:06
no_gravity I think I will try stash/checkout/stash apply ...09:06
← abba left09:06
oxymoron93 yup, it is the way to go09:07
← mikecmpbll left09:08
no_gravity Awesome. It worked.09:08
→ dimi1947 joined09:08
→ abba joined09:09
← ismithers left09:09
→ mikecmpbll joined09:10
→ arraen_ joined09:13
→ coco joined09:13
→ leeN joined09:14
coco → Guest3881209:14
→ gunnarx joined09:14
← gunnarx left09:14
→ gunnarx joined09:14
→ arraen__ joined09:15
← Guest38812 left09:16
← arraen left09:16
→ arraen joined09:18
← arraen_ left09:19
→ borkr joined09:20
← arraen__ left09:21
← arraen left09:23
← bolovanos left09:23
→ arraen joined09:23
→ crimson_king joined09:23
osse no_gravity: !float09:24
gitinfo no_gravity: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.09:24
osse That can work as a shortcut09:25
grawity no floating here09:25
no_gravity osse: stash/checkout/stash apply, right?09:25
← catsup left09:25
→ catsup joined09:25
oxymoron93 you can go with checkout only09:25
but it is not guaranteed to pass09:26
← catsup left09:26
→ tuxayo joined09:26
→ catsup joined09:26
no_gravity It worked.09:28
Not sure how it could not?09:28
→ zulutango joined09:28
rts-sander conflicts09:29
grawity it would stop if it had to overwrite your edited files09:29
oxymoron93 it says up there: "If the files you changed differ between branches, the checkout will fail", which is the git way of saving your...09:30
← arraen left09:34
← andyhuzhill left09:35
→ Repox joined09:35
Repox Hi. Odd request, maybe, but is it possible for me (somehow) to see _who_ made a checkout of a repository?09:36
And when, maybe.09:36
grawity no, and no09:37
unless 1) you mean "a clone" and 2) you run your own git server09:37
← goweol left09:37
Repox I meant a clone, but it's from GitHub. But thank you very much for a quick answer.09:38
grawity you do have general traffic graphs on Github https://blog.github.com/2014-08-12-clone-graphs/09:39
tuxayo hi :) Is it possible to unapply changes of a past commit in the history (and leave them uncommitted).09:39
Context: wants to rollback two commits implementing something to run automated tests and check that they fail. That's why I'm seeking for a quick workflow and hope to not have to rebase, revert or something else too heavy.09:39
grawity tuxayo: altering past commits always needs something heavy09:40
but if `git revert` is too heavy then I don't know09:40
by "rollback two commits" do you mean undo specific commits, or do you mean go two commits back?09:40
← g00s left09:42
no_gravity What do I do when I work on featureBranch1 that was branched from master but now I want it to use stuff from featureBranch2? Can I make it be based on featureBranch2?09:42
→ settermjd joined09:43
_ikke_ no_gravity: Sure, you can rebase it onto featureBranch209:43
→ cdown joined09:43
_ikke_ git rebase --onto featureBranch2 master featureBranch109:43
no_gravity Sounds good!09:44
_ikke_ but you need to keep in mind that changes in featureBranch2 are not automatically incoroporated in featureBranch109:44
no_gravity Now I'm confused.09:44
_ikke_ (new commits)09:44
If you commit someting in featureBranch2 after the rebase, featureBranch1 would not contain that commit09:45
just like commits in master would not be contained in the other branches09:45
no_gravity Hmm.. later I want to: 1) merge featureBranch2 into master 2) merge featureBranch1 into master.09:47
_ikke_ no_gravity: that's possible09:47
← ok91 left09:48
tuxayo grawity: undo specific commits in the past, not the 2 two lasts.09:48
For now the simplest thing I have is git revert <commitid1> <commitid1> && run_test && git reset --hard HEAD~209:48
grawity git revert --no-commit09:50
in any case that's literally what `git revert` is for09:50
tuxayo I know there is something to just apply the changes of a commit. So I hopped the find the opposite :)09:52
← no_gravity left09:52
tuxayo grawity: oh thanks for the --no-commit !!09:52
→ vin_ joined09:54
→ rafasc joined09:55
→ agowa338 joined09:56
← mosab left09:57
→ no_gravity joined09:59
no_gravity I'm a bit confused that doing 'git checkout somebranch' keeps the files i modified in the working dir.09:59
→ mosab joined09:59
← Guest34373 left09:59
→ ronskisika joined09:59
← gunnarx left09:59
canton7 no_gravity, !float10:00
gitinfo no_gravity: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.10:00
grawity well, that's how it was written to work10:00
← Raging_Hog left10:00
canton7 the working tree isn't part of any branch, it's the files you've got on disk10:00
← Arcaelyx_ left10:00
no_gravity canton7: Isn't that annoying? I work on a branch, switch to another and boom the files I edited float to the other, unrelated branch.10:00
_ikke_ no_gravity: uncomitted changes don't belong to any branch10:01
canton7 no? The branch that's checked out only really becomes relevant when I want to commit10:01
no_gravity, it means that if I want to save my changes somewhere and come back to them later, I need to explicitly save them10:01
rather than git magicking my files away, and I'm left wondering where they've gone10:01
_ikke_ (which is better anyway)10:01
no_gravity _ikke_: But what if I don't want to commit? Becasue the changes are not ready to commit. How can I switch to another branch to work on it?10:01
grawity you've been told about `git stash` how many times?10:02
oxymoron93 you stash10:02
grawity though there's no "not ready to commit" in git10:02
there's only "not ready to push"10:02
canton7 no_gravity, you can create a temporary commit and undo it later (I have lots of "WIP" commits), or stash10:02
no_gravity grawity: But what if I come back to the branch I am working on in 3 days? How am I supposed to remember 'There are changes in the stach you have to apply before continuing the work'?10:02
canton7: Yes, that would work.10:02
canton7 no_gravity, that's when you create a temp commit10:02
→ MarioBranco joined10:02
no_gravity But it seems cumbersome.10:02
grawity no_gravity: post-it note10:03
no_gravity grawity: lol10:03
grawity where else would you put the changes?10:03
canton7 not really? It means that I can back up those temp changes by pushing them, if I want to, the same as any other commit10:03
grawity on the branch? but you just said they're not ready to go on the branch10:03
→ widp joined10:04
→ Arcaelyx joined10:04
← alcohol left10:04
→ alcohol joined10:05
← no_gravity left10:06
← mikecmpbll left10:06
← vin_ left10:07
→ ok91 joined10:07
→ smallville7123 joined10:07
← SerialSmile left10:08
→ jost joined10:08
→ mikecmpbll joined10:08
tuxayo grawity: thanks a lot. I'm very happy with the result :)10:08
git revert --no-commit <commit1> <commit2> ; run_tests ; git revert --abort10:08
← jameser left10:11
oxymoron93 I don't seem to find any problem with previous routine, unless you had some commit-hooks behind?10:11
← ok91 left10:12
← dpyro left10:12
← Repox left10:16
← Arcaelyx left10:18
← settermjd left10:19
→ giraffe joined10:19
→ Fernando-Basso joined10:19
giraffe → Guest506810:20
→ Arcaelyx joined10:24
← smallville7123 left10:25
→ smallville7123 joined10:28
→ Repox joined10:28
← Arcaelyx left10:30
→ kurkale6ka joined10:31
← Repox left10:34
→ Repox joined10:35
→ Arcaelyx joined10:35
→ settermjd joined10:35
← zayafa left10:36
← sim590 left10:41
← settermjd left10:42
→ sim590 joined10:43
→ gunnarx joined10:48
← gunnarx left10:48
→ gunnarx joined10:48
→ czart_ joined10:50
→ CodeSlingerPaul joined10:51
← smallville7123 left10:51
→ Raging_Hog joined10:53
← czart__ left10:53
← dsdeiz left10:54
← ronskisika left10:57
← wolfshappen left10:58
→ muehle joined10:59
← muehle left11:02
→ muehle joined11:02
← eshlox left11:02
→ dsdeiz joined11:02
→ no_gravity joined11:04
→ deltam joined11:04
no_gravity One thing I find cumbersome when I read commits is that I have to skip all those tests.11:04
How do you guys manage that?11:04
Wading through all the code that does not change the behaviour of the system.11:05
osse what do you mean?11:05
no_gravity osse: Say a coder pushed a feature branch.11:05
osse: Then I read it via 'log -p'.11:05
But >50% of it is stuff I don't care about.11:05
Tests, database seeders...11:05
osse git log -p -- only/stuff/youcareabout11:05
no_gravity What do you mean?11:06
osse git log -p -- . ':!stuff/you/do/not/care/about'11:06
no_gravity Sorry, I don't understand what you mean.11:06
→ Schrostfutz joined11:06
osse I mean add a a '-- paths' to git log11:06
no_gravity Hmmm... interesting idea.11:06
← doppo left11:07
← Repox left11:07
no_gravity Say I want to see everything except stuff in tests/11:08
How would I do that?11:08
osse replace "stuff/you/do/not/care/about" with "tests/" in my above command11:08
no_gravity This? git log -p -- . ':!tests/'11:09
Ok.11:09
Thanks!11:09
osse The only drawback is that if a commit changes things *only*11:09
in tests/ then git log won't show it at all11:09
no_gravity That's fine.11:09
← Kaisyu left11:10
← nowhereman_ left11:10
→ amirpro joined11:10
← Neo4 left11:11
no_gravity Is there a way to search for something in 'git log -p'?11:11
seems to do some kind of search11:12
osse by default git log -p uses less, so you can search with /11:12
no_gravity But it seems I have to scroll through the whole log and scroll back first.11:12
rafasc there's -S and --grep for log.11:13
no_gravity Hmm.. I would like to scroll around in 'git log -p'11:13
Ah no, it works just fine.11:13
→ doppo joined11:13
no_gravity I don't have to scroll to the end first.11:14
→ settermjd joined11:16
no_gravity What is the '--' in git log -p -- ..paths.. ?11:17
osse !--11:18
gitinfo [!dashes] Use a double-dash(--) to separate refs or arguments from file paths. This is especially useful when dealing with ambiguous names. Ex: `git checkout origin -- master` will check out the file "master" from branch "origin"11:18
no_gravity I see11:18
osse Similar principle to rm -- foo11:19
→ crtcji joined11:19
→ pfleck joined11:19
← doppo left11:21
← amirpro left11:22
← agowa338 left11:22
no_gravity Funky11:22
→ wolfshappen joined11:23
← jost left11:24
→ amirpro joined11:25
→ dwmw2_gone joined11:27
_ikke_ man gitcli11:27
gitinfo the gitcli manpage is available at https://gitirc.eu/gitcli.html11:27
_ikke_ It's a common pattern in cli tools11:28
→ amaio joined11:33
amaio hello11:33
gitinfo amaio: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.11:33
amaio my .gitignore file is being ignore, could someone help me, please?11:34
no_gravity amaio: How do you know it's ignored?11:35
amaio because files i want to ignore are being uploaded11:35
→ phluks joined11:35
_ikke_ !ignore_tracked11:35
gitinfo Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.11:35
← Arcaelyx left11:35
→ Asider joined11:36
← Asider left11:36
← kurkale6ka left11:37
← qswz left11:39
← MarioBranco left11:41
no_gravity Anybody here working with a team of coders?11:41
→ cur8or_ joined11:41
← cur8or left11:41
→ cek joined11:42
jast well, yeah11:42
no_gravity jast: Do you use raw git or tools on top of it?11:42
_ikke_ raw git11:42
no_gravity _ikke_: Awesome. I do the same. And for project/task management?11:43
← Impaloo left11:43
→ Impaloo joined11:43
→ dendazen joined11:44
rafasc no_gravity: post it notes around the screen.11:44
jast raw git, and in this particular case, github's issue tracker11:45
_ikke_ no_gravity: combination of gitlab and redmine11:45
jast in general I have yet to see a task tracker that I can recommend without hesitation11:45
no_gravity _ikke_: gitlab? I thought you use raw git?11:45
→ Karyon joined11:46
jast well, you didn't clarify what you meant by "raw git"11:46
cek I have added a new submodule to .gitmodules . How do I tell it to be checked out?11:46
jast I took it to assume "use git CLI to interact with local repo"11:46
no_gravity jast: That thing git command in the repos of most distros.11:46
→ Arcaelyx joined11:46
jast cek: the normal way to add a new submodule is 'git submodule add' which does all of the setup work, not just that one step11:46
no_gravity: yeah, and e.g. gitlab is what takes care of the hosting side of things. similarly, the project I'm working on is hosted by GitHub, and locally I use the standard git CLI11:47
no_gravity I see.11:48
→ farmer joined11:48
← Masplus left11:53
→ fission6 joined11:53
← amirpro left11:53
→ MarioBranco joined11:56
→ m00sehead joined11:57
→ amirpro joined11:58
→ doppo joined11:58
← fission6 left12:00
→ rsrx joined12:03
→ Nizumzen joined12:04
← topdownjimmy left12:05
→ topdownjimmy joined12:06
→ smallville7123 joined12:07
→ kurkale6ka joined12:07
← tuxayo left12:08
→ kurkale61 joined12:08
← BallChang-CN left12:09
→ mosab_ joined12:10
← settermjd left12:10
← amaio left12:11
← kurkale6ka left12:12
← crtcji left12:12
← mosab left12:14
mosab_ → mosab12:14
→ houami joined12:16
← inovas left12:17
← nielsk left12:17
→ cagomez joined12:18
← nivag left12:19
→ sveinse joined12:19
sveinse Is there a way to get the commit id of the current checked out WC, with indication if its not clean?12:20
→ settermjd joined12:20
grawity 1) git rev-parse HEAD12:21
2) git diff --exit-code HEAD12:21
actually you might want `git describe` for the former12:21
if you're building a project version thing12:21
sveinse Yeah, for a build system. In hg you've got hg id, and it returns the hash with a '+' at the end if its locally edited, which is great12:22
← cagomez left12:23
→ inovas joined12:23
rafasc grawity: or name-rev if you want if you a more human friendly output.12:23
sveinse git name-rev HEAD returns "HEAD feature_gitconvert", so that's too fluffy12:24
→ Doow joined12:25
→ hryniuk joined12:26
← penguinPerplexed left12:27
sveinse btw, is there a way to specify the current WC in revision specifiers? Such as "master..WC" or similar?12:28
← no_gravity left12:28
rafasc WC?12:28
grawity working copy?12:28
sveinse Working copy12:28
grawity the *commit* that the working copy is at is referred to as "HEAD" (all-caps)12:28
sveinse aha, so this term isn't used in git. duly noted.12:28
→ Cavallari joined12:29
grawity the entire worktree, including dirty state, has no universal reference12:29
sveinse ok12:29
grawity in commands like `git diff` it's implicit if only one or zero commits were specified12:30
sveinse say you're on a branch and want to compare master with the working copy? You can do git diff master..HEAD, but that's not the same12:30
rafasc sveinse: git diff master12:30
grawity git diff master12:30
sveinse thanks, implicit then12:31
grawity so, `git diff --exit-code HEAD` compares working copy with the current commit, and exits 1 if it's dirty12:32
rafasc sveinse: and don't forget you also have the stage. which is neither HEAD or wc.12:32
sveinse rafasc: Can you compare the stage with another branch?12:33
grawity yes, `git diff --cached` accepts a commit12:34
rafasc git diff --cached branchA;12:34
sveinse right, thanks12:34
→ jstimm joined12:34
rafasc or --staged12:34
no difference.12:34
→ BallChang-CN joined12:36
← Karyon left12:36
← m00sehead left12:36
→ RougeR joined12:37
← zulutango left12:38
← dimi1947 left12:42
← pfleck left12:43
→ gian-carlo joined12:44
← gian-carlo left12:44
→ Gurkenglas joined12:44
→ arraen joined12:46
← RougeR left12:48
← raymond left12:49
← MACscr left12:49
← z|bandito left12:49
→ z|bandito joined12:50
→ rain1 joined12:51
rain1 hi12:51
i was working on a pull request12:51
nikivi whats a good way to get the name of the repo being cloned? I want to write a script that will clone a repo and then instantly cd into it after clone12:51
rain1 and he said "Merge in the upstream changes I've committed since you started"12:51
how is that done?12:51
← jcarpenter2 left12:52
→ jcarpenter2 joined12:52
→ MACscr joined12:52
← leprechau left12:53
← selckin left12:54
← MACscr left12:54
_ikke_ rain1: Do you have a separate branch for your PR?12:55
rain1 no its just a clone12:55
← austin987 left12:55
← jelmer left12:55
_ikke_ So you work on master?12:55
rain1 yeah12:56
→ leprechau joined12:56
_ikke_ Did you fork the repo?12:56
rain1 yes12:57
_ikke_ So first you need to add the upstream repo (the one you forked from) as a remote12:57
→ jelmer joined12:58
→ wreed joined12:58
_ikke_ git remote add upstream <url>12:58
upstream is just a name, you can pick whatever you want12:59
→ MACscr joined13:00
→ zayafa joined13:00
← zayafa left13:01
→ AndresInSpace joined13:01
← duderonomy left13:02
→ m00sehead joined13:03
← Puppet_ left13:04
← borkr left13:04
← venmx left13:06
← cek left13:07
→ venmx joined13:08
floppydh is there a command that gives me back the absolute path to a branch on a remote? - like I'm on 'origin/cowbar' and then I do the command and it gives me back the URL of the remote 'origin' and then appends the 'cowbar' and such?13:09
guess it's not rocket science to build this oneself13:09
_ikke_ floppydh: It's not really a git concept13:09
floppydh _ikke_: remotes?13:09
_ikke_ remotes are13:09
floppydh I'm trying to diff two branches on 2 different remotes13:09
oh... I could just add the other remote13:09
I'm stupid13:09
→ wlemuel joined13:10
floppydh nvm13:10
→ arraen_ joined13:12
widp can I retroactively make a nested git repo a submodule?13:13
← wlemuel left13:13
_ikke_ how did you add the nested repo currently?13:13
widp just cloned them13:14
into the directory of an existing repo13:14
_ikke_ Ok, You can, but it's a couple of manual steps13:14
← arraen left13:15
widp so add an entry into the gitmodules file?13:15
_ikke_ that's step 113:15
git add the directory (without a final /)13:15
and officially, the .git directory of the submodule lives in the parent repo13:16
→ fr33domlover joined13:16
_ikke_ with a .git file pointing to it13:16
widp git add the directory of the cloned repo?13:16
→ crtcji joined13:16
_ikke_ yes13:16
widp but not its files, right?13:16
ahh, makes sense, thanks.13:17
→ arraen joined13:17
_ikke_ right, so that's why no final '/'13:17
subtle difference13:17
← Raging_Hog left13:18
widp thank you _ikke_13:18
_ikke_ after you comitted that, you probably also need to run git submodule init13:18
→ arraen__ joined13:19
gitinfo set mode: +v13:20
_flow__ It appears that a (interactive) rebase operation does not preserve the git-notes if the commit's sha1 changes, is there a setting to change that behavior?13:20
← arraen_ left13:20
→ borkr joined13:21
→ duderonomy joined13:22
← arraen left13:23
→ stutter_ joined13:25
← duderonomy left13:26
← settermjd left13:26
_ikke_ _flow__: I don't think there is13:27
ah sorry13:27
there is13:27
← rsrx left13:27
_ikke_ git config notes.rewrite.rebase true13:27
the man says that it's true bue default13:28
but there is also notes.rewriteRef13:28
'git config notes.rewriteRef refs/notes/commits'\ for example13:29
← houami left13:29
→ cek joined13:30
_flow__ _ikke_: ta13:30
cek another problem with submodules. I have updated their remote-urls (projects moved). Since then, I have pushed an updated .gitmodules. Now, how do I recheck them out on other hosts?13:30
git submodule update --remote ' doesn't update remote-url13:30
_ikke_ cek: git submodule sync13:31
cek yeah, sync helped. tnx13:31
← cur8or_ left13:31
→ SerialSmile joined13:31
→ settermjd joined13:33
→ Kumquatum joined13:33
cek despite that, another submod I have added doesn't appear in .git/modules/ on other host13:34
→ celo_0 joined13:34
cek `git submodule init` nailed it.13:34
← borkr left13:35
widp _ikke_: I did everything you said. How do I ensure I got everything right?13:35
_ikke_ git submodule status?13:35
and try to clone the repo13:36
widp right, thanks13:36
_ikke_ with --recursive13:36
→ shinnya joined13:37
← Nizumzen left13:39
→ houami joined13:39
← dsdeiz left13:42
skalpin Does anyone have an alias that will show me branches with 1000 commits or more behind master? ie. stale branches13:42
_ikke_ git branch -vv shows the status per branch13:42
skalpin remote branches I mean not locally13:43
_ikke_ oh13:43
skalpin sorry I should have been more clear13:43
_ikke_ It's hard to get this information remotely13:43
← venmx left13:43
← mad_hatter left13:44
← houami left13:44
← fatalhalt left13:44
→ dsdeiz joined13:45
→ fission6 joined13:47
→ duderonomy joined13:47
→ fatalhalt joined13:48
→ gian-carlo joined13:48
→ RougeR joined13:49
← RougeR left13:49
→ RougeR joined13:49
← duderonomy left13:49
→ _antares_ joined13:50
→ relipse joined13:50
← arraen__ left13:50
→ venmx joined13:51
→ duderonomy joined13:51
dcpc007 Hi, does anyone had a link or doc with arguments on why or when use git (or not ?).13:52
→ Masplus joined13:52
dcpc007 i try to implement git here for all the dev projects, even small ones13:52
and often got first answers like : pfff i work alone, no need... or it's only a small code, or it will take me too much time to learn this13:53
then, i try to make a "sales" documentation to show them in different scenario what git and tools above it could improve13:53
(same for : Gitlab or JIRA ? pfff we already have an excel shared sheet)13:54
← _antares_ left13:54
skalpin That's frustrating, I've had a difficult time selling git to my team in the past as well. If you force it on them they will make you solve all their problems. Sorry I have no solutions only condolences.13:56
← solarjoe4 left13:56
→ thiago joined13:56
← cdown left13:57
Hello71 if they never have to access old code versions, either they are shite coder or brilliant13:57
either way probably they don't need git13:57
→ cdown joined13:57
dcpc007 i can't force, i only have to get the right arguments. But i'm not a big specialist too13:57
i use it since years but as sysadmin13:57
Hello71 maybe the shite one will need it eventually, but first they need to learn to program13:57
dcpc007 lol i see some are creating smal app with IHM and ZERO tools to panage the code13:58
even works is on the C:\ without backup !13:58
but they are not real devs13:58
not their job13:58
← jstimm left13:59
dcpc007 for managers i prepare things like : "when when your guy will leave, how the successor will learn how the code wsas created, or why they choose this or this"13:59
→ shodan` joined14:00
→ _antares_ joined14:00
dcpc007 i found many ideas on many websites14:00
but boring to create a whole centralized prez14:00
→ kadoban joined14:02
→ durham joined14:02
→ adnn joined14:03
← adnn left14:03
furrymcgee why do you want others to use git14:03
← duderonomy left14:05
← fission6 left14:06
← muehle left14:07
→ morenoh149 joined14:08
→ rpage joined14:08
→ rajkane_prajta joined14:09
← Fernando-Basso left14:09
dcpc007 because currently then often can't manage codes14:09
rafasc dcpc007: sell the git magic.14:09
dcpc007 or using svn14:09
or worse, dated zip14:10
rafasc say that git bisect can find bugs itself.14:10
dcpc007 or multipe folders with dates, simili-versions or old, old.s, old.save_tmp14:10
lol :)14:10
rafasc (which is partially true)14:10
dcpc007 i think i'll keep this for later :)14:10
i start with basic uses first14:11
only things like create branches and commits14:11
and tags14:11
stage 0 :)14:11
rafasc dcpc007: they don't care about branches. Because they don't know the concept.14:11
← durham left14:12
→ kneeki|aa joined14:12
dcpc007 that's why i create learning sessions14:12
for bases14:12
rafasc if you say: oh, you can branch your code! they'll say whatever, i'll just make a new zip file. Way easier.14:12
dcpc007 no, because i show what are the differences14:13
rafasc dcpc007: you need to pass the message of *why* they should use git, not *how*.14:13
← dsdeiz left14:14
rafasc once they accept the *why*, the *how* is easy to teach.14:14
_ikke_ dcpc007: !parable14:14
gitinfo dcpc007: 'The git parable' provides some good reasoning behind git. http://tom.preston-werner.com/2009/05/19/the-git-parable.html14:14
oxymoron93 that is some good sentence14:15
→ gareppa joined14:15
_ikke_ ^^14:15
← farmer left14:15
← xPucTu4 left14:15
← kurkale61 left14:16
rafasc but if you don't spend the time clarifying the *why* you'll get: gooosh.. whhay is git soo hhhaarrd..... omgg I cann just upload this to my ftp server wtf is a remote anyways..14:16
→ ToBeCloud joined14:17
gitinfo set mode: +v14:17
dcpc007 rafasc, yes that was my query on the arguments :)14:17
thx ikke will read this :)14:18
→ durham joined14:18
oxymoron93 I should read that too, I just got into problem of teaching others...14:18
→ fission6 joined14:18
dcpc007 i start a first session to show the concept of SCM, and especially with git14:19
→ dsdeiz joined14:19
← dsdeiz left14:19
→ dsdeiz joined14:19
oxymoron93 "Most people try to teach Git by demonstrating a few dozen commands and then yelling “tadaaaaa.”" ... oops14:19
→ berendir joined14:19
rafasc I found that explaining the advantages of $git bisect, really helps people understand why they should care about the rest.14:19
dcpc007 i create a mindmapping note :)14:19
i speak even on more basics things tha bisect14:19
rafasc dcpc007: think bisect as a goal.14:20
dcpc007 only have sources structured and historized is a great gap14:20
yes, if you can make the tests functions :)14:20
_ikke_ though bisect is cool, the amount of time you can use it can be limited, depending on what kind of codebase you have14:20
rafasc it's very hard to teach git to someone who is unwilling to accept it.14:20
→ Avalchfan joined14:21
dcpc007 and i used git since some years without try any bisect14:21
and i don't imagine working without it anymore14:21
(git, not bisect)14:21
← gareppa left14:21
→ Nizumzen joined14:22
rafasc _ikke_: looks like we're getting bisect --first-parent, which will help a lot of projects that keep master buildable and testable. (but not necessarily the merged branches)14:22
→ jimmyrcom_ joined14:23
← oxymoron93 left14:23
→ elementalest joined14:24
← chele left14:25
→ Es0teric joined14:26
← RougeR left14:26
→ mad_hatter joined14:27
← smallville7123 left14:28
→ RougeR joined14:28
← jimmyrcom_ left14:28
→ houami joined14:29
← _antares_ left14:30
→ _antares_ joined14:31
← houami left14:33
← Avalchfan left14:34
← _antares_ left14:37
← madewokherd left14:37
← kyan left14:39
→ jottr joined14:39
→ smallville7123 joined14:41
← elementalest left14:42
→ Phylock joined14:44
→ Ishtv4n joined14:45
← Es0teric left14:45
→ kurkale6ka joined14:45
→ orbyt_ joined14:47
← cdown left14:48
→ PioneerAxon_ joined14:49
→ cdown joined14:49
← JeroenT left14:50
← durham left14:50
← PioneerAxon left14:50
→ durham joined14:51
→ hmoreno joined14:51
→ dragoonis joined14:52
→ Es0teric joined14:52
← morenoh149 left14:53
→ dunpeal joined14:54
→ Dougie187 joined14:55
dunpeal Hi. I'm trying to do the following: have two Git repos, A and B. B should be easily mergable into A, and vice-versa. Normally, they would be clones. However, B cannot see all of A's history.14:55
rafasc dunpeal: hard to do it with current implementation.14:56
← wandering_vagran left14:57
rafasc dunpeal: B can be a shallow clone of A, but preventing B from getting history from A is not trivial.14:58
← tkore left14:59
← rchavik left14:59
jedix how about this.. A and B are seperate git repos. someone pulls from A and squashes everything into one horrid glob of commits, and pushes to B?14:59
← orbyt_ left14:59
dunpeal jedix: not ideal, but could work I suppose.15:00
hmoreno → morenoh14915:01
rafasc dunpeal: you lose "easily mergeable" with that.15:01
← howdoi left15:01
dunpeal Let's say A and B are two entirely different repos (no common root). However, they track identical working trees. How elegant would it be to perform merges between them?15:02
← manuelschneid3r left15:03
← smallville7123 left15:03
rafasc keeping history separate?15:03
furrymcgee A must rebase and push only commit that should be seen by B15:03
← Cavallari left15:03
rafasc the easy way would be merge --allow-unrelated-histories; to merge the to histories into one.15:04
dunpeal rafasc: B shouldn't be able to see A's history from before it was split out.15:04
rafasc then forget what I said.15:04
dunpeal: why do you need this?15:05
→ orbyt_ joined15:05
dunpeal rafasc: some dumbass committed a sensitive password.15:06
← kadoban left15:06
← gunnarx left15:06
rafasc dunpeal: would be easier to !filter_sensitive15:06
gitinfo dunpeal: You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/15:06
← doug16k left15:06
→ gunnarx joined15:06
→ houami joined15:06
rafasc or just assume the password was compromised.15:07
→ austin987 joined15:07
← settermjd left15:07
→ madewokherd joined15:08
→ doug16k joined15:09
← treehug88 left15:09
← pnepe6 left15:10
→ manuelschneid3r joined15:10
← schleppel left15:10
← batrick left15:10
_ikke_ That anyway15:10
← BallChang-CN left15:10
← shodan` left15:10
→ settermjd joined15:11
← RougeR left15:11
← dragoonis left15:11
← houami left15:11
← manuelschneid3r left15:12
→ BallChang-CN joined15:12
→ _antares_ joined15:12
→ duderonomy joined15:12
← Es0teric left15:12
→ Es0teric joined15:13
rafasc when I said that I meant as "do not worry about posting an outdated password to the public."15:13
← _antares_ left15:16
→ greggerz joined15:16
→ diegoaguilar joined15:18
← KeyJoo left15:18
← diogenese left15:19
furrymcgee no, you should not post any passwords15:19
← linuxmodder left15:20
← wreed left15:20
← celo_0 left15:20
→ javlens joined15:22
→ cagomez joined15:23
← fr33domlover left15:24
→ immune2iocane joined15:25
→ joe3 joined15:25
→ Worldexe joined15:25
→ diogenese joined15:26
→ _antares_ joined15:27
→ raymond joined15:27
← duderonomy left15:27
← revoltingPeasant left15:28
→ duderonomy joined15:28
→ AnujSharma joined15:28
← duderonomy left15:29
← thiago left15:29
← crtcji left15:29
→ Neo4 joined15:29
→ batrick joined15:29
← abba left15:30
← mlopezviedma left15:31
← shinnya left15:31
→ mlopezviedma_ joined15:31
← widp left15:33
→ schleppel joined15:34
← szgyg left15:34
→ nielsk joined15:35
→ szgyg joined15:36
rafasc furrymcgee: why not?15:36
← berendir left15:36
→ dreiss joined15:37
← _antares_ left15:39
← Dougie187 left15:39
→ _antares_ joined15:40
← Arcaelyx left15:40
← AnujSharma left15:40
← schleppel left15:41
→ AnujSharma joined15:41
→ smallville7123 joined15:41
← mad_hatter left15:41
← nephyrin left15:41
→ schleppel joined15:42
→ nd joined15:42
← Xiti` left15:43
← rpage left15:43
→ Xiti joined15:44
← nd_ left15:45
→ Arcaelyx joined15:46
← riemann left15:47
← javlens left15:47
→ widp joined15:47
→ pfleck joined15:48
← schleppel left15:50
← orbyt_ left15:51
← flavius left15:51
→ fr33domlover joined15:51
← smallville7123 left15:51
← m00sehead left15:51
→ stewie925 joined15:52
→ jamiejackson joined15:52
← pfleck left15:53
→ flavius joined15:53
→ PHPanos joined15:53
PHPanos Hey guys15:53
→ Oatmeal joined15:53
→ manuelschneid3r joined15:54
PHPanos I'm trying to push a new remote branch to the repo, but I get the error that the branch does not match any and "failed to push some refs to repo-url"15:54
← dreiss left15:54
PHPanos this is the command I'm trying "git push -u origin feature/my-new-feature"15:55
→ boombatower joined15:55
_ikke_ PHPanos: what does git branch return?15:55
PHPanos @_ikke_ My master branch and my feature branch. I managed to push a new branch just now15:56
PHPanos Was it because the branch name wasn't exactly the same as the remote branch name?15:57
I mean, must they match?15:57
I think that was it15:57
← mosab left15:57
_ikke_ PHPanos: A different name does not cause the push to fail, git would just push the branch under the name you have locally15:58
← rfuentess left15:59
_ikke_ But you have to at least use the name as you called it locally, otherwise git does not know what to push15:59
but you can tell git to push branch A to remote branch B if you want15:59
← gian-carlo left15:59
→ durham_ joined16:00
PHPanos my local branch name was "my-feature" and I tried to push to feature/my-feature16:00
_ikke_ right16:00
so you could've done: git push -u origin my-feature:feature/my-feature16:00
That specifies that you want to push your local branch feature to remote branch feature/my-feature16:01
furrymcgee rafasc: bruteforce your passwords is easy if they have a pattern16:01
← PHPanos left16:01
→ PHPanos joined16:02
rafasc furrymcgee: don't use passwords that follow a pattern?16:02
PHPanos thanks16:02
← PHPanos left16:02
← Ishtv4n left16:03
← durham left16:04
← Tobbi_ left16:04
← fission6 left16:05
→ fission6 joined16:06
← tvw left16:07
→ raulp joined16:07
← zefferno left16:08
→ Naq joined16:09
→ kuzyn joined16:09
← Naq left16:09
← gunnarx left16:09
← stutter_ left16:10
→ jamiejackson99 joined16:11
→ stutter_ joined16:11
← jamiejackson left16:11
← _antares_ left16:11
→ thiago_ joined16:11
← stutter_ left16:12
→ m00sehead joined16:13
→ kes joined16:13
→ spacesuitdiver joined16:13
← jottr left16:14
← jamiejackson99 left16:14
→ jamiejackson99 joined16:14
→ schleppel joined16:15
← jamiejackson99 left16:15
→ _antares_ joined16:15
→ IanLiu joined16:16
→ jamiejackson joined16:17
← IanLiu left16:17
→ IanLiu joined16:18
← rajkane_prajta left16:18
← phluks left16:19
→ rpage joined16:19
← schleppel left16:20
→ joe4 joined16:21
← immune2iocane left16:21
→ terravires joined16:22
→ nitric joined16:23
← Es0teric left16:23
→ schleppel joined16:23
terravires hi all, I'm a solo dev working on a project. I've got to the point where I'd like to branch "stable" and a "dev" branch. Would the recommend way be to create two branches off master?16:24
← joe3 left16:24
rafasc terravires: is master stable?16:25
terravires rafasc, right now, yes it's stable. I haven't created the branches yet16:25
rafasc then yes.16:25
terravires Should master just be "stable" and "dev" branch on its own?16:25
→ nuka-cola_ joined16:26
grawity some projects do that, some do the opposite16:26
Zarthus if you want a "stable" and "dev" branch (literal names), your next question would be "what to do with master16:26
terravires Yeah, from my reading there are a lot of different ways. So was a bit confused16:26
grawity so the answer really is "whichever you prefer"16:26
rain1 how do icopy bugs from one github repo to a fork?16:26
← Masplus left16:26
grawity as Git does not work any differently in either case16:26
rafasc rain1: you don't.16:27
grawity by convention, when someone else `git clones` your repo, they get "master" checked out, but even that can be changed16:27
← James0r2_ left16:27
grawity beyond that, there's no technical advantage16:27
← Oatmeal left16:28
← joe4 left16:29
→ licnep joined16:29
terravires What seems to make sense to me is creating a branch for each release. Say branch for 1.0, 1.2, etc. Then dev branches would get merged into master. Does that sound correct?16:29
→ xPucTu4 joined16:29
→ linuxmodder joined16:32
← linuxmodder left16:33
rafasc terravires: really depends. Each project has a different workflow.16:33
← Nizumzen left16:33
rafasc usually tags are used to denote releases.16:33
→ linuxmodder joined16:33
← floppydh left16:33
rafasc some people like to follow !gitflow16:34
gitinfo The description of the gitflow branch workflow model is at http://nvie.com/posts/a-successful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow See http://sethrobertson.github.com/GitBestPractices/#workflow for other workflow suggestions/references16:34
terravires rafasc, so my understanding of a tag would just point to a commit? Wouldn't you need a branch if you wanted to then add any fixes for that release?16:34
← mikecmpbll left16:34
rafasc but it may be overkill.16:34
← SerialSmile left16:34
terravires lol, yeah I've been reading few of those links. Kind of what got me confused. :)16:34
rafasc what you said is correct.16:35
← bahamut24 left16:35
→ orbyt_ joined16:36
grawity yes, tags for specific releases, branches for series (e.g. stable-1.0.x branch, stable-1.2.x branch))16:36
rafasc git help workflows16:36
← kurkale6ka left16:36
terravires Ok, then lets say I have stable-1.0, master, and dev branches. If I found a critical bug and needed to fix stable, would I commit that change to stable-1.0 and dev branches only?16:37
I'm thinking that when ready, dev gets merged into master, and then a stable branch is made from that?16:38
→ ok91 joined16:38
← settermjd left16:42
← ok91 left16:42
→ ShekharReddy joined16:44
← amirpro left16:44
→ Oatmeal joined16:45
→ gian-carlo joined16:45
→ stutter_ joined16:45
← glebihan left16:48
→ settermjd joined16:48
← theoceaniscool left16:48
← IanLiu left16:48
→ pfleck joined16:49
← igemnace left16:49
→ ferdna joined16:49
→ applecrumble joined16:49
→ kfoonamalik joined16:50
→ Analatorian joined16:50
← Oatmeal left16:51
← relipse left16:52
→ sanscoeur joined16:53
→ akushner joined16:53
← jamiejackson left16:54
→ livingstn joined16:56
→ regedit joined16:58
← hryniuk left16:58
← durham_ left16:58
→ durham joined16:59
→ Fernando-Basso joined17:00
← schleppel left17:01
→ arraen joined17:02
← livingstn left17:02
← _ADN_ left17:03
← settermjd left17:05
← BallChang-CN left17:06
← arraen left17:06
← TomyWork left17:07
→ muelleme joined17:07
→ IanLiu joined17:07
← _antares_ left17:07
→ schleppel joined17:07
→ Alystair joined17:08
Alystair Hey all, slowly learning best practices. I only tag master with release version after a merge, not the active dev branch, right17:08
→ Praxi joined17:09
j416 Alystair: that sounds like a sane approach.17:09
→ _antares_ joined17:09
Alystair it's just that I don't know how tags work - if I create a tag on a branch and merge that branch, does the tag come along with it?17:10
j416 tags don't belong to branches.17:10
Alystair oh17:10
← qpdb left17:10
j416 a tag references a commit.17:10
Alystair it's like a shortcut type of thing! got it17:10
j416 whether or not that commit is on some branch or not is irrelevant17:10
Alystair ok I can see why putting a version number tag on a branch would be a bad idea17:10
j416 you can't put a tag on a branch.17:11
also, annotated tags are a good idea. That way you can record a message along with the tag, as well as record when the tag was created and who created it. You also have the option to sign tags, if needed.17:11
Alystair I'm in the gitlab interface right now and "new tag" allows me to select non-master branch17:11
j416 man git-tag for more info on how to create an annotated tag (-a).17:12
gitinfo the git-tag manpage is available at https://gitirc.eu/git-tag.html17:12
j416 sorry, I have no idea how gitlab works with tags.17:12
← muelleme left17:12
j416 I'd recommend doing it on the cmdline.17:12
if you tag a branch, that just means the tag will be referencing whatever commit that branch happens to currently reference.17:13
Alystair yeah it gives me an area to put in a message and release notes which are a gitlab feature17:13
j416 i.e., the branch name is just a shortcut to name a specific commit.17:13
Alystair yeah that's how I thought it'd work, cool17:13
← applecrumble left17:13
j416 which is what branch names are -- just easy ways to keep track of the last commit of each branch17:13
_ikke_ both tags and branches are what git calls refs17:14
→ Oatmeal joined17:14
_ikke_ a branch called foo is fully qualified refs/heads/foo, a tag called v1, is fully quallified refs/tags/v117:14
git just treats tags differently from branches17:15
→ crtcji joined17:17
← _antares_ left17:18
→ vdv joined17:19
← Neo4 left17:20
→ Regon joined17:20
← venmx left17:21
→ _antares_ joined17:22
→ duderonomy joined17:25
→ dreiss joined17:26
→ jottr joined17:26
← ToBeCloud left17:27
→ wootehfoot joined17:27
→ wreed joined17:27
Alystair hmm I just cloned and I'm not seeing my dev branch, only * master17:28
→ Mattiaslndstrm joined17:30
_ikke_ Alystair: git branch -r17:30
Alystair: you'll see something like origin/<branchname>17:30
Alystair: then you can just do git checkout <branchname>17:30
Alystair oh cool all I had to do was git checkout branchName and it... magically changed? o_O17:31
wow!17:31
_ikke_ Alystair: when you clone a repository, git only creates 1 'local' branch, the default branch, which is generally master17:31
← xPucTu4 left17:31
_ikke_ You already have the other branches, but then in a different form17:31
Alystair as soon as I issue the git checkout command it magically switches all the stuff around :o17:31
_ikke_ yeah, that's a git do-what-i-mean command17:32
Alystair that's so frikkin' rad17:32
_ikke_ note that it won't work if you have more than one remote with the same branches17:32
→ ok91 joined17:33
Alystair well as long as when more devs start making their own branches they are uniquely named it'll work out17:33
not that I need to checkout switch ever again17:33
_ikke_ You'll probably need to eventually17:34
But you can always directly checkout local branches17:34
← crtcji left17:35
← duderonomy left17:35
← stutter_ left17:36
→ Have-Quick joined17:36
→ TomyLobo joined17:37
→ jnavila joined17:37
→ stutter_ joined17:37
→ Narrat joined17:40
→ James0r joined17:40
← Arcaelyx left17:40
← Alystair left17:40
→ dpyro joined17:40
→ xPucTu4 joined17:41
→ Arcaelyx_ joined17:41
← Schrostfutz left17:41
→ borkr joined17:44
→ Cavallari joined17:44
← wreed left17:45
→ theoceaniscool joined17:48
→ royal_screwup21 joined17:49
→ wreed joined17:49
royal_screwup21 I'm using an access token to allow my IDE to access my repository (for syncing settings). It's pushed the settings to the repo. Now, will I need the same access token when I want to import my settings from github?17:50
→ Nizumzen joined17:50
→ Es0teric joined17:50
← AnujSharma left17:50
royal_screwup21 or can I generate another one?17:50
_ikke_ royal_screwup21: An access token should just be that, give you access17:51
royal_screwup21 _ikke_: ah okay. I thought an access token was unique to a repository. So if I delete my access token, generate new one, my IDE will still be able to access the repo17:52
← Impaloo left17:52
→ Impaloo joined17:52
← nikheizen left17:53
← ok91 left17:53
→ _ADN_ joined17:53
→ ok91 joined17:54
_ikke_ They can be unique per repo, but it's not an encryption key or something like that17:54
← Impaloo left17:56
→ coco joined17:56
coco → Guest1328317:57
→ shabius_ joined17:57
→ Impaloo joined17:57
← ok91 left17:58
← quite_ left17:58
← shabius_ left17:58
← shabius left17:59
→ quite_ joined18:00
← MarioBranco left18:01
→ shabius joined18:01
→ applecrumble joined18:03
→ blackmesa joined18:05
→ jstimm joined18:05
← Guest13283 left18:07
→ c0c0 joined18:08
→ dviola joined18:09
→ robattila256 joined18:10
← _antares_ left18:12
← pfleck left18:13
← Mattiaslndstrm left18:14
→ WeirdTolkienishF joined18:14
← WeirdTolkienishF left18:14
→ WeirdTolkienishF joined18:14
→ dfee joined18:14
← robattila256 left18:15
dfee i've made significant changes, but i want to commit it as a new branch (I didn't have the foresight until I began making changes). how would i do this?18:15
grawity git checkout -b foo18:15
then continue with committing18:15
← Tobbi left18:16
dfee any change i'll lose the changes i've made?18:16
grawity with that exact command (substitute the branch name with your own), zero18:16
dfee grawity: excellent. thanks18:16
→ robattila256 joined18:17
rain1 can you help me merge changes from another fork to my fork?18:17
→ ringer1 joined18:17
rain1 I did this: git remote add yhirose https://github.com/yhirose/linenoise.git18:17
but git pull yhirose refs/remotes/origin/utf8-support errors, couldn't find remote ref18:17
git show-ref in his fork prints: refs/remotes/origin/utf8-support im not sure how to address it18:17
grawity those are two separate repositories18:18
you're fetching from github, but `git show-ref` is being run in yhirose's own PC18:18
so what yhirose's local repo refers to as "refs/remotes/origin/utf8-support", is a regular branch "refs/heads/utf8-support" on Github18:19
→ sameerynho joined18:19
← [1]ringer1 left18:19
grawity you can see it with `git ls-remote yhirose` or `git remote show yhirose`, and get it with `git pull yhirose utf8-support`18:19
rain1 nice! thank you very much18:19
i understand it now, and applied the changes18:20
grawity and if you meant that *you* cloned yhirose/linenoise and ran git show-ref... the explanation is still exactly the same.18:20
← djapo left18:20
→ Sasazuka joined18:20
← flavius left18:21
→ Mattiaslndstrm joined18:21
→ djapo joined18:21
→ _antares_ joined18:22
← sauvin left18:23
→ freimatz joined18:23
→ flavius joined18:23
← Nizumzen left18:24
→ energizer joined18:24
← kes left18:27
← dreiss left18:27
← _antares_ left18:27
← rnsanchez left18:29
← manuelschneid3r left18:30
← terravires left18:31
→ venmx joined18:31
← wreed left18:32
← sim590 left18:33
→ amirpro joined18:33
→ pfleck joined18:34
← royal_screwup21 left18:36
→ sim590 joined18:36
→ Schrostfutz joined18:38
→ dreiss joined18:39
Arcaelyx_ → Arcaelyx18:40
← Oatmeal left18:40
← sim590 left18:41
← jottr left18:41
← kuzyn left18:43
← stutter_ left18:44
→ Alystair joined18:44
→ rosspab joined18:46
→ duderonomy joined18:46
← rosspab left18:47
→ sim590 joined18:47
← linuxmodder left18:48
→ jimmyrcom_ joined18:48
← duderonomy left18:49
← dendazen left18:50
← Worldexe left18:50
← pfleck left18:51
→ duderonomy joined18:53
→ stutter_ joined18:55
← Es0teric left18:55
→ fabioluciano joined18:57
← orbyt_ left18:57
← c0c0 left18:58
→ nowhereman_ joined19:01
→ pfleck joined19:02
← ShekharReddy left19:05
← venmx left19:05
→ jottr joined19:07
← pks left19:09
→ pks joined19:10
→ manuelschneid3r joined19:10
→ rominronin joined19:11
← jungsubk left19:12
→ jameser joined19:12
← edwardly left19:12
→ Es0teric joined19:12
← plexigras left19:13
← mattcen left19:15
← jameser left19:16
← pfleck left19:16
→ edwardly joined19:17
← edwardly left19:17
→ edwardly joined19:17
→ mattcen joined19:17
→ KeyJoo joined19:18
→ nowhere_man joined19:19
← nowhereman_ left19:19
← nitric left19:20
→ vovs03 joined19:20
→ pfleck joined19:20
→ Nizumzen joined19:25
← amirpro left19:25
← jedix left19:25
← duderonomy left19:26
→ amirpro joined19:26
→ nitric joined19:26
← regedit left19:27
→ dp joined19:28
→ _antares_ joined19:28
→ bachler joined19:29
→ orbyt_ joined19:31
← cdown left19:32
← infinisil left19:33
← _antares_ left19:33
→ infinisil joined19:33
← jimmyrcom_ left19:34
→ jimmyrcom_ joined19:36
→ ustekne joined19:38
← fission6 left19:40
→ Karyon joined19:42
← infinisil left19:43
→ infinisil joined19:44
→ m0viefreak joined19:45
→ jungsubk joined19:45
ws2k3 → yctn_19:51
→ beefjoe joined19:51
→ fission6 joined19:53
← fission6 left19:54
← netlar left19:54
→ tvw joined19:59
← dreiss left19:59
→ jedix joined20:00
← m00sehead left20:01
← madewokherd left20:02
← rominronin left20:04
→ dendazen joined20:04
← Schrostfutz left20:04
← emg left20:05
← imp left20:05
← borkr left20:11
← Nizumzen left20:11
← amirpro left20:12
→ pfloyd joined20:13
pfloyd What's the easiest way to identify a large commit? Not just a large file, could have been a commit of say 1,000,000 files of 1M each or something vs. just a 1GB file. I found some instructions using git rev-list and git verify-pack but they seem specific to finding a big file.20:14
_ikke_ pfloyd: not sure if it helps, but github release a tool that could identify potential issues with repositories regarding large objects20:15
← IanLiu left20:15
→ dreiss joined20:15
→ qswz joined20:15
qswz what's the best way to ignore tags when doing git pull?20:15
→ Cavallari1 joined20:15
qswz I want just master actually20:15
← nowhere_man left20:16
pfloyd _ikke_: is it "git-sizer" (https://blog.github.com/2018-03-05-measuring-the-many-sizes-of-a-git-repository/) ?20:16
← freimatz left20:16
→ Schrostfutz joined20:17
_ikke_ pfloyd: yes, that's what I meant, couldn't find it anymore20:17
grawity git rev-list a..b | while read c; do git ls-tree -r -l $c | awk -v c=$c '{n += $4} END {print n, c}' | numfmt --to=si; done20:17
← j7k6 left20:18
rafasc qswz: have you tried searching man git pull for an option to pull with no-tags?20:18
gitinfo qswz: the git-pull manpage is available at https://gitirc.eu/git-pull.html20:18
→ j7k6 joined20:18
← Cavallari left20:18
Cavallari1 → Cavallari20:18
← wootehfoot left20:19
→ Cavallari1 joined20:19
→ regedit joined20:19
pfloyd _ikke_: thanks! works great20:19
_ikke_ pfloyd: yw20:19
.trigger_edit git_sizer A tool to find potential issues with repositories from github, See: https://blog.github.com/2018-03-05-measuring-the-many-sizes-of-a-git-repository/20:20
gitinfo _ikke_: Okay.20:20
← jstimm left20:20
→ Oatmeal joined20:22
← Cavallari left20:23
→ Cavallari joined20:23
← Cavallari1 left20:24
← Fernando-Basso left20:25
← jottr left20:27
qswz thanks20:28
← dendazen left20:29
qswz I'd love a gotconfig option tho20:29
.gitconfig*20:29
https://stackoverflow.com/a/37165609/3183756 looks good20:29
→ nivag joined20:30
→ _antares_ joined20:30
qswz well explained in the man page too20:30
→ nephyrin joined20:30
← Oatmeal left20:30
← jungsubk left20:33
→ doubtful joined20:34
← _antares_ left20:35
rafasc qswz: that still pulls tags though.20:35
→ madewokherd joined20:35
rafasc qswz: git clone <url> --single-branch master --no-tags20:38
→ mikecmpbll joined20:44
← Typhon left20:46
→ nowhere_man joined20:47
→ crtcji joined20:47
→ hmoreno joined20:48
← crose left20:48
→ _antares_ joined20:50
← rpage left20:50
← morenoh149 left20:51
← _antares_ left20:51
← infinisil left20:51
→ infinisil joined20:52
→ dendazen joined20:52
→ linuxmodder joined20:52
← linuxmodder left20:53
→ linuxmodder joined20:54
← crtcji left20:54
← linuxmodder left20:55
→ Typhon joined20:55
→ linuxmodder joined20:55
→ Cavallari1 joined20:56
← Phylock left20:58
← blackmesa left20:58
→ duderonomy joined20:59
→ blackmesa joined20:59
← duderonomy left20:59
← Cavallari left21:00
Cavallari1 → Cavallari21:00
← doubtful left21:00
← jnavila left21:01
→ Tobbi joined21:01
→ RougeR joined21:03
→ muelleme joined21:04
→ phluks joined21:06
→ Oatmeal joined21:08
majuk Hey all. So I made a commit to 'master' on my project that I meant to create a new branch for [as it turns off some functionality to work around a temporary limitation of the system].21:10
← orbyt_ left21:10
grawity create a new branch off master now, then roll back master to 1 commit ago21:10
majuk graingert: ok, the rollback bit, `git reset` command?21:10
or something else?21:11
← muelleme left21:12
← stutter_ left21:13
← hmoreno left21:13
→ jnavila joined21:14
← jnavila left21:15
← gian-carlo left21:16
← Oatmeal left21:17
← jimmyrcom_ left21:18
osse majuk: reset is fine21:19
← pfleck left21:19
majuk I just did it with rebase. But of course I forgot to switch off the new branch before rebasing so now I'm just chasing my tail.21:20
#fun21:20
→ jimmyrcom_ joined21:20
← vovs03 left21:20
← Cavallari left21:22
← Es0teric left21:25
→ orbyt_ joined21:25
→ kyan joined21:26
← dfee left21:26
→ gunnarx joined21:27
← TomyLobo left21:27
oprypin majuk, a branch is just a pointer to a commit, nothing more. just move some pointers around, it's totally fine :D21:28
majuk oprypin: Yea, it would be, but then I need to be able to re-push to bitbucket21:29
So I'm using revert for the master tree. One more commit. Little ugly but se la vie.21:29
oprypin good21:29
← RougeR left21:29
← dp left21:30
→ jottr joined21:30
← Have-Quick left21:32
graingert majuk: have you looked in git reflog?21:32
→ m00sehead joined21:32
← djapo left21:32
graingert majuk: maybe delete the repo and clone out again?21:33
← Redfoxmoon left21:33
majuk Yea. I've got the branch I want, now it's just getting master to the right place. Almost there.21:33
→ RougeR joined21:33
majuk mebbe21:34
→ livingstn joined21:34
→ djapo joined21:34
← livingstn left21:35
← jottr left21:36
majuk Yea, revert got it. Think I'm good here. Thanks for y'alls input21:36
← energizer left21:37
→ energizer joined21:37
← phluks left21:39
← rafasc left21:40
→ PioneerAxon joined21:40
← PioneerAxon_ left21:41
← energizer left21:42
→ energizer joined21:42
← Regon left21:43
→ Redfoxmoon joined21:43
→ dfee joined21:44
← Redfoxmoon left21:48
→ Redfoxmoon joined21:48
← energizer left21:49
→ energizer joined21:50
← greggerz left21:50
← energizer left21:50
→ energizer joined21:50
← rain1 left21:51
→ keepguessing joined21:53
← tombusby left21:53
← spacesuitdiver left21:54
keepguessing I have a file that is listed in one of the folders in git ignore. How do I force pull that file?21:54
→ Arcaelyx_ joined21:54
→ tombusby joined21:54
keepguessing All searches on google kind of tell me how to use gitignore21:57
← Arcaelyx left21:57
← energizer left21:58
→ energizer joined21:58
SporkWitch !checkout22:00
gitinfo checkout does two different things! (1) no file/path argument: 'git checkout <ref>' = switches to a branch or commit. Uncommitted changes are carried over; if they don't apply cleanly the whole operation rolls back. (2) 'git checkout [<commit>] -- <path>' = overwrites the given files/paths with different versions, from <commit> or (if not given) from the index.22:00
← majuk left22:00
SporkWitch keepguessing: ^22:00
keepguessing hmm I tried something like git checkout HEAD dir/file and it did not work.22:01
Should try to find the revision where it was changed?22:01
SporkWitch does that file exist in that commit?22:01
keepguessing SporkWitch: ^^^^22:01
cbreak git checkout X Y checks out file Y from commit X22:01
you have to specify the commit that contains the state you want to have22:02
keepguessing SporkWitch: cbreak Ah ok.22:02
SporkWitch you say it's in gitignore, so you'd have had to have added the file in a previous commit, i believe it would no longer be included in future commits, but i'm not 100% sure, it could just stop tracking changes but keep it22:02
← schleppel left22:02
cbreak .gitignore only applies to untracked files22:02
if a file is tracked, then .gitignore has no relevance at all22:03
git can't track and ignore a file at the same time, so it'll just track it if there's conflicting requests :)22:03
SporkWitch ah okay, wasn't sure; normally you do it before it ever gets added, heh22:03
cbreak you can add ignored file with git add -f22:03
michael2 Hi all. every time I run `git checkout somebranch', git checkout returns [fatal: Unable to create '/.git/index.lock': File exists] - this happens repeatedly in multiple repos. does anyone know what the cause of this is?22:03
keepguessing cbreak: thanks. I will try find the commit where it was last changed.22:04
SporkWitch michael2: most likely, something crashed during a previous operation22:04
cbreak michael2: sounds like the index.lock file exists22:04
do you use git concurrently on the same repo?22:04
→ jottr joined22:04
cbreak keepguessing: git log --follow -- filename22:04
keepguessing: that'll tell you all the commits that change that file22:04
SporkWitch cbreak: handy! didn't know about that one :)22:05
keepguessing cbreak: thanks.22:05
cbreak you only need --follow if you want to track it across renames22:05
you can throw in -p if you want to see the changes22:06
← CEnnis91 left22:07
→ amirpro joined22:08
michael2 SporkWitch: cbreak. how does a git process crash? that would imply git was an ongoing running process, like a browser or text editor or a daemon/service right? but git is usually just invoked, then exits a few milliseconds later (like say grep) - so how can git crash without me noticing?22:08
SporkWitch wtf do you think invoking it does...?22:09
michael2 it starts the program22:09
cbreak michael2: if it runs, it can crash22:09
← jottr left22:09
cbreak some of the things git does can take a long time22:09
like a big checkout, a fetch / push, or also a repack22:09
michael2 but they are all interactive - im the one invoking them22:10
SporkWitch invoke program → do stuff 1 → create index.lock → do stuff 2 → delete index.lock → do stuff22:10
cbreak the lock file exists to prevent multiple git processes from changing the index at the same time22:10
← energizer left22:10
cbreak it exists either because an other git is running22:10
michael2 It runs right in front of me. I would know if it crashed/error exited22:10
cbreak or because it ran and crashed22:10
← bachler left22:12
michael2 yeah, so the lock file does what all lock files do. that doesn't explain the fact that I would know if the program suffered some failure22:12
SporkWitch anyone able to remote into your machine? It'll lock for a remote pushing to it, too22:12
→ jameser joined22:12
michael2 no, no one else is able to remote in22:12
SporkWitch the presence of the lock file and your ignorance of when it showed up demonstrates incontravertibly that you did NOT know lol22:13
it didn't just magically appear :)22:13
← tvw left22:13
→ bachler joined22:13
michael2 yeah, and what I dont' know about git could fill a warehouse. problem is findout out what is causing this22:14
as its happening repeatedly - 4, 5 times a day22:14
SporkWitch 1) you, 2) legitimate automation somewhere, 3) malware, 4) malicious user, 5) someone with access trolling you22:14
michael2 i suspect 2)22:15
SporkWitch 3 and 4 are least like, 1 is most likely22:15
← mooasaurus left22:15
SporkWitch followed closely by 522:15
→ mooasaurus joined22:15
← crimson_king left22:16
← jameser left22:17
michael2 5) is like if i pay the bitcoin ransom to the crypto locker virus on my system - git will suddenly allow me to checkout different branches? otherwise I use a git wrapper: vim-fugitive. which prob does many git plumbing operations - could be that22:19
← Tobbi left22:20
michael2 and if git failed - the wrapper would be blocking error messages from reaching me22:20
← pfloyd left22:21
→ fairuz joined22:22
← mattcen left22:22
← fabioluciano left22:23
← dunpeal left22:24
michael2 as another side question. If a repository contains submodules - and that submodules upstream contains new commits - what is the correct way to fetch those updates?22:24
← vdv left22:24
← linuxmodder left22:25
michael2 1) cd into the submodule and run the usually fetch + merge etc commands22:25
→ linuxmodder joined22:25
michael2 2) run some command at the parent repo through the `git submodule ...' sub-command?22:26
→ Neo4 joined22:27
→ mattcen joined22:27
→ IanLiu joined22:32
← linuxmodder left22:33
← KeyJoo left22:34
→ spacesuitdiver joined22:36
← dendazen left22:36
← dege left22:41
← AndresInSpace left22:42
→ YuGiOhJCJ joined22:43
← brethil left22:44
→ wisp_ joined22:44
→ Have-Quick joined22:45
→ brethil joined22:46
← inovas left22:48
← Mir4g3 left22:49
→ Mir4g3 joined22:50
← leeN left22:50
→ duderonomy joined22:51
← sz0 left22:53
← duderonomy left22:53
→ inovas joined22:59
← nuka-cola_ left22:59
← ferdna left23:00
← IanLiu left23:01
→ adambrenecki joined23:01
← cek left23:01
← sanscoeur left23:01
← kiltzman left23:03
← thiago_ left23:03
← finalbeta left23:04
→ kiltzman joined23:05
← fairuz left23:06
→ thiago joined23:06
← Schrostfutz left23:08
← volestorm_ left23:09
→ volestorm joined23:09
← akushner left23:11
→ akushner joined23:11
← _ikke_ left23:11
← blackmesa left23:14
→ rafasc joined23:15
→ venmx joined23:15
← stamina left23:22
→ g00s joined23:23
→ jottr joined23:25
← volestorm left23:25
→ volestorm joined23:26
← Gurkenglas left23:27
← Code_Bleu left23:29
← jottr left23:30
← dfee left23:30
→ _ikke_ joined23:31
← diogenese left23:33
→ CEnnis91 joined23:33
← beefjoe left23:37
← englishm_work left23:42
← drodger left23:44
→ _antares_ joined23:45
← mikecmpbll left23:47
← orbyt_ left23:48
→ goweol joined23:48
← dreiss left23:49
→ drodger joined23:49
← _antares_ left23:50
→ diogenese joined23:50
← qswz left23:50
← applecrumble left23:52
← _ikke_ left23:53
→ Code_Bleu joined23:54
→ dendazen joined23:55
→ dfee joined23:58
→ alhariel joined23:58
← Code_Bleu left23:59
← thiago left23:59

Logs Search ←Prev date Next date→ Channels Documentation