| 2022-07-23 |
| ← cousteau left | 00:01 |
| ← pulse left | 00:03 |
| → atrigent_ joined | 00:04 |
| ← justmatt left | 00:10 |
| ← ramblebamble left | 00:10 |
| → ferdna joined | 00:11 |
| ← rgrinberg left | 00:11 |
| ← de-facto left | 00:12 |
| → de-facto joined | 00:12 |
| ← rama left | 00:13 |
| ← lucasta left | 00:17 |
| ← Sasazuka left | 00:18 |
| → lucasta joined | 00:23 |
| → squirrel joined | 00:27 |
| ← kenanmarasli left | 00:27 |
| → Sasazuka joined | 00:28 |
| → dflick__ joined | 00:29 |
| ← dflick_ left | 00:32 |
| ← Sasazuka left | 00:33 |
| ← lolok left | 00:37 |
| → pulse joined | 00:40 |
| ← elkalamar left | 00:42 |
| ← stewie925 left | 00:42 |
| ← forgotmynick left | 00:53 |
| ← cdown left | 00:57 |
| ← lxsameer left | 00:59 |
| → bn_work joined | 01:01 |
| → rgrinberg joined | 01:02 |
| ← kantlivelong left | 01:06 |
| ← Betal left | 01:07 |
| → kantlivelong joined | 01:11 |
| ← kantlivelong left | 01:17 |
| → madewokherd joined | 01:19 |
| → kantlivelong joined | 01:19 |
| ← madewokherd` left | 01:20 |
| ← atrigent_ left | 01:21 |
| ← moldorcoder7 left | 01:24 |
| ← rgrinberg left | 01:24 |
| ← umbramalison left | 01:26 |
| → umbramalison joined | 01:26 |
| → rgrinberg joined | 01:29 |
| → bambanxx joined | 01:30 |
| → vysn joined | 01:37 |
| → Sulky joined | 01:39 |
| ← kevr left | 01:45 |
| → kevr joined | 01:46 |
| ← mat001 left | 01:47 |
| → mat001 joined | 01:48 |
| → Vonter joined | 01:48 |
| ← Yruama left | 01:48 |
| ← dflick__ left | 01:54 |
| → vdamewood joined | 01:55 |
| ← rickay left | 02:02 |
| ← ferdna left | 02:04 |
| ← bindu left | 02:07 |
| ← de-facto left | 02:07 |
| ← fling left | 02:07 |
| ← kevr left | 02:07 |
| ← crabbedhaloablut left | 02:07 |
| ← GNUmoon left | 02:07 |
| ← adanwan left | 02:07 |
| ← gxt left | 02:07 |
| ← FinnElija left | 02:07 |
| ← ghost43 left | 02:07 |
| ← chexum left | 02:07 |
| → crabbedhaloablut joined | 02:10 |
| → chexum joined | 02:10 |
| → de-facto joined | 02:10 |
| → adanwan joined | 02:10 |
| → ghost43 joined | 02:10 |
| → FinnElija joined | 02:10 |
| → fling joined | 02:10 |
| → kevr joined | 02:10 |
| → bindu joined | 02:10 |
| ← pulse left | 02:11 |
| → Strom joined | 02:16 |
| ← de-facto left | 02:16 |
| ← kevr left | 02:16 |
| ← bindu left | 02:16 |
| → bindu joined | 02:17 |
| → kevr joined | 02:17 |
| → de-facto joined | 02:17 |
| ← ackyshake left | 02:23 |
| ← ghost43 left | 02:25 |
| → ghost43 joined | 02:25 |
| ← FinnElija left | 02:27 |
| → finn_elija joined | 02:27 |
| finn_elija → FinnElija | 02:27 |
| ← lucasta left | 02:28 |
| ← FinnElija left | 02:29 |
| → lucasta joined | 02:29 |
| → FinnElija joined | 02:30 |
| ← Murr left | 02:35 |
| → Murr joined | 02:35 |
| ← Strom left | 02:37 |
| → Xenguy joined | 02:39 |
| ← rgrinberg left | 02:42 |
| ← dsrt^ left | 02:44 |
| ← squirrel left | 02:46 |
| → sakitami joined | 02:47 |
| ← kevr left | 02:52 |
| → kevr joined | 02:52 |
| → Leonarbro joined | 02:53 |
| ← bindu left | 02:58 |
| ← FinnElija left | 02:58 |
| ← kevr left | 02:58 |
| ← ghost43 left | 02:58 |
| → junktext joined | 02:59 |
| ← junktext_ left | 03:00 |
| → hbautista joined | 03:04 |
| → ghost43 joined | 03:06 |
| → kevr joined | 03:06 |
| → bindu joined | 03:07 |
| → FinnElija joined | 03:07 |
| ← Welp left | 03:09 |
| ← ghost43 left | 03:10 |
| → ghost43 joined | 03:11 |
| ← vysn left | 03:16 |
| → Crassus joined | 03:22 |
| → nate4 joined | 03:23 |
| ← nate4 left | 03:29 |
| ← pretty_dumm_guy left | 03:34 |
| ← terminaldweller left | 03:35 |
| → terminaldweller joined | 03:35 |
| ← de-facto left | 03:37 |
| ← fling left | 03:37 |
| ← adanwan left | 03:37 |
| ← crabbedhaloablut left | 03:37 |
| ← chexum left | 03:38 |
| → dflick__ joined | 03:39 |
| ← tyson2 left | 03:40 |
| → hoochmonger joined | 03:42 |
| → fling joined | 03:45 |
| ← sudoforge left | 03:48 |
| → tsraoien joined | 03:48 |
| → de-facto joined | 03:52 |
| ← de-facto left | 03:52 |
| ← regedit left | 03:53 |
| ← gast0n left | 03:54 |
| → de-facto joined | 03:55 |
| ← tsraoien left | 03:59 |
| → lolok joined | 04:02 |
| → off^ joined | 04:04 |
| ← sakitami left | 04:05 |
| → bond joined | 04:06 |
| → Welp joined | 04:08 |
| → crabbedhaloablut joined | 04:12 |
| → chexum joined | 04:12 |
| → adanwan joined | 04:12 |
| ← bket left | 04:16 |
| ← adanwan left | 04:16 |
| → adanwan joined | 04:17 |
| ← FinnElija left | 04:18 |
| ← bindu left | 04:18 |
| ← ghost43 left | 04:18 |
| ← fling left | 04:18 |
| ← de-facto left | 04:18 |
| ← kevr left | 04:18 |
| → bket joined | 04:19 |
| → fling joined | 04:19 |
| → de-facto joined | 04:19 |
| → ghost43 joined | 04:19 |
| → kevr joined | 04:19 |
| → FinnElija joined | 04:19 |
| → bindu joined | 04:19 |
| ← de-facto left | 04:27 |
| → de-facto joined | 04:28 |
| ← lolok left | 04:39 |
| → lolok joined | 04:39 |
| ← lolok left | 04:43 |
| → lolok joined | 04:43 |
| → madewokherd` joined | 04:44 |
| ← madewokherd left | 04:46 |
| → Betal joined | 04:48 |
| ← bambanxx left | 04:52 |
| ← chexum left | 04:57 |
| → chexum joined | 04:59 |
| ← adanwan left | 05:05 |
| ← chexum left | 05:05 |
| → adanwan joined | 05:06 |
| ← bindu left | 05:07 |
| → bindu joined | 05:08 |
| → chexum joined | 05:12 |
| ← crabbedhaloablut left | 05:16 |
| ← de-facto left | 05:16 |
| → crabbedhaloablut joined | 05:17 |
| ← FinnElija left | 05:18 |
| → de-facto joined | 05:19 |
| → FinnElija joined | 05:20 |
| ← de-facto left | 05:20 |
| → de-facto joined | 05:21 |
| ← de-facto left | 05:23 |
| → de-facto joined | 05:26 |
| ← zebrag left | 05:28 |
| ← bn_work left | 05:30 |
| ← oncall-pokemon left | 05:31 |
| ← de-facto left | 05:35 |
| → de-facto joined | 05:37 |
| ← de-facto left | 05:37 |
| ← bloody left | 05:41 |
| ← thiago left | 05:42 |
| ← jazzy left | 05:48 |
| → rsx joined | 05:52 |
| ← dflick__ left | 05:57 |
| → stewie925 joined | 05:58 |
| → de-facto joined | 06:03 |
| ← lucasta left | 06:04 |
| → lucasta3 joined | 06:05 |
| → lucasta joined | 06:05 |
| ← stewie925 left | 06:05 |
| ← lucas_ta left | 06:07 |
| ← Jong left | 06:07 |
| ← de-facto left | 06:10 |
| → jinsun__ joined | 06:18 |
| jinsun → Guest2224 | 06:18 |
| jinsun__ → jinsun | 06:18 |
| → Sakitami joined | 06:19 |
| ← Sakitami left | 06:20 |
| ← Guest2224 left | 06:20 |
| → sakitami joined | 06:21 |
| → wallabra_ joined | 06:22 |
| → gas51627 joined | 06:22 |
| ← wallabra left | 06:24 |
| wallabra_ → wallabra | 06:24 |
| ← Murr left | 06:34 |
| → Murr joined | 06:35 |
| → cdown joined | 06:37 |
| ← sakitami left | 06:39 |
| → maryo joined | 06:45 |
|
maryo
| I have migrated from SVN to GIT Using Subgit tool.. My SVN Revisions was around 37000 but after migrations, I could see only 13750 commits only in Git.. Am I missing out something? | 06:46 |
| → EvilDMP joined | 06:49 |
| → srinidhi joined | 06:52 |
| → The_Blode joined | 06:55 |
| → Artea joined | 06:58 |
| ← infernix left | 07:02 |
| → gco joined | 07:07 |
| ← gco left | 07:15 |
| → jrm joined | 07:17 |
| ← skapata left | 07:20 |
| → infernix joined | 07:21 |
| ← causasui left | 07:24 |
| → nate4 joined | 07:25 |
| ← ghost43 left | 07:26 |
| ← loulou_ left | 07:27 |
| → ghost43 joined | 07:28 |
| ← nate4 left | 07:30 |
| → john_johnk joined | 07:32 |
| ← hamburgler left | 07:44 |
| → zan joined | 07:50 |
| → jinsun__ joined | 07:52 |
| jinsun → Guest3745 | 07:52 |
| jinsun__ → jinsun | 07:52 |
| → feriman joined | 07:54 |
| ← Guest3745 left | 07:55 |
| → kenanmarasli joined | 07:57 |
| → iomari891 joined | 07:57 |
| → sakitami joined | 07:58 |
| → gco joined | 07:59 |
| → vysn joined | 08:09 |
| → elastic_dog joined | 08:09 |
| → igemnace joined | 08:10 |
| → zeenk joined | 08:14 |
| ← john_johnk left | 08:14 |
| ← lucasta3 left | 08:15 |
| → Tobbi_1 joined | 08:16 |
| → coot joined | 08:18 |
| → dionysus69 joined | 08:18 |
| ← Tobbi_ left | 08:18 |
| Tobbi_1 → Tobbi_ | 08:18 |
| → elkalamar joined | 08:27 |
| ← vqueiroz left | 08:32 |
| ← Visne left | 08:33 |
| → Visne joined | 08:34 |
| → lxsameer joined | 08:38 |
| → Sulky_ joined | 08:38 |
| → tirnanog joined | 08:41 |
| ← Sulky left | 08:41 |
| ← gas51627 left | 08:59 |
| ← elkalamar left | 09:02 |
| ← rsx left | 09:02 |
| ← gco left | 09:16 |
| ← vysn left | 09:18 |
| → ___nick___ joined | 09:28 |
| ← Betal left | 09:31 |
| ← srinidhi left | 09:35 |
| → poprostumieciek joined | 09:41 |
| ← adanwan left | 09:42 |
| ← poprostumieciek left | 09:42 |
| → adanwan joined | 09:43 |
| ← bindu left | 09:44 |
| ← FinnElija left | 09:45 |
| → loki_val joined | 09:45 |
| → finn_elija joined | 09:45 |
| finn_elija → FinnElija | 09:45 |
| → bindu joined | 09:45 |
| ← crabbedhaloablut left | 09:47 |
| ← maryo left | 09:47 |
| → maryo joined | 09:47 |
| → dviola joined | 09:55 |
| → G30RD13 joined | 10:15 |
| ← FinnElija left | 10:24 |
| ← loki_val left | 10:24 |
| → crabbedhaloablut joined | 10:24 |
| → FinnElija joined | 10:24 |
| ← indy left | 10:25 |
| ← Celelibi left | 10:28 |
| → nyah joined | 10:30 |
| → node1 joined | 10:33 |
| → elkalamar joined | 10:34 |
| ← vishal left | 10:40 |
| → GNUmoon joined | 10:41 |
| ← Sazhen86 left | 10:41 |
| → vishal joined | 10:41 |
| → DF32 joined | 10:50 |
| ← coot left | 10:51 |
| ← dionysus69 left | 10:54 |
| ← maryo left | 10:55 |
| → coot joined | 10:56 |
| → sepples joined | 11:01 |
| → mort joined | 11:02 |
| → momomo joined | 11:03 |
| ← fflam left | 11:03 |
|
momomo
| So I have a work related git and github enterprise account ... now when I committed some code to a public github repository ... it decided to include my name ... how can I ensure shit like this don't fucking ever happen again ? | 11:04 |
|
| fuck | 11:04 |
| ← elkalamar left | 11:05 |
| → dflick__ joined | 11:06 |
| ← Crassus left | 11:07 |
| → indy joined | 11:07 |
|
ikke
| Your name is part of the commit that you create | 11:09 |
|
| You can use includeIf configuration directives to set this per directory | 11:09 |
|
| so that projects in a certain directory always get committed with a certain name and e-mail address | 11:09 |
| ← coot left | 11:10 |
| → mon_aaraj joined | 11:11 |
| → moldorcoder7 joined | 11:14 |
| → m0viefreak joined | 11:17 |
| → justmatt joined | 11:22 |
| ← lxsameer left | 11:25 |
| → nate4 joined | 11:27 |
| ← zeenk left | 11:27 |
| → lxsameer joined | 11:27 |
| → maryo joined | 11:30 |
| → jonosterman joined | 11:31 |
| ← nate4 left | 11:31 |
| ← maryo left | 11:32 |
| → maryo joined | 11:32 |
| → hex_ joined | 11:34 |
| → moldorcoder7_ joined | 11:35 |
| ← moldorcoder7 left | 11:36 |
| ← node1 left | 11:37 |
| → coot joined | 11:38 |
| → tyson2 joined | 11:42 |
| ← hex_ left | 11:43 |
|
momomo
| Is there not a way to define it in the git global? | 11:43 |
|
| Like per domain kind of thing? | 11:43 |
|
| Kind of annoying that if you define a git global user .. it will use it everywhere unless you are wizard | 11:44 |
|
| I think i will just disable the global user and I guess force set it on the locals | 11:44 |
| ← adanwan left | 11:46 |
| → adanwan joined | 11:47 |
|
dav1d
| momomo, sure, you have a git config per repository | 11:48 |
|
| I dont have it globally set e.g. | 11:48 |
|
momomo
| only issue is you have to keep configure it after a clone | 11:49 |
| → zer0bitz joined | 11:49 |
|
momomo
| you'd think git clone could do it for you | 11:49 |
|
dav1d
| how would git know | 11:50 |
|
| maybe you can tie the config to the upstream URL (no idea), but then what happens if you have multiple upstreams | 11:50 |
|
momomo
| dav1d i think by 2022 someone could have figured out a scheme ... like github supplied username on the git clone url | 11:50 |
|
cbreak
| username? heh :D | 11:51 |
|
mackerman
| In theory someone could write a script to figure it out, clone the repo and set the user config in it | 11:51 |
|
cbreak
| I'd be called "git" everywhere | 11:51 |
| ← lxsameer left | 11:51 |
|
mackerman
| Parsing GitHub repo URLs is abit outside the scope of core git | 11:51 |
|
cbreak
| momomo: if you want git to know who you are globally, configure it globally. Otherwise do not. | 11:52 |
|
dav1d
| momomo, do you clone 20x a day? make a (git) alias if it's that much trouble | 11:52 |
|
momomo
| git clone command could have that built it as an argument | 11:52 |
|
cbreak
| if you want to configure it differently everywhere, you can write a script for it. | 11:52 |
|
momomo
| so that github could provide you with a ready to go command | 11:52 |
|
cbreak
| but honestly, is your name not the same everywhere? | 11:52 |
| → Celelibi joined | 11:52 |
|
momomo
| dav1d no, that is the issue .. i don't have 20 everyday ... the issue is when I do it rarely like update a repo to be nice ... and then I am fucked and my entire work name and email is exposed | 11:53 |
|
| and i have to spend hours to unwind it | 11:53 |
|
dav1d
| momomo, then don't set it globally | 11:53 |
|
momomo
| 1 year from now being nice all over again .. i will have forgotten all about this | 11:53 |
|
cbreak
| changing an e-mail address / name isn't a matter of hours | 11:53 |
|
momomo
| dav1d i hope i can remember that on the next job | 11:53 |
|
mackerman
| man gitmailmap for a way to have all git tools report something different for name and email | 11:53 |
|
gitinfo
| the gitmailmap manpage is available at https://gitirc.eu/gitmailmap.html | 11:53 |
|
cbreak
| it's a matter of minutes, if you notice it early enough | 11:53 |
|
momomo
| dav1d and then i still have to rememeber to set it locally after each git clone | 11:53 |
|
cbreak
| git will complain if you don't set it | 11:54 |
|
dav1d
| momomo, no worries git will remind you | 11:54 |
|
momomo
| let me trye | 11:54 |
|
dav1d
| if there is no user/email set you cannot commit | 11:54 |
|
ikke
| momomo: a repository can have more than one remote | 11:54 |
|
| You can even commit without a remote | 11:55 |
|
dav1d
| the only thing that is annoying that most auto generated commands include the `--global` flag | 11:55 |
|
momomo
| dav1d yes, it will remind to fuck up all over again | 11:55 |
|
| as a noob 1 year from now, the suggestion is: | 11:55 |
|
| git config --global user.email "you@example.com" | 11:55 |
|
| git config --global user.name "Your Name" | 11:55 |
|
| so set the glboal one and of course 99% will bite | 11:55 |
|
dav1d
| yeah, but now you know ;) | 11:55 |
|
cbreak
| of course that's the suggestion | 11:55 |
|
dav1d
| and for most users this is the correct suggestion | 11:55 |
|
cbreak
| because 99% of the time, your name will be the same everywhere | 11:55 |
| → elkalamar joined | 11:56 |
|
dav1d
| Personally I would probably just make an alias | 11:56 |
|
cbreak
| and 25.7% of the time, the e-mail address too | 11:56 |
|
momomo
| now i create a git bash command and hopefull i can run that .. i just wish to there was a way to git clone .. cd in to whatever was cloned and then my.git.config.local | 11:56 |
|
dav1d
| `git clone-work` or something like that | 11:56 |
|
momomo
| dav1d and keep changing the global settings ? | 11:56 |
|
| the question is why in git global it is not per domain | 11:56 |
|
mackerman
| You don't have to use git's hints exactly as is | 11:56 |
|
dav1d
| momomo, nah no global settings but the alias would initialize the repo | 11:56 |
|
cbreak
| momomo: domain what? | 11:57 |
|
| configurations are per repo or per user | 11:57 |
|
momomo
| on the global scope | 11:57 |
|
dav1d
| momomo, how does that help? I have private github repos and company github repos on the same domain | 11:57 |
|
momomo
| ssh config has this: | 11:57 |
|
| Host 192.168.0.175 | 11:57 |
|
| AddKeysToAgent yes | 11:57 |
|
| UseKeychain yes | 11:57 |
|
| so you define rules depending on host | 11:57 |
|
cbreak
| for SSH, that makes sense. | 11:57 |
|
momomo
| same could work on the global gitconfig | 11:57 |
|
cbreak
| for git it's dumb. | 11:57 |
|
momomo
| why? | 11:58 |
|
cbreak
| because IP addresses change all the time | 11:58 |
|
| and servers are not significant for this | 11:58 |
|
momomo
| it does not have to be ip | 11:58 |
|
| it could be repo | 11:58 |
|
ikke
| momomo: what you have 2 remotes in the same repository with conflicting settings? | 11:58 |
|
cbreak
| you can do per-repo configuration already | 11:58 |
|
momomo
| i mean the idea of git global seems wack anyway | 11:58 |
|
| cbreak yes, which is very local | 11:58 |
|
cbreak
| of course. it's per repo. | 11:58 |
|
momomo
| Host *github.com* | 11:59 |
|
ikke
| momomo: some people don't like to have to reconfigure every repo for settings they want to have consistently | 11:59 |
|
momomo
| done | 11:59 |
|
ikke
| momomo: you forget that git is decentralized | 11:59 |
|
dav1d
| momomo, https://git-scm.com/docs/git-config#_includes ctrl+f "conditional includes" if the link doesnt link to that section already | 11:59 |
|
momomo
| ikke exactly i am one of those | 11:59 |
|
| so I don't have to manage all local repos config | 11:59 |
|
ikke
| a repository does not belong to a single remote | 11:59 |
|
momomo
| i want them in global | 11:59 |
|
| but i can only have one | 11:59 |
|
gnoo
| momomo: a per-host name wouldn't work if you have multiple projects with the same host (e.g. a lot of things now use centralized, non-free host) and want to use different names on those | 11:59 |
|
cbreak
| gnoo: yeah, or even free ones like github | 12:00 |
|
momomo
| so define them more specific if your wildcard is matching too many | 12:00 |
|
ikke
| momomo: the simpler, and already working solution, is to divide these projects in directories per 'persona' | 12:00 |
|
gnoo
| cbreak: github is non-free(dom respecting) | 12:00 |
|
momomo
| i just figured this was already in git global config .. and i did not know how to configure it | 12:00 |
|
dav1d
| momomo, closest you will get is through the conditional includes, might be able to match on a local directory, e.g. ~/company/* is automatically a different git config | 12:00 |
|
cbreak
| gnoo: it's free though | 12:00 |
|
ikke
| yes, which is what I already suggested earlier | 12:00 |
|
gnoo
| cbreak: not libre | 12:01 |
|
| english is stupid | 12:01 |
|
cbreak
| now that's not really important, is it? :) | 12:01 |
|
dav1d
| ah there is also `[includeIf "hasconfig:remote.*.url:https://example.com/**"]` no clue if that works | 12:01 |
|
| momomo, ^ | 12:01 |
|
momomo
| i mean right now i think will just git clone .. .disable the git global completely ... even for work | 12:01 |
|
| dav1d it looks so obtrusive .. where does that go anyway? | 12:01 |
|
cbreak
| momomo: you could use a different user for work | 12:02 |
|
dav1d
| momomo, read the manpage I linked you | 12:02 |
|
momomo
| cbreak what do you mean? | 12:02 |
|
| log in and out ? | 12:02 |
|
| lol | 12:02 |
|
cbreak
| momomo: different users have different .gitconfig | 12:02 |
|
| you don't have to log out | 12:02 |
|
bookworm
| su is a thing | 12:02 |
|
cbreak
| just log in with an other user in addition | 12:02 |
|
momomo
| yes, i'd skip that | 12:02 |
|
| before i commit? how will intellij integration like that? | 12:02 |
|
cbreak
| for working | 12:02 |
|
| work on work work with your work account | 12:03 |
|
momomo
| dav1d where does that infludeIf go? | 12:03 |
|
dav1d
| momomo, how about you read the manpage I linked you | 12:03 |
|
cbreak
| and privately work on private work with your private account | 12:03 |
|
dav1d
| momomo, I even linked to the correct section | 12:03 |
|
| :( | 12:03 |
|
cbreak
| and if you put the repos into the documents directory of the respective user, you won't get too confused which user to use | 12:03 |
|
momomo
| dav1d and five foo.inc for every local repo ? | 12:04 |
|
dav1d
| momomo, absolute path should work | 12:04 |
|
momomo
| i mean right now .. i could define my own momomo.git.clone command that takes a name and email ... but the issue is how do you clone and cd dafely ? | 12:05 |
|
dav1d
| momomo, "If the pattern starts with ~/, ~ will be substituted with the content of the environment variable HOME." | 12:05 |
|
momomo
| dav1d too much work to go into that file to modify it everytime i clone something | 12:05 |
|
dav1d
| momomo, omg | 12:05 |
|
momomo
| dav1d i don't put git repos in ~ | 12:05 |
|
dav1d
| jesus christ | 12:05 |
|
momomo
| lol | 12:05 |
|
dav1d
| do you just want something to copy paste? | 12:05 |
|
| then I'll need your company domain, username and ssh private key :p | 12:06 |
|
momomo
| ai want something that works ... like ssh config | 12:06 |
|
| jesus | 12:06 |
|
cbreak
| momomo: why cd? | 12:06 |
|
dav1d
| read the docs then | 12:06 |
| → gxt joined | 12:06 |
|
cbreak
| momomo: just use paths | 12:06 |
|
momomo
| so i can git config --local after | 12:06 |
|
cbreak
| momomo: no need | 12:06 |
|
| momomo: use --git-dir | 12:06 |
|
| paths ftw. | 12:06 |
| → pulse joined | 12:07 |
|
momomo
| cbreak git clone --git-dir [email@hidden.address] > | 12:07 |
|
| ? | 12:07 |
|
cbreak
| ... no... | 12:07 |
|
| momomo: man git | 12:08 |
|
gitinfo
| momomo: the git manpage is available at https://gitirc.eu/git.html | 12:08 |
|
cbreak
| it lists how --git-dir is used | 12:08 |
|
| it also has --work-tree | 12:08 |
|
| momomo: there's also -C, which is probably most useful for you | 12:08 |
|
momomo
| if i could suuply that ... then i could also cd .. so how is that going to help me? | 12:08 |
|
cbreak
| because you don't have to cd | 12:08 |
|
momomo
| either way that is not the issue | 12:09 |
|
| the issue is knowing what was just cloned | 12:09 |
|
cbreak
| you just cloned it... | 12:09 |
|
momomo
| we are talking about automating this shit in a scirpt | 12:09 |
|
cbreak
| yes, so it's even easier to remember | 12:09 |
|
| store it in a shell var or something | 12:09 |
|
| with git clone, you either tell it where to clone the repo | 12:10 |
|
momomo
| so... i would have a function.... my.git.clone "big-url" .... that function will git clone ;;; then cd ... then git config --local ... | 12:10 |
|
cbreak
| or it clones it into the current working dir | 12:10 |
|
momomo
| it could also fail | 12:10 |
|
cbreak
| yes... so sad... much crying. | 12:10 |
|
| if it fails, you don't have to do anything afterwards other than to complain about it | 12:10 |
|
momomo
| cbreak you obviously do not know how to write safe code | 12:11 |
|
cbreak
| check the exit status of git clone | 12:11 |
|
| honestly, this is shell scripting basics | 12:11 |
|
momomo
| cbreak exactly this is so much more hard work now ... because if the fucking git command could just be a bit smarter it could cd in to whatever i just did or give me the directory that was just created | 12:11 |
|
| instead I have to figure it out and parse it | 12:11 |
|
cbreak
| no need to parse anything | 12:12 |
|
| you know where it clones stuff | 12:12 |
|
| either because you tell it, or because it uses the default | 12:12 |
|
momomo
| Here is a thread for your interest: | 12:12 |
|
| https://stackoverflow.com/questions/59392153/git-clone-and-cd-into-it | 12:12 |
|
| None of those answers look reliable enough to me | 12:12 |
|
cbreak
| if you tell it: remember it | 12:12 |
|
| otherwise: just get the basename. done. | 12:13 |
|
momomo
| unless there is a supplied argument | 12:13 |
|
cbreak
| ... do you enve read? | 12:13 |
|
| if you tell it: remember it <<- this is the supplied argument | 12:13 |
|
| you tell it.. via a supplied argument | 12:13 |
|
momomo
| I can try ... wait | 12:14 |
|
cbreak
| and otherwise: use basename | 12:14 |
|
momomo
| I don't want to force the argument all the time | 12:14 |
| → DaNeenjah joined | 12:14 |
|
cbreak
| then don't force it... | 12:14 |
| ← gxt left | 12:15 |
| ← FinnElija left | 12:15 |
|
cbreak
| you know how to use basename? | 12:15 |
|
| REPO_NAME=$(basename "${REPO_URL}" .git) | 12:15 |
|
momomo
| Have not tried this yet, but wil now: | 12:16 |
|
| https://www.toptal.com/developers/hastebin/nocobupoxa.bash | 12:16 |
|
cbreak
| REPO_DIR=${1:-${REPO_NAME}} | 12:16 |
|
| all trivial shell scripting | 12:16 |
| → FinnElija joined | 12:16 |
|
momomo
| it worked | 12:16 |
| ← FinnElija left | 12:16 |
| → FinnElija joined | 12:17 |
|
momomo
| the issue is that i believe git should apply an argument that is called --follow ... now i have to have some weird bash interface to get to git stuff | 12:17 |
|
cbreak
| also, the if $? isn't proper | 12:17 |
|
momomo
| also copy and paste from github page will likely continue to be an issue | 12:17 |
|
tirnanog
| that loses the exit status of git. git clone ... && cd ... would make more sense. | 12:17 |
| → gxt joined | 12:17 |
|
cbreak
| you'd do something like git clone ... && git -C config ... && .... | 12:17 |
|
| chaining with && | 12:18 |
|
| if you want to use if, then you'd do if git clone ... ; then | 12:18 |
| ← k1773__ left | 12:18 |
|
furrymcgee
| you can not cd the parent process | 12:18 |
|
cbreak
| tirnanog: no need | 12:18 |
|
| tirnanog: cd isn't required | 12:18 |
|
| do you people even read? :/ | 12:19 |
|
momomo
| the $? is the status code | 12:19 |
|
| I can try it | 12:19 |
|
bookworm
| cbreak: why are you bothering... it doesn't stick | 12:19 |
|
cbreak
| $? is the status code, yes | 12:19 |
|
| momomo: but you're making an integer to string conversion and then comparing exit codes as string. This bothers my type safety senses. | 12:20 |
|
momomo
| works | 12:20 |
|
| everythiiing is a string in bash | 12:20 |
|
| I was able to get both error and success states: | 12:20 |
|
| https://www.toptal.com/developers/hastebin/zozalumiwu.bash | 12:20 |
| ← G30RD13 left | 12:21 |
|
cbreak
| exit codes are numbers, not arbitrary strings | 12:21 |
|
tirnanog
| there is no type-safety concern there. that's just nonsense. | 12:21 |
| → pretty_dumm_guy joined | 12:22 |
|
tirnanog
| the most meaningful criticism that can be levelled at it is that it throws away the exit status value of git itself. | 12:22 |
|
momomo
| I can store it aside and return it .. but i mean .. i don't really care ... but so would the && cd .. approach as well | 12:23 |
|
cbreak
| the correct way to compare numbers if you want to use $? would be via if (( $? == 0 )), an actual numeric comparison | 12:23 |
|
furrymcgee
| git can not follow | 12:23 |
|
tirnanog
| it makes absolutely no difference for comparing $? | 12:23 |
|
momomo
| cbreak so in my mind rather than learn to ( ( and then when to do what .. i treat eveyrthing the same .. .i am a much happier coder | 12:24 |
|
| i don't have to bother with nuances and special cases | 12:24 |
|
cbreak
| a sledge-hammer programmer | 12:24 |
|
| sure, it works... but... :P | 12:24 |
|
furrymcgee
| you need cd $(git clone -v ... |& grep ... ) | 12:25 |
|
cbreak
| the output of git clone isn't supposed to be script-usable | 12:25 |
|
| it can't be relied uppon | 12:26 |
|
| also, you don't need cd. | 12:26 |
|
furrymcgee
| please done make this warning in output | 12:26 |
|
tirnanog
| momomo: fine. obviously, it's your call. that's not correct, though. foo && bar would not lose the exit status of foo in the event that it fails. | 12:27 |
| → dionysus69 joined | 12:30 |
| → lpapp joined | 12:33 |
|
lpapp
| hi, when my topic branch is based on a branch, e.g. "dev", and dev changes rapidly | 12:33 |
|
| and I pull into dev, rebuild dev | 12:33 |
|
momomo
| I changed it to : https://www.toptal.com/developers/hastebin/riwegiqate.bash | 12:33 |
|
lpapp
| then I would want to rebase my topic branch based on the latest dev | 12:33 |
|
| but is it better to recreate the topic branch and apply the changes on top instead of rebase? | 12:34 |
|
| The reason why I am asking this is because I am wondering if that resulted in fewer rebuilds? | 12:34 |
|
momomo
| https://www.toptal.com/developers/hastebin/qixuqabizo.php | 12:34 |
|
lpapp
| it seems that git rebase generates a lot of rebuilds | 12:34 |
| ← Murr left | 12:34 |
|
lpapp
| even though I rebuilt dev | 12:34 |
| → Murr joined | 12:35 |
|
lpapp
| and my change is only some example, so would not expect many rebuilds. | 12:35 |
|
bookworm
| what's a rebuild for you? CI? | 12:35 |
|
lpapp
| so, I guess git rebase dev would update timestamps or so, otherwise so many jobs (5000+) is not sensible. | 12:35 |
|
| no, it is all local | 12:35 |
|
bookworm
| git doesn't build, rebasing will only touch files which it has to | 12:35 |
|
| so if you modified those, sure. If it's just an example your doing something funny | 12:36 |
|
| you're* | 12:36 |
| ← coot left | 12:36 |
|
lpapp
| I am not doing anything funny, really. | 12:37 |
|
| it is a simple git rebase dev regenerating 5000 jobs | 12:37 |
|
| which I would not expect at all | 12:37 |
|
bookworm
| what is a "job" ? | 12:37 |
|
lpapp
| given that my change is an example at the very top of the stack everything is built | 12:37 |
|
| yes, when you build software, it is measured in jobs... | 12:37 |
|
| especially c/c++ with ninja. | 12:38 |
| ← kevr left | 12:38 |
|
bookworm
| a build can be anything from make to meson to some crazy script you build yourself, the word has no meaning ... ah, there we go | 12:38 |
|
cbreak
| lpapp: rebase works by rebasing your history on top of other history | 12:42 |
|
| lpapp: so you're switching to the new base, and change all files that have changed in your history since then | 12:42 |
|
| then every single commit gets replayed, changing all files | 12:42 |
|
| (obviously only all files the commit touched) | 12:43 |
|
| so if your branch history changed lots of files, lots of files will be changed while replaying your branch history | 12:43 |
|
| lpapp: if you don't want that, merge. | 12:43 |
| → kevr joined | 12:44 |
|
cbreak
| lpapp: but really, you should create git history for readability, not some nonsense like "less files to rebuild" | 12:44 |
|
| if you care about that, use ccache or so | 12:44 |
|
lpapp
| As I already said, I only changed examples. | 12:45 |
|
| Yet, I am getting 5000+ jobs from the framework itself. | 12:45 |
|
| which I would really not expect on rebase. | 12:45 |
|
| I would expect my example to be rebuilt | 12:45 |
|
momomo
| furrymcgee what do you mean you do not have to CD ? | 12:46 |
|
lpapp
| since I already rebuilt the framework in dev | 12:46 |
|
| it has nothing to do with git history though | 12:46 |
| → vicecea joined | 12:52 |
| ← Sulky_ left | 12:58 |
| ← fossdd left | 12:58 |
|
furrymcgee
| cd only changes the current process, if you do this in git it wont cd the shell | 12:59 |
|
cbreak
| lpapp: I'd expect everything to be rebuilt that changed since the branch branched off | 12:59 |
|
| lpapp: since the whole branch you rebase will be rebased by replaying all its commits' changes on top of the new base | 12:59 |
|
| and obviously, everything that changed in the new base compared to the old base will ALSO change | 13:00 |
| → fossdd joined | 13:01 |
|
lpapp
| right, so this is the sorry state. | 13:03 |
|
cbreak
| it's expected :) | 13:04 |
|
lpapp
| will it be quicker to do git switch -C new | 13:04 |
|
| and then just apply the example change there without rewriting previous history? | 13:04 |
|
| hopefully, that will not regenerate 5000 jobs for me. | 13:04 |
|
cbreak
| that's what happens when you rebase | 13:04 |
|
lpapp
| are you sure? | 13:04 |
|
| I mean in worst case, I could always do git apply instead of git am if that helps | 13:04 |
|
cbreak
| git checks out the new base, then effectively git cherry-picks all the commits of the branch you want to rebase | 13:04 |
|
lpapp
| but I thought that would not really touch any of the previous history at all | 13:05 |
|
cbreak
| it will touch all history of the branch you rebase | 13:05 |
|
lpapp
| the problem is that it generates 5000 jobs really | 13:05 |
|
cbreak
| otherwise it couldn't shove in new history before it | 13:05 |
|
lpapp
| rebuilding the example should be 3 | 13:05 |
|
| not 5000 | 13:05 |
|
cbreak
| lpapp: not a git problem | 13:05 |
|
lpapp
| since I already build the framework in dev | 13:05 |
|
| it is | 13:05 |
|
| it very much is | 13:05 |
|
cbreak
| your build system obviously thinks files that changed change time have to be rebuilt | 13:05 |
|
lpapp
| if I apply the changes manually in dev, there is not really 5000 jobs | 13:05 |
|
cbreak
| even if the content ended up being the same after changing it around a few times | 13:05 |
|
lpapp
| and that *is* the issue git generates with git rebase | 13:06 |
|
cbreak
| no | 13:06 |
|
lpapp
| which is what I want to avoid | 13:06 |
|
cbreak
| it happens if you change the file the same way git does without git too | 13:06 |
|
lpapp
| hence my original question | 13:06 |
|
cbreak
| you can avoid it by using a smarter rebuild logic | 13:06 |
|
| like ccache does | 13:06 |
|
| using content instead of just time | 13:06 |
|
lpapp
| why would I ever change the files the same way without git - does not make any sense | 13:06 |
|
| Again, my question is still on and adept | 13:07 |
|
cbreak
| lpapp: git only touches files it has to change because the content in them changed | 13:07 |
|
| lpapp: can you give me an example command you would run for rebasing? | 13:07 |
|
lpapp
| I already did | 13:08 |
|
| there is not really anything magical about it, it is just plain git rebase dev | 13:08 |
|
| I think I will avoid git rebase in this way, it sounds wasteful to me. | 13:08 |
|
cbreak
| so, you should at least expect all the files in git log --name-only dev.. to change, and additionally all in git log --name-only ..dev | 13:10 |
|
lpapp
| they will change timestamps | 13:10 |
|
| that is the problem | 13:10 |
|
cbreak
| no | 13:10 |
|
| it's required | 13:10 |
|
| because they also change content | 13:10 |
|
lpapp
| yes, so the solution seems to be what I suggested | 13:10 |
|
| git switch -C | 13:10 |
|
cbreak
| if you add a -p, you see which content changes | 13:11 |
|
lpapp
| git apply/am | 13:11 |
|
cbreak
| lpapp: no... | 13:11 |
|
lpapp
| as opposed git switch topic;git rebase dev | 13:11 |
|
| yes | 13:11 |
|
| ... | 13:11 |
|
cbreak
| because that's exactly what git does... | 13:11 |
|
lpapp
| no.... | 13:11 |
|
| git switch topic;git rebase dev rewrites the content and history | 13:11 |
|
| git switch -C;git apply/am does not.... | 13:11 |
|
| -5000 jobs | 13:11 |
|
| for me, for my laptop, for the heating of my room, and for the planet. | 13:11 |
|
| it does not sound like git rebase is useful for base branches changing rapidly. | 13:12 |
|
| it is more sustainable to recreate the topic branches after the base branch is rebuilt | 13:12 |
| ← elkalamar left | 13:12 |
|
lpapp
| or update both branches build the build | 13:13 |
|
| git pull --rebase in dev, then git switch topic; git rebase origin/dev | 13:13 |
|
| and then rebuild in one of the branches | 13:13 |
|
| that way, perhaps the double rebuild can be avoided | 13:13 |
|
cbreak
| lpapp: have you ever tried it even? | 13:13 |
|
lpapp
| tried what? | 13:14 |
|
cbreak
| git rebase topic --onto dev | 13:14 |
|
lpapp
| what are you trying to achieve? | 13:14 |
|
cbreak
| it will rebase topic onto dev | 13:14 |
|
lpapp
| how is that different from git rebase dev? | 13:14 |
|
cbreak
| git rebase dev will rebase the current branch | 13:15 |
|
lpapp
| ah, git switch -C would not change the file contents back | 13:15 |
|
| before doing the git rebase dev | 13:15 |
|
| yes, I guess if that is the case, you could run that command after the build in dev and before git switch -C to avoid the rebuilds | 13:15 |
|
| that is another approach, I guess | 13:15 |
|
cbreak
| lpapp: if you really want to avoid changing to the topic branch | 13:15 |
|
lpapp
| This is my workflow: | 13:15 |
|
cbreak
| lpapp: also take a look at git cherry-pick, it can cherry-pick ranges of commits | 13:15 |
|
lpapp
| 1) I rarely contribute to Qt | 13:16 |
|
| 2) I git pull --rebase dev | 13:16 |
|
cbreak
| for example, git cherry-pick ..topic | 13:16 |
|
lpapp
| 3) dev is a rapidly changing branch by all Qt devs | 13:16 |
|
cbreak
| that should give you all commits in that branch | 13:16 |
|
lpapp
| 4) I create a topic branch after dev build | 13:16 |
| → cvmn joined | 13:16 |
|
lpapp
| 5) Make the changes | 13:16 |
|
| 6) Build | 13:16 |
|
| 7) Submit | 13:16 |
|
| 8) They give reviews | 13:16 |
|
| 9) In a week or so when I get free time again, I finish the change | 13:16 |
|
| 10) I git pull --rebase dev again | 13:16 |
|
| 11) I rebuild dev | 13:17 |
|
| 12) I want to rebuild the topic as well and update my change based on the reviews | 13:17 |
|
| 13) Test | 13:17 |
|
| 14) Submit | 13:17 |
|
| the problem happens at the moment between 11-12 | 13:17 |
|
| in a week, 5000+ ninja jobs are guaranteed | 13:17 |
|
| I guess there are a few solutions to a sustainable green solution: | 13:17 |
| → MatthewAllan93 joined | 13:18 |
|
lpapp
| 1) Recreate topic after 11) | 13:18 |
|
| 2) git rebase topic --onto dev | 13:18 |
|
| 13) git pull --rebase and git rebase dev before building dev | 13:18 |
|
| 3) git pull --rebase and git rebase dev before building dev | 13:18 |
|
cbreak
| lpapp: why bother rebasing dev? or rebuilding dev? | 13:19 |
|
lpapp
| in 12), I only want to rebuild the absolutely necessary rather than everything that has changed. | 13:19 |
|
bookworm
| your problem starts at 10), why are you rebasing on dev? Just add more work on the topic branch | 13:19 |
|
cbreak
| is it not enough to only worry about your own stuff? | 13:19 |
|
lpapp
| cbreak: because my change has to be functional and not break anything? | 13:19 |
|
| of course not... | 13:19 |
|
cbreak
| lpapp: yeah, so? | 13:19 |
|
lpapp
| any recenet change could break my change... | 13:20 |
|
cbreak
| git fetch | 13:20 |
|
lpapp
| I could even introduce a build break... | 13:20 |
|
| api changes in dev | 13:20 |
|
cbreak
| lpapp: so? | 13:20 |
|
lpapp
| and my change does not account for that... | 13:20 |
|
cbreak
| that's not your problem | 13:20 |
|
| that's theirs | 13:20 |
|
lpapp
| "so?" ??? | 13:20 |
|
cbreak
| you don't need to build dev in isolation | 13:20 |
|
| just your changes | 13:20 |
|
| so you can fetch the new dev | 13:20 |
|
| then rebase onto it | 13:20 |
|
| without ever checking out your local dev branch | 13:20 |
|
| and without ever building your local dev branch | 13:20 |
|
| you'd always stay on your own branch, and never change any files because of the switching around | 13:21 |
|
| (so you wouldn't rebase onto your own dev branch, but origin/dev, or what ever your remote is called) | 13:21 |
|
lpapp
| Again, I have to always provide a change against the latest dev | 13:21 |
|
cbreak
| so? | 13:21 |
|
| this will do that | 13:21 |
|
lpapp
| Moreover, I am branching off other topic branches, too | 13:22 |
|
| so, dev must be always up to date | 13:22 |
|
| I have 5-6 topics going on at the moment | 13:22 |
|
cbreak
| why? you can use origin/dev | 13:22 |
|
lpapp
| I do not think dev or origin/dev makes any difference here. | 13:23 |
|
cbreak
| checking out dev, updating it, then checking out something based on old dev is the problem | 13:23 |
|
lpapp
| and git pull --rebase is certainly nicer and more mainstream, and less error-prone therefore, than git fetch | 13:24 |
|
| yes, but I already gathered 3 solutions above | 13:24 |
|
cbreak
| git fetch is... very mainstream | 13:24 |
|
| everyone uses it, whether they know it or not :) | 13:24 |
| ← bindu left | 13:24 |
|
lpapp
| it is plumber | 13:24 |
|
bookworm
| no? | 13:24 |
|
| I use fetch frequently | 13:25 |
| ← chexum left | 13:25 |
|
bookworm
| I just want to fetch the new state, not do anything to it | 13:25 |
|
cbreak
| lpapp: you can use git remote update if you want. It basically does the same | 13:25 |
| → coot joined | 13:25 |
| → bindu joined | 13:25 |
| → chexum joined | 13:25 |
|
lpapp
| what exactly is wrong with git rebase topic --onto dev though? | 13:26 |
|
cbreak
| it's not wrong. | 13:26 |
|
lpapp
| then why bother with fetch | 13:26 |
|
cbreak
| but it will maybe check out things more than what you want | 13:26 |
|
lpapp
| why? | 13:26 |
|
| then, it is wrong :) | 13:26 |
|
cbreak
| you seem to be very alergic to checking things out, because the checking-out will touch all the files that changed | 13:26 |
|
| and files changed | 13:26 |
|
| lpapp: have you ever used ccache? | 13:27 |
|
lpapp
| well, I thought you suggested git rebase topic --onto dev because if I do that before git switch -C, surely, files will not change other than my examples | 13:27 |
|
| git switch* | 13:27 |
|
cbreak
| it'd be done instead of the checkout | 13:27 |
|
| (but it might do the checkout itself... maybe...) | 13:27 |
|
| lpapp: for sure, git cherry-pick of a range of commits (like your whole branch) will NOT check out anything | 13:28 |
|
lpapp
| so, your suggestion is git fetch, git switch topic, git rebase origin/dev? | 13:28 |
|
| it is one commit | 13:28 |
|
| there is not really a range of commits | 13:28 |
| → elkalamar joined | 13:28 |
|
mackerman
| You aren't appreciating that rebase is re-appling new commits from a common ancestor | 13:28 |
|
lpapp
| this is what I started the whole thing with: git switch -C new-topic; git am/apply the existing topi change | 13:29 |
|
| or just git cherry-pick old-topic | 13:29 |
| → MajorBiscuit joined | 13:29 |
|
cbreak
| lpapp: I have several suggestions, you'll have to try which one suits you. | 13:29 |
|
lpapp
| this original alternative I suggested works | 13:29 |
|
| I tried this out | 13:30 |
|
cbreak
| for git cherry-pick, don't forget the two dots | 13:30 |
|
lpapp
| but I am open to learn how git fetch improves anything here | 13:30 |
|
cbreak
| git cherry-pick ..topic | 13:30 |
|
| the two dots mean "all commits from the current branch to topic" | 13:30 |
|
mackerman
| fetch allows you to diff to the remote tracking branch, without unconditionally rebasing to it | 13:32 |
|
maryo
| I have migrated my SVN Repo to GIT and while pushing I am getting this error "remote: error: GH001: Large files detected. You may want to try Git Large File Storage"... Is there a way to remove that single file and push it back? | 13:32 |
|
ikke
| !filter-repo | 13:32 |
|
gitinfo
| A new git add-on that greatly improves on git-filter-branch: https://github.com/newren/git-filter-repo | 13:32 |
|
cbreak
| maryo: do you know git lfs? | 13:32 |
|
| instead of removing the file, you could use it. (that's what the error suggests) | 13:33 |
|
lpapp
| cbreak: is it just plain git fetch or do I need some options | 13:33 |
|
cbreak
| lpapp: git fetch alone will update stuff already. You can pass options if you want to restrict it. | 13:33 |
|
maryo
| cbreak, I could see it is a log file someone had committed to SVN Earlier by mistake and now when I migrated my SVN Repo to GIT the same got included. Instead of including it, I am checking whether that can safely removed from the repo | 13:34 |
|
ikke
| git fetch just updated remote tracking branches | 13:34 |
|
cbreak
| maryo: ok, then it's probably better to just kick it out. | 13:35 |
|
| in addition to the link ikke gave you, there's git filter-branch, an old-school way to try to deal with this, or git rebase -i | 13:35 |
|
lpapp
| so git fetch; git rebase origin/dev will be enough | 13:36 |
|
cbreak
| the latter will only really work well if it's a more recent commit, and you don't have complicated history | 13:36 |
|
| lpapp: yes, as long as ou don't switch branches | 13:36 |
|
| lpapp: but if you ever switch to an other feature branch, which has the old dev as basis... | 13:36 |
|
| or even if you ever go to the old dev directly... | 13:36 |
| ← FinnElija left | 13:37 |
| ← gxt left | 13:37 |
|
ikke
| If you want to do git fetch; git rebase, then you can also do git pull --rebase | 13:37 |
| → Sulky joined | 13:37 |
|
ikke
| the advantage of fetch is that you can inspect what the remote has before you intergrate it | 13:37 |
|
cbreak
| ikke: that won't rebase onto other branches though | 13:37 |
|
ikke
| correct | 13:37 |
|
cbreak
| I would try git rebase --onto origin/dev thefeaturebranch | 13:38 |
| → FinnElija joined | 13:38 |
|
ikke
| (I missed the context :P) | 13:38 |
| ← coot left | 13:38 |
| → lucas_ta joined | 13:38 |
|
cbreak
| I really would recommend ccache though :) it solves the problem in a much more sustainable and reliable way | 13:38 |
|
| if you can get it to work | 13:39 |
| → gxt joined | 13:40 |
|
maryo
| cbreak, I am trying this but I am not completely sure of what it is doing --> "git filter-branch -f --index-filter 'git rm --cached --ignore-unmatch log/jd-messenger-application.log' --prune-empty --tag-name-filter cat -- --all".. Do you see any issues with this command? | 13:42 |
|
ikke
| No, should be fine | 13:43 |
|
cbreak
| looks fine, yes | 13:43 |
|
| well, if you want to remove the file log/jd-messenger-application.log | 13:43 |
| ← fossdd left | 13:43 |
|
ikke
| and | 13:43 |
|
| using --tree-filter is faster than --index-filter | 13:43 |
|
cbreak
| no | 13:43 |
|
ikke
| ? | 13:43 |
|
cbreak
| --index-filter is faster | 13:43 |
|
| --tree-filter has to check out all the files | 13:44 |
|
ikke
| ooh | 13:44 |
|
cbreak
| --index-filter just updates the index | 13:44 |
|
ikke
| yeah | 13:44 |
| → fossdd joined | 13:44 |
|
ikke
| working tree | 13:44 |
| ← chexum left | 13:45 |
| ← gxt left | 13:45 |
| ← bindu left | 13:45 |
| ← cvmn left | 13:45 |
| → chexum joined | 13:46 |
| → bindu joined | 13:47 |
| ← FinnElija left | 13:47 |
| → cvmn joined | 13:48 |
| → lgc joined | 13:49 |
| ← lgc left | 13:52 |
| ← lucas_ta left | 13:53 |
| → lucas_ta joined | 13:54 |
| ← lucas_ta left | 13:56 |
| → lucas_ta joined | 13:56 |
| → coot joined | 13:57 |
| → atrigent_ joined | 14:00 |
| ← DF32 left | 14:03 |
|
lpapp
| I really do not know how ccache is more sustainable which required extra installation, but also caches, but there is no need for caches in the first place | 14:07 |
|
ikke
| It means you have to care less about things changing stat info of files | 14:08 |
| ← adanwan left | 14:08 |
|
lpapp
| yes, but if I care, it is more sustainable because I do not need extra software and caches | 14:08 |
| ← hoochmonger left | 14:08 |
| → adanwan joined | 14:08 |
|
lpapp
| so, I personally prefer to care about what I am doing. | 14:09 |
| ← GNUmoon left | 14:10 |
| → GNUmoon joined | 14:11 |
| → gxt joined | 14:13 |
| → FinnElija joined | 14:13 |
| → ajfriesen joined | 14:14 |
| → rickay joined | 14:15 |
| ← rickay left | 14:16 |
| → rickay joined | 14:16 |
| ← atrigent_ left | 14:16 |
| ← rickay left | 14:16 |
| → rickay joined | 14:17 |
| → keypusher joined | 14:17 |
| ← rickay left | 14:17 |
| → rickay joined | 14:18 |
| ← rickay left | 14:18 |
| ← adanwan left | 14:18 |
| → adanwan joined | 14:18 |
| → rickay joined | 14:19 |
| ← rickay left | 14:19 |
| → hoochmonger joined | 14:20 |
| → atrigent_ joined | 14:21 |
| ← dionysus69 left | 14:23 |
| → loulou_ joined | 14:23 |
| ← loulou_ left | 14:23 |
| → loulou_ joined | 14:23 |
| ← cvmn left | 14:24 |
| ← lolok left | 14:25 |
| ← bindu left | 14:27 |
| ← elkalamar left | 14:27 |
| → squirrel joined | 14:28 |
| → bindu joined | 14:28 |
| ← atrigent_ left | 14:28 |
|
maryo
| cbreak, I have deleted the file and pushed the repo to Git. When I compare the total commits `git rev-list --all --count` it shows 15278..Whereas total revisions in SVN is 37500.. So does that mean, I am missing some commits ? | 14:33 |
| ← coot left | 14:36 |
|
cbreak
| maryo: possibly. | 14:37 |
|
| I don't know how svn revisions work. | 14:37 |
|
| maybe some got skipped? | 14:37 |
| ← loulou_ left | 14:37 |
|
cbreak
| --prune-empty above will remove empty commits too | 14:37 |
|
| and maybe you didn't import branches from subversion either | 14:37 |
|
| svn is kind of dumb, all repos on a server share revision numbers | 14:38 |
|
| and all branches are just subdirectories in weird places | 14:38 |
| → thiago joined | 14:39 |
| ← off^ left | 14:39 |
|
maryo
| cbreak, is there a way to see the total count of empty commits in a repo? | 14:42 |
| ← sakitami left | 14:44 |
|
cbreak
| maybe by searching for them... | 14:46 |
|
| there should be none | 14:46 |
| → skapata joined | 14:47 |
| ← skapata left | 14:47 |
| → skapata joined | 14:47 |
| ← dflick__ left | 14:48 |
| ← adanwan left | 14:49 |
| → adanwan joined | 14:50 |
| → gast0n joined | 14:53 |
| → dflick__ joined | 14:56 |
| → G30RD13 joined | 14:58 |
| ← G30RD13 left | 14:58 |
| ← mon_aaraj left | 14:59 |
| ← alfredb left | 15:00 |
| → mon_aaraj joined | 15:01 |
| ← MiguelX413 left | 15:02 |
| → MiguelX413 joined | 15:03 |
| → vitali64 joined | 15:05 |
| ← chexum left | 15:09 |
| → chexum joined | 15:09 |
| → madewokherd joined | 15:18 |
| ← madewokherd` left | 15:20 |
| → lxsameer joined | 15:22 |
| → coot joined | 15:27 |
| → zebrag joined | 15:27 |
| → hamburgler joined | 15:28 |
| → nate4 joined | 15:28 |
| → bloody joined | 15:31 |
| ← nate4 left | 15:33 |
| → alfredb joined | 15:34 |
| ← rkta left | 15:35 |
| → dionysus69 joined | 15:39 |
| ← thebombzen left | 15:39 |
| → zachel joined | 15:44 |
| ← maryo left | 15:45 |
| ← pulse left | 15:49 |
| → loulou_ joined | 15:50 |
| ← loulou_ left | 15:50 |
| → loulou_ joined | 15:50 |
| → ferdna joined | 15:52 |
| → structoha joined | 15:55 |
| ← kevr left | 15:58 |
| → kevr joined | 16:00 |
| → sudoforge joined | 16:01 |
| → rgrinberg joined | 16:02 |
| → node1 joined | 16:04 |
| ← ___nick___ left | 16:05 |
| → vysn joined | 16:10 |
| → fflam joined | 16:10 |
| ← coot left | 16:12 |
| ← m0viefreak left | 16:12 |
| ← loulou_ left | 16:14 |
| → ___nick___ joined | 16:16 |
| ← mon_aaraj left | 16:19 |
| → mon_aaraj joined | 16:21 |
| ← node1 left | 16:22 |
| → jazzy joined | 16:23 |
| → node1 joined | 16:23 |
| ← ferdna left | 16:23 |
| ← node1 left | 16:23 |
| → atrigent joined | 16:30 |
| ← structoha left | 16:32 |
| → dav1d joined | 16:33 |
| ← atrigent left | 16:35 |
| ← thiago left | 16:35 |
| → elkalamar joined | 16:40 |
| ← elastic_dog left | 16:53 |
| ← lpapp left | 16:54 |
| → elastic_dog joined | 16:58 |
| ← fflam left | 16:58 |
| ← dflick__ left | 17:00 |
| → fflam joined | 17:01 |
| → rkta joined | 17:01 |
| → dnh joined | 17:04 |
| ← dav1d left | 17:04 |
| → dav1d joined | 17:05 |
| ← dnh left | 17:06 |
| ← mon_aaraj left | 17:07 |
| ← rgrinberg left | 17:08 |
| ← elkalamar left | 17:08 |
| → mon_aaraj joined | 17:09 |
| ← dav1d left | 17:12 |
| ← adanwan left | 17:13 |
| → dav1d joined | 17:14 |
| → adanwan joined | 17:15 |
| → bindu_ joined | 17:16 |
| → gxt_ joined | 17:16 |
| ← bindu left | 17:16 |
| ← FinnElija left | 17:16 |
| → FinnElija joined | 17:16 |
| → chexum_ joined | 17:17 |
| ← chexum left | 17:17 |
| ← gxt left | 17:17 |
| → wakeup joined | 17:25 |
| → loulou_ joined | 17:26 |
| ← loulou_ left | 17:26 |
| → loulou_ joined | 17:26 |
| → atrigent joined | 17:26 |
| ← squirrel left | 17:29 |
| → erarnitox joined | 17:30 |
| ← atrigent left | 17:37 |
| → coot joined | 17:38 |
| → tsraoien joined | 17:41 |
| ← loulou_ left | 17:42 |
| ← bindu_ left | 17:44 |
| ← konrados left | 17:45 |
| → bindu_ joined | 17:46 |
| → rgrinberg joined | 17:46 |
| → Jong joined | 17:48 |
| ← wakeup left | 17:51 |
| → otisolsen70 joined | 17:59 |
| ← jonosterman left | 18:04 |
| ← rgrinberg left | 18:06 |
| ← tirnanog left | 18:06 |
| → structoha joined | 18:07 |
| ← structoha left | 18:07 |
| ← coot left | 18:08 |
| → thebombzen joined | 18:10 |
| → Ragnor joined | 18:11 |
| ← dionysus69 left | 18:14 |
| → sp0ck joined | 18:15 |
| ← vdamewood left | 18:19 |
| → atrigent joined | 18:21 |
| → junebug joined | 18:22 |
| ← Ragnor left | 18:23 |
| ← atrigent left | 18:25 |
| ← iomari891 left | 18:28 |
| → pulse joined | 18:34 |
| ← Murr left | 18:34 |
| → Murr joined | 18:34 |
| ← crabbedhaloablut left | 18:35 |
| ← adanwan left | 18:35 |
| ← GNUmoon left | 18:35 |
| ← bindu_ left | 18:35 |
| ← gxt_ left | 18:35 |
| → bindu_ joined | 18:36 |
| → adanwan joined | 18:36 |
| → crabbedhaloablut joined | 18:36 |
| → gxt_ joined | 18:36 |
| → GNUmoon joined | 18:37 |
| ← junebug left | 18:39 |
| ← sp0ck left | 18:39 |
| ← adanwan left | 18:40 |
| → adanwan joined | 18:41 |
| ← tyson2 left | 18:41 |
| ← crabbedhaloablut left | 18:43 |
| → crabbedhaloablut joined | 18:43 |
| ← igemnace left | 18:47 |
| → rickybob joined | 18:49 |
| ← rickybob left | 18:50 |
| → YuGiOhJCJ joined | 18:50 |
| → rickybob joined | 18:51 |
| → Sazhen86 joined | 19:01 |
| → w4 joined | 19:09 |
| → rhe joined | 19:14 |
| ← ___nick___ left | 19:17 |
| → ___nick___ joined | 19:19 |
| ← ___nick___ left | 19:19 |
| ← hoochmonger left | 19:20 |
| → ___nick___ joined | 19:21 |
| → hoochmonger joined | 19:21 |
| ← crabbedhaloablut left | 19:22 |
| → crabbedhaloablut joined | 19:22 |
| → lucasta3 joined | 19:28 |
| ← lucas_ta left | 19:29 |
| → nate4 joined | 19:30 |
| → off^ joined | 19:31 |
| ← nate4 left | 19:34 |
| → forgotmynick joined | 19:38 |
| → lucas_ta joined | 19:40 |
| ← lucasta3 left | 19:41 |
| → ackyshake joined | 19:45 |
| ← m1dnight left | 19:50 |
| ← ackyshake left | 19:50 |
| → elkalamar joined | 19:51 |
| → snac73 joined | 19:51 |
| → m1dnight joined | 19:51 |
| ← off^ left | 19:51 |
| ← snac73 left | 19:56 |
| → snac73 joined | 19:58 |
| ← rickybob left | 20:01 |
| ← snac73 left | 20:03 |
| ← ___nick___ left | 20:04 |
| ← vitali64 left | 20:05 |
| → Betal joined | 20:07 |
| → rickybob joined | 20:08 |
| ← vysn left | 20:14 |
| → karabaja4 joined | 20:15 |
| → khan joined | 20:15 |
| → dsrt^ joined | 20:16 |
| ← khan left | 20:19 |
| → coot joined | 20:20 |
| → khan joined | 20:20 |
| khan → jenkiskhan | 20:21 |
| jenkiskhan → khan | 20:24 |
| khan → jenkis | 20:25 |
| jenkis → jenkiskhan | 20:25 |
| → vysn joined | 20:26 |
| ← jenkiskhan left | 20:27 |
| → jenkiskhan joined | 20:27 |
| ← elkalamar left | 20:34 |
| ← YuGiOhJCJ left | 20:36 |
| ← coot left | 20:42 |
| → dionysus69 joined | 20:49 |
| → Linkandzelda joined | 20:53 |
| → YuGiOhJCJ joined | 20:53 |
| → Coop joined | 20:55 |
| ← Coop left | 20:55 |
| → Coop joined | 20:56 |
| ← dionysus69 left | 20:56 |
| ← Coop left | 20:57 |
| → Coop joined | 20:57 |
| ← Sazhen86 left | 21:07 |
| ← vysn left | 21:19 |
| ← kyshoc left | 21:20 |
| → kyshoc joined | 21:20 |
| ← kyshoc left | 21:20 |
| → kyshoc joined | 21:20 |
| → elkalamar joined | 21:20 |
| → dnh joined | 21:20 |
| → dionysus69 joined | 21:22 |
|
rawtaz
| am i missing something, or is git not smart enough to be able to split a bunch of lines which are just additions, on those of them that are just empty lines (separating paragraphs of code) when you're in `git add -p` mode and press "s" for split? | 21:23 |
|
| it seems like the simplest thing, split on empty lines | 21:24 |
|
ikke
| rawtaz: it can only split entire hunks | 21:26 |
|
rawtaz
| yeah :< | 21:26 |
|
dodo
| there's e when you need it | 21:26 |
|
rawtaz
| i will have to go to war with the edit mode | 21:26 |
| → dflick__ joined | 21:26 |
|
rawtaz
| dodo: yes, i get that :) but it would be splendid it git split on empty lines too, because that would make a lot of sense in a lot of code editing situations | 21:27 |
|
| thanks for verifying! | 21:27 |
|
ikke
| rawtaz: I use emacs, where you can just stage single lines | 21:30 |
|
| tig supports that as well | 21:30 |
|
| as many other git interfaces | 21:30 |
|
rawtaz
| hm how does emacs and tig do that? does it run some git command that specifies to just stage a specific line of a file? | 21:30 |
| ← FinnElija left | 21:30 |
|
rawtaz
| either way, it would still be great it git supported this super simple thing with the regular split option | 21:31 |
|
| using a third party tool isnt the same thing really | 21:31 |
| → FinnElija joined | 21:31 |
| ← EvilDMP left | 21:31 |
|
ikke
| rawtaz: git interactive add just works with patches | 21:34 |
|
| other tools could just construct a virtual file with the expected contents to be staged and add that to the index | 21:34 |
| ← zer0bitz left | 21:36 |
| ← hamburgler left | 21:40 |
| ← dionysus69 left | 21:40 |
| → squirrel joined | 21:42 |
| → coot joined | 21:44 |
| → poprostumieciek joined | 21:44 |
| ← poprostumieciek left | 21:44 |
| → gco joined | 21:45 |
| ← dnh left | 21:48 |
| → tyson2 joined | 21:50 |
| → dionysus69 joined | 21:52 |
| ← dsrt^ left | 21:59 |
| ← otisolsen70 left | 22:00 |
| → vitali64 joined | 22:11 |
| ← feriman left | 22:13 |
| → zeenk joined | 22:14 |
| → maroloccio joined | 22:16 |
| → dsrt^ joined | 22:16 |
| ← forgotmynick left | 22:18 |
| ← DaNeenjah left | 22:20 |
| ← ghost43 left | 22:22 |
| → ghost43 joined | 22:23 |
| ← karabaja4 left | 22:24 |
| → karabaja4 joined | 22:25 |
| ← coot left | 22:27 |
| → poprostumieciek joined | 22:30 |
| ← poprostumieciek left | 22:31 |
| → coot joined | 22:31 |
| justmatt → justmatt_ | 22:32 |
| justmatt_ → justmatt | 22:32 |
| ← karabaja4 left | 22:33 |
| → karabaja4 joined | 22:34 |
| → bambanxx joined | 22:42 |
| ← vitali64 left | 22:43 |
| → lantech19446 joined | 22:48 |
| → dflick joined | 22:52 |
| ← kenanmarasli left | 22:52 |
|
rawtaz
| ikke: ah so thats how they do it | 22:52 |
| ← The_Blode left | 22:52 |
| ← w4 left | 22:53 |
| → w4 joined | 22:54 |
| ← dflick__ left | 22:55 |
| → loulou_ joined | 23:00 |
| ← loulou_ left | 23:00 |
| → loulou_ joined | 23:00 |
| ← tyson2 left | 23:03 |
| → vdamewood joined | 23:05 |
| ← loulou_ left | 23:11 |
| ← dionysus69 left | 23:14 |
| ← RAMIII left | 23:15 |
| → lantech19446_ joined | 23:18 |
| ← gast0n left | 23:25 |
| ← typicat left | 23:28 |
| ← dflick left | 23:31 |
| → nate4 joined | 23:31 |
| ← justmatt left | 23:32 |
| ← nate4 left | 23:36 |
| ← rickybob left | 23:41 |
| ← coot left | 23:41 |
| ← zeenk left | 23:43 |
| ← Lord_of_Life left | 23:43 |
| → Lord_of_Life joined | 23:44 |
| ← lantech19446_ left | 23:46 |
| ← lucas_ta left | 23:47 |
| → lucas_ta joined | 23:47 |
| → rickybob joined | 23:47 |
| → eqw joined | 23:50 |