IRCloggy #git 2022-01-14

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.

2022-01-14

← Gustavo6046 left00:01
← yagamilito left00:02
→ Gustavo6046 joined00:06
puff Evening. Long story short, I backed up my linux laptop to an external drive a couple months ago, upgraded the hard drive, restored... and because the external drive was vfat, it mangled the file perms.00:10
Now "git status" is telling me the file perms on a bunch of files are different.00:10
I'm trying to decide the best way to fix this. So far my bright idea is to pipe "git status" into a file to get the list of problem files, then use emacs to massage that into a brute force shell script to chmod everything to what git thinks it should be.00:11
← rgrinberg left00:13
Nei given that you don't have any other changes, you could git reset --hard00:15
be careful lest you throw away some uncommitted changes tho00:16
← hasu left00:16
→ hbautista joined00:16
puff Nei: hm...00:17
That might actually be easiest.00:17
← fikran left00:19
puff well, I still have the backups, let's give this a shot.00:20
Nei: Thanks.00:20
Nei wrong perms can be a pita :)00:20
→ fikran joined00:20
← phylaz left00:21
bookworm git doesn't track permissions but the execute bit00:23
so... backing up a fs in git isn't exactly working00:24
puff bookworm: ?00:24
bookworm: Was that to me? If so, I'm not following.00:24
→ Gaboradon joined00:24
→ chenqisu1 joined00:25
Nei it cannot perfectly restore your perms00:27
but probably good enough for your repo anyway00:27
;-))00:27
→ hasu joined00:28
← TonyStone left00:31
← palasso left00:32
← anaveragehuman left00:39
→ causasui joined00:42
← chenqisu1 left00:44
→ fabrao joined00:45
← Yruama left00:49
← m0viefreak left00:52
→ jazzy joined00:53
← hasu left00:59
← mat001_ left01:03
← Strom left01:10
→ Strom joined01:12
← pretty_dumm_guy left01:12
→ Xenguy joined01:14
← madewokherd left01:21
← Gaboradon left01:22
← nyah left01:22
← perrierjouet left01:26
← Murr left01:28
→ Murr joined01:28
← igemnace left01:35
← ColdKeyboard left01:36
→ Gaboradon joined01:38
→ rgrinberg joined01:49
→ TonyStone joined02:05
← kaichiuc1u left02:06
← rgrinberg left02:06
→ rgrinberg joined02:08
→ perrierjouet joined02:08
← Gurkenglas left02:17
→ kaichiuchu joined02:19
← rewt left02:21
→ rewt joined02:23
← rewt left02:24
→ anaveragehuman joined02:26
← perrierjouet left02:26
→ rewt joined02:26
← rewt left02:26
→ madewokherd joined02:27
← BSaboia left02:27
← fikran left02:28
→ chenqisu1 joined02:28
→ BSaboia joined02:29
← fstd_ left02:29
→ fstd joined02:29
→ perrierjouet joined02:30
→ fikran joined02:30
→ rewt joined02:33
← rgrinberg left02:36
→ thumbs joined02:36
→ rgrinberg joined02:38
← xkoncek left02:40
→ xkoncek joined02:41
→ vagabond_ joined02:41
vagabond_ Hello02:42
I got here after being told from another channel of #git on freenode.02:43
Am I in the right place?02:43
I have some questions about git submodules, and need to find help.02:44
mackerman Yes, this is the #git that was formerly on freenode.02:47
vagabond_ Thank you.02:47
← Swahili left02:48
→ Swahili joined02:49
← pmcnabb left02:49
vagabond_ So, about submodules, I have managed to clone one into my project. But the submodule itself is not quite enough to be used right away, and I needed to add some small patches to make it work with my project.02:50
Now, what do I do to make the patch available when cloning my project?02:50
My research has led me to answers that says I have to push my patch into the upstream submodule.02:52
Is there a way to make the patch unique to my project only?02:52
Or is there a way to achieve the same result with git subtree?02:52
← Swahili left02:53
← tkazi left02:56
→ tkazi joined02:57
← duderonomy left02:59
← FinnElija left03:10
→ finn_elija joined03:10
finn_elija → FinnElija03:10
← anaveragehuman left03:20
← vagabond_ left03:21
hendry1 → hendry03:22
→ vagabond_ joined03:25
← pyeve____ left03:26
→ ColdKeyboard joined03:26
← perrierjouet left03:30
← fabrao left03:37
→ mven joined03:40
← justsomeguy left03:45
→ kaiseisei joined03:55
← vagabond_ left03:55
→ perrierjouet joined03:56
→ jdeep joined04:00
← jdeep left04:03
← cdown left04:07
← perrierjouet left04:18
← ChmEarl left04:19
← fikran left04:21
← atrigent left04:21
← bket left04:23
← tyson2 left04:30
→ bket joined04:32
← ferdna left04:32
→ Kilroy7 joined04:41
← SleePy left04:41
→ SleePy joined04:42
← Kilroy left04:42
Kilroy7 → Kilroy04:42
→ vysn joined04:45
← rgrinberg left04:49
→ rgrinberg joined04:50
→ rapiz joined04:52
← Thanatermesis left04:53
→ Thanatermesis joined04:53
← rapiz left04:54
← wwwi left04:55
← arcatech left04:55
→ wwwi joined04:57
→ bytehackr joined05:03
← swistak left05:06
← Quack left05:07
← tar_xvf left05:08
← shokohsc left05:10
← ghost43 left05:12
← bindu left05:12
→ shokohsc joined05:12
→ bindu joined05:13
→ crashrep joined05:13
→ ghost43 joined05:13
← crashrep left05:15
→ crashrep joined05:15
← crashrep left05:15
→ crashrep joined05:15
→ madewokherd` joined05:18
→ lgc joined05:20
← lgc left05:20
← crashrep left05:21
← madewokherd left05:21
→ crashrep joined05:21
← The_Blode left05:22
← Ashburry left05:24
→ domini_ joined05:24
← domini_ left05:25
→ jusski joined05:25
← crashrep left05:29
→ crashrep joined05:29
→ The_Blode joined05:30
→ swistak joined05:31
→ Quack joined05:33
← crashrep left05:33
→ crashrep joined05:33
← hbautista left05:38
← crashrep left05:49
→ crashrep joined05:49
← andypandy_ left05:51
→ andypandy joined05:54
hendry i'm looking to generate some output to go into a slack channel when there is a git update. is there any guidance how to get a nicely formatted slack message showing the Author, Commit message, summary of file changes?05:55
ikke hendry: not sure what slack expects, but you can do some things with git log --format05:56
← Thanatermesis left05:56
→ ephemer0l joined05:59
hendry i want to show details of a particular commit push, `git log` afaict does a listing right? ... i think what i'm after is something like `git show --stat --oneline`05:59
← AbleBacon left05:59
ikke You'd use something like a post-update hook, that shows you want commits were pushed06:00
git log also can show --stat06:00
← Anu left06:06
→ Anu joined06:06
← skapata left06:19
← jusski left06:21
← bloody left06:21
→ whatsupdoc joined06:24
← cbreak left06:25
→ cbreak joined06:26
← causasui left06:27
→ cerill joined06:28
← keypusher left06:31
← thiago left06:34
hendry i'm puzzled how to just show author name and email from HEAD now. git show --format='%an <%ae>' HEAD // shows the diff too06:35
← cdleonard left06:36
→ cdleonard joined06:36
ikke add -s06:37
→ loki_val joined06:38
hendry ikke: thank you06:39
← crabbedhaloablut left06:39
→ causasui joined06:43
→ mat001 joined06:44
→ GlitterCooper joined06:45
GlitterCooper .random06:47
gitinfo <+artagnon> Analytical neuroscience tastes good. [12]06:47
← causasui left06:47
→ jazzy2 joined06:49
← jazzy2 left06:50
→ jazzy2 joined06:50
← molt left06:51
← mat001 left06:51
→ mat001_ joined06:51
← trilobite left06:52
→ trilobite joined06:52
← jazzy left06:52
→ Xavier7 joined06:53
← MichaelK left06:56
← jazzy2 left06:59
→ jazzy2 joined06:59
→ causasui joined06:59
← causasui left07:04
→ carl-- joined07:05
← xkuru left07:08
→ murii joined07:09
← GlitterCooper left07:11
← Masklin_Gurder left07:14
→ causasui joined07:15
→ atrigent joined07:16
← Novi left07:18
← causasui left07:19
→ Novi joined07:22
← mat001_ left07:28
← great_taste left07:32
→ causasui joined07:32
← causasui left07:37
← wyre left07:40
→ wyre joined07:41
← emf left07:45
→ emf joined07:47
→ kenanmarasli joined07:49
→ a6a45081-2b83 joined07:51
← mw_ left07:51
→ mw_ joined07:51
frobnic_ → frobnic07:54
← hoochmonger left07:56
→ hoochmonger joined07:58
→ palasso joined07:58
← Jenna16bit left08:02
→ Jenna16bit joined08:02
→ dansan_ joined08:03
← dansan left08:03
← Xavier7 left08:04
← unluckyshrubbery left08:04
→ otisolsen70 joined08:08
→ coot joined08:16
→ feriman joined08:18
→ TheCatBehemoth joined08:18
← Karyon left08:19
→ Karyon_ joined08:19
← a6a45081-2b83 left08:22
→ causasui joined08:22
← rgrinberg left08:24
→ Lemuria joined08:25
← Lemuria left08:25
← causasui left08:27
← bytehackr left08:28
← Gaboradon left08:37
→ Gaboradon joined08:37
→ gustik joined08:39
→ causasui joined08:39
← Gaboradon left08:40
→ Gaboradon joined08:41
← atrigent left08:41
← causasui left08:44
→ AnapodoPsalidi joined08:47
← AnapodoPsalidaki left08:50
← crashrep left08:51
→ crashrep joined08:52
← crashrep left08:53
→ AnapodoPsalidaki joined08:54
← AnapodoPsalidi left08:55
→ causasui joined08:56
→ Gurkenglas joined08:57
→ crashrep joined08:58
→ igemnace joined08:58
← Codaraxis_ left09:00
→ structoha joined09:01
→ Codaraxis_ joined09:01
← causasui left09:01
→ Ashburry joined09:01
← GreenAlpaca left09:03
→ GreenAlpaca joined09:04
→ omnio joined09:05
→ dviola joined09:07
← durham left09:09
→ AnapodoPsalidi joined09:09
→ Lemuria joined09:11
← Lemuria left09:11
← elastic_dog left09:12
← AnapodoPsalidaki left09:12
→ causasui joined09:13
→ perrierjouet joined09:13
→ adhawkins joined09:14
adhawkins I just made a branch while on another branch, so the new branch uses the other branch as its source. I haven't made any commits yet. Is there any way to change the 'root' of the branch I've just created to master? I realise I could just delete it and recreate it, but trying to expand my knowledge.09:15
← fling left09:17
← causasui left09:17
→ elastic_dog joined09:17
→ fling joined09:18
j416 adhawkins: it's not based on the other branch, it's based just on the same commit. You can delete and create it anew as you say. Or, you can check it out and reset to master.09:19
adhawkins j416: So essentially 'git reset --hard master'?09:20
j416 adhawkins: yep. take care to make sure you have everything committed as reset --hard will destroy any uncommitted changes.09:20
adhawkins: side-note, if you had made commits, rebase with --onto would be an easy fix.09:20
← Gustavo6046 left09:22
adhawkins Ok. No changes made, I realised my mistake as soon as I created the branch (I keep doing it in fact - maybe I should make an alias1)09:22
→ zen_coder joined09:22
← crashrep left09:22
→ crashrep joined09:23
← trafficjam left09:24
→ qubes joined09:24
← qubes left09:24
→ gittone joined09:25
← hgl left09:25
→ hgl joined09:25
← hgl left09:25
→ hgl joined09:25
j416 you can also use git branch -f09:25
← wre^ left09:27
← Murr left09:27
→ Murr joined09:28
← crashrep left09:28
→ causasui joined09:29
→ tirnanog joined09:31
← causasui left09:33
← perrierjouet left09:35
← elastic_dog left09:36
adhawkins Cool. Been using git for years and still learning! Thanks j41609:37
← GreenAlpaca left09:37
← Betal left09:39
→ zer0bitz joined09:41
→ elastic_dog joined09:42
→ causasui joined09:45
→ RiFo joined09:46
← causasui left09:50
→ MajorBiscuit joined09:51
← MajorBiscuit left09:51
→ MajorBiscuit joined09:51
→ unluckyshrubbery joined09:52
→ martti joined09:53
martti my tools keep coming up with new problems almost daily at this point. `git submodule sync --recursive; git submodule update --init --recursive --remote` in my project now fails with "Error: invalid branch: ."09:54
the output has been identified as coming from elsewhere. never mind.09:58
→ dsrt^ joined09:58
→ crashrep joined09:59
→ perrierjouet joined10:00
→ abu joined10:02
→ causasui joined10:02
← adhawkins left10:03
← causasui left10:06
→ duxsco joined10:08
← Lord_of_Life left10:08
martti → mar77i10:10
→ murii_ joined10:10
← murii left10:11
→ GreenAlpaca joined10:14
← GreenAlpaca left10:14
→ omnio_ joined10:15
← omnio left10:16
→ FollowTheRabbit joined10:18
← FollowTheRabbit left10:19
→ causasui joined10:19
← very_sneaky left10:20
← duxsco left10:21
→ very_sneaky joined10:22
← causasui left10:23
← Akiva left10:27
→ Swahili joined10:28
→ vaio joined10:28
← cerill left10:31
→ tulpa_ joined10:36
→ causasui joined10:37
← gustik left10:41
← causasui left10:41
← Techcable left10:44
→ ferr_ joined10:45
← fercell left10:45
→ Guest31 joined10:46
→ fercell joined10:52
← ferr_ left10:53
← elastic_dog left10:53
→ elastic_dog joined10:54
← chenqisu1 left10:55
makara1 so I see there's a partial clone. How can I do a partial fetch?11:00
jast I don't think it's possible yet11:01
I mean you can experiment with changing the config for an existing repo/remote: remote.foo.promisor and remote.foo.partialclonefilter11:03
→ john_johnk joined11:03
jast not sure if that use case is supported, I've never used partial clone myself11:03
→ Masklin_Gurder joined11:04
makara1 im happy to wait. I just use --depth=1 but Jenkins can't generate a decent changelog between builds11:05
→ Lord_of_Life joined11:07
→ enoq joined11:07
← abu left11:09
← zer0bitz left11:11
→ causasui joined11:12
→ zer0bitz joined11:13
← coot left11:14
→ coot joined11:15
← tulpa_ left11:15
→ tulpa_ joined11:16
← causasui left11:16
→ tyson2 joined11:17
← john_johnk left11:17
← tyson2 left11:26
→ causasui joined11:28
← vishal left11:30
← Byteflux left11:32
← causasui left11:32
→ Byteflux joined11:33
→ tyson2 joined11:34
→ vishal joined11:36
← perrierjouet left11:37
furrymcgee submodules are kind of partial repositories, there is --depth option in submodule add command11:42
← crashrep left11:43
→ crashrep joined11:43
← Guest31 left11:44
→ nyah joined11:44
→ AnapodoPsalidaki joined11:46
← AnapodoPsalidi left11:47
→ AnapodoPsalidi joined11:48
← AnapodoPsalidaki left11:51
j416 makara1: you might want to look at clone --filter; man git-clone to keep history but filter out objects11:52
gitinfo makara1: the git-clone manpage is available at https://gitirc.eu/git-clone.html11:52
j416 perhaps this is the same as jast mentions (?), only as flag instead of config.11:53
makara1 i don't want to use clone11:54
j416 aha; I thought that was what you were doing. Maybe I misread.11:54
← MajorBiscuit left11:59
→ MajorBiscuit joined11:59
← omnio_ left12:00
← palasso left12:01
← Codaraxis_ left12:02
→ palasso joined12:02
→ Codaraxis_ joined12:03
→ cdown joined12:04
← CMAraujo87 left12:07
→ node1 joined12:07
→ hex_ joined12:07
← hex_ left12:07
← enoq left12:09
← structoha left12:15
→ causasui joined12:18
→ keypusher joined12:23
← node1 left12:24
← causasui left12:24
← omero left12:25
→ Techcable joined12:26
→ keypushe- joined12:26
← keypusher left12:27
keypushe- → keypusher12:30
jazzy2 → jazzy12:31
← whatsupdoc left12:33
→ spare joined12:35
→ causasui joined12:36
wwwi hello12:40
→ iomari891 joined12:41
← causasui left12:41
wwwi suppose i change a file in branch master, then in branch new I also change the file, then I run git merge to merge the differences, why would i want to do git rebase instead?12:41
→ GreenAlpaca joined12:43
makara1 well you can avoid the merge commit12:44
← GreenAlpaca left12:45
jast wwwi: !merge_vs_rebase12:50
gitinfo wwwi: [!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html12:50
→ causasui joined12:55
→ john_johnk joined12:56
→ enoq joined12:56
→ mannequin joined12:58
← kenanmarasli left12:59
← causasui left13:00
wwwi thank you makara1 and jast13:02
← kaiseisei left13:02
← warthog9 left13:03
→ GlitterCooper joined13:03
wwwi is it ok to never use rebase and rely on merge all tgether?13:04
makara1 sure13:05
bremner that depends on the project, but if it's just you, then sure13:05
wwwi makara1, ok13:05
→ goldfish joined13:05
wwwi thank you makara1 and bremner13:05
→ warthog9 joined13:06
← jazzy left13:07
← gittone left13:08
→ causasui joined13:11
← tsujp left13:13
→ epolanski joined13:14
← causasui left13:16
→ perrierjouet joined13:26
← Murr left13:27
→ Murr joined13:27
← MajorBiscuit left13:29
→ MajorBiscuit joined13:29
→ rsx joined13:33
← john_johnk left13:36
← perrierjouet left13:39
← troyt left13:41
→ bytehackr joined13:44
→ causasui joined13:45
→ DrowningElysium joined13:49
→ perrierjouet joined13:49
← GlitterCooper left13:50
← causasui left13:50
← goldfish left13:50
Karyon_ → Karyon13:59
→ omnio_ joined14:00
→ thiago joined14:05
→ bloody joined14:09
fakuve Hi again guys , by creating simultaneous worktrees , can you simultaneously commit the changes on eachone of them ?14:12
Then removing the worktrees once finnshed? (so a way to modify branches simultaneously)14:13
→ fikran joined14:13
fakuve Or it is mostly intended to compare files14:13
but not modifying the current HEAD branch14:13
(I mean not modifyig the rest that are not the HEAD branch)14:14
← enoq left14:14
→ causasui joined14:18
osse fakuve: you can commit in all worktrees yes14:19
← FinnElija left14:20
→ FinnElija joined14:20
fakuve osse: ok cheers14:21
← MajorBiscuit left14:21
→ stef204 joined14:22
← causasui left14:22
← stef204 left14:23
← Xenguy left14:24
← vakera_pingveno left14:31
→ MajorBiscuit joined14:32
← omnio_ left14:33
← kaichiuchu left14:34
→ vatralum_ joined14:39
→ PCatinean joined14:39
← iomari891 left14:40
→ stef204 joined14:40
→ Thanatermesis joined14:41
→ xkuru joined14:50
← hoochmonger left14:52
fakuve Once I commit a project can I recall previous commits oh that same project?14:52
(meaning files and filestructure? ) or that is impossible?14:52
vatralum_ → vatralum14:53
osse define recall14:53
fakuve So my case. I'm using an html template to create a website14:53
→ hoochmonger joined14:53
fakuve (pretty normal stuff in compare with what you may do guys)14:53
So , I'm modifying it with my things , but I would like to be able to get back to the initial state of the template14:54
Also if possible the middle commits "snapshots" ...14:54
should I want to revert something back14:54
→ node1 joined14:55
fakuve Do I have to create new branches for that?14:55
Or does git keeps track of every single file in the project at every single commit?14:55
mackerman "git switch" will set your working tree, the files, to that branch14:55
osse yes, to the latter.14:55
and you can craeate new branches starting off at older commits14:56
fakuve Ok so thats the way to go14:56
Create new branches14:56
osse makes the most sense to me14:57
but you can overwrite all you have now with what you had before14:57
mackerman You also can extract any tree into a tar or zip with "git archive"14:57
fakuve mackerman: that makes sense14:58
mackerman Including tags, so you might tag a release, archive it, and package it up for use.14:58
fakuve osse: Ok so you are saying it is a bit risky if I don't pay attention14:58
→ atrigent joined14:58
osse No I'm not saying that14:59
→ gast0n joined14:59
fakuve Ok , alright I see14:59
I will do my research from here14:59
osse I mean intentionally overwrite, in a new commit14:59
which you can revert as you please14:59
fakuve Oks15:00
osse as long as you commit, nothing is risky. sort of15:00
fakuve Ok I see , thanks again!15:00
← node1 left15:01
← tyson2 left15:03
fakuve One thing you may know or not know in here (this is more github) , are there any implications with naming a branch `gh-pages` ? I could post a website regardless of naming it `gh-pages` or `master` or whatever15:09
→ great_taste joined15:09
← dsrt^ left15:10
osse with gh-pages github will host it for you, no?15:12
as in actually render it15:12
→ causasui joined15:12
← gast0n left15:12
fakuve osse: it renders anyways I guess15:13
I don't know if it is a matter of this `jekyll` pages15:13
but static pages are been served regardless of the branchName15:14
→ skapata joined15:14
← skapata left15:14
→ skapata joined15:14
← vatralum left15:15
mackerman Branch name to build GitHub pages should be configurable.15:15
Nei in the first version of github, they were only rendered when the branch was named gh-pages15:15
mackerman For more on that see ##github channel15:15
→ vatralum joined15:15
Nei nowadays I think it's still the default but freely configurable15:15
← causasui left15:17
← vatralum left15:18
→ vatralum joined15:18
→ Vonter joined15:18
← AnapodoPsalidi left15:19
→ Student joined15:20
Student Is that 760 people connected to this chat?15:22
OnlineCop In my repo, I've got both new and modified files. I want to stash one of the new files: `git add my_script.sh; git stash push --[some_commands_here]` but I don't want it to stash any of the other new/modified files. Will `stash push`ing with no arguments (other than `-m` commit message) stash only this single file that I've added to the index?15:23
760 people, bots, or (most likely) bouncers.15:23
osse OnlineCop: seems like you can give a list of files to stash15:24
git stash push -- my_script.sh15:25
OnlineCop Cool; let me try that.15:25
Yup, that's what I needed. Thanks!15:26
→ enoq joined15:26
← Murr left15:27
→ Murr joined15:27
← Student left15:28
→ causasui joined15:30
← Techcable left15:30
→ Techcable joined15:31
← GeorgeK left15:31
← causasui left15:34
← spare left15:35
← vatralum left15:36
← stef204 left15:36
→ vatralum joined15:36
← vatralum left15:37
→ vatralum joined15:37
→ causasui joined15:47
→ mat001 joined15:48
← causasui left15:51
rossome_ → rossome15:53
← mat001 left15:53
→ madewokherd joined15:56
→ john_johnk joined15:56
← madewokherd` left15:59
→ structoha joined16:00
→ tyson2 joined16:02
→ causasui joined16:03
→ stef204 joined16:03
→ graywolf joined16:04
← john_johnk left16:05
→ GlitterCooper joined16:05
← causasui left16:07
graywolf Hi, I've question regarding git fetch. When I have up-to-date repository, git fetch still fetches over 4MB of data. Is that 1. expected 2. something that can be optimized? I originally expected that fetch on up-to-date repo is almost free, but that does not seem to be the case.16:08
← GlitterCooper left16:09
mackerman Network transfer, or space on disk?16:10
graywolf Network transfer16:10
(number is reported by `GIT_SSH_COMMAND='ssh -v' git fetch`)16:10
imMute Are you absolutely sure you already had everything? what happens if you do git fetch a second time very shortly after the first?16:11
graywolf imMute: yeah I'm sure, I've tried this multiple times and it happens every time.16:12
imMute 4MB does seem a little excessive. maybe it's a very large repo?16:12
graywolf du -sh .git reports 259M16:13
← structoha left16:13
← BSaboia left16:14
→ structoha joined16:14
→ BSaboia joined16:14
graywolf It looks (based on -v), that vast majority of the transfer happens as response to `Sending command: git-upload-pack '/foo/bar.git'`; Are there any server-side optimizations that could help? Somehow telling git to gc or whatever?16:14
← stef204 left16:19
mackerman Does the remote share history, in particular were either cloned from each other?16:19
← fikran left16:20
→ causasui joined16:20
mackerman man git fetch-pack implies that there are corner cases where it prints everything.16:20
gitinfo the git-fetch-pack manpage is available at https://gitirc.eu/git-fetch-pack.html16:20
vatralum → vatralum_16:21
← rsx left16:21
← stkrdknmibalz left16:22
→ fikran joined16:22
graywolf yeah local was created using git clone $REMOTE, and it also happens on clean clone I've tried just now16:23
→ m0viefreak joined16:23
→ OnkelTem joined16:23
← causasui left16:25
graywolf The repository has fairly large number of tags (25k), could it be related? I'm not sure what exactly is inside the fetched pack. Can I explore that somehow?16:26
imMute the two sides have to exchange a list of branches/tags and what commits they're at so they know what objects need to be transferred. a large number of branches/tags was going to be my next guess16:28
→ Akiva joined16:29
← Vonter left16:29
→ marc-o joined16:29
graywolf Ah, so it actually fetches everything and not just current branch. I assumed tags would not be an issues unless --tags was provided to the fetch :/16:30
← carl-- left16:31
→ Vonter joined16:35
imMute I wouldn't think so either. I think there's a command line that makes fetch get tags without the --tags flag, maybe check if you have that turned on?16:37
→ sudoforge joined16:38
→ causasui joined16:38
← EvilDMP left16:38
→ EvilDMP joined16:40
← Akiva left16:42
← causasui left16:42
→ Betal joined16:43
← coot left16:43
→ spare joined16:47
wwwi an automatic merge occurs when git is sure that there not any conflicts?16:48
→ meator joined16:48
wwwi *are not16:48
imMute if the merge didn't complain about conflicts, then there weren't conflicts and the merge succeeded...16:49
a merge won't happen without you telling git to do it though16:49
wwwi imMute, I see, thank you16:50
→ panekadamek joined16:52
→ causasui joined16:54
→ snowyforest joined16:55
→ gasbag joined16:57
→ ozoned joined16:58
→ vicfred joined16:58
← causasui left16:59
ozoned → odoood17:05
← MajorBiscuit left17:05
→ durham joined17:09
← vatralum_ left17:11
→ causasui joined17:11
← panekadamek left17:12
→ mat001 joined17:13
→ Narrat joined17:14
← epolanski left17:14
← gxt left17:14
→ gxt joined17:15
← causasui left17:16
→ ChmEarl joined17:18
← ano left17:21
→ ano joined17:21
← Murr left17:27
→ Murr joined17:27
→ rgrinberg joined17:27
→ goldfish joined17:28
→ causasui joined17:28
→ hbautista joined17:28
← spare left17:29
← tulpa_ left17:29
→ spare joined17:30
← spare left17:30
→ duxsco joined17:31
→ john_johnk joined17:31
← causasui left17:33
← bytehackr left17:35
→ bytehackr joined17:36
← mat001 left17:37
→ mat001 joined17:39
→ constxd joined17:39
constxd kings17:39
i ran git merge other-branch -Xignore-all-space17:39
and yet the line endings in a bunch of files changed17:39
am i misunderstanding what that flag should do17:40
← Vonter left17:43
→ causasui joined17:45
graywolf imMute: I've tried it with --no-tags, and it's still slow. So that is probably not. If I read the manpage correctly, tags that points into histories being fetched are also fetched, however it's slow even when I try --no-tags :/17:46
← snowyforest left17:46
rewt constxd, the way I read man git-merge is that if other-branch has non-whitespace changes on that line, and your branch only has whitespace changes (or no changes), then it will take the other-branch's line as is, including whatever whitespace they have17:48
gitinfo constxd: the git-merge manpage is available at https://gitirc.eu/git-merge.html17:48
← causasui left17:49
constxd rewt: i want to keep my whitespace but take their non-whitespace changes17:49
is there any easy way to do that17:49
that you know of17:49
rewt i don't think git can do that17:50
← OnkelTem left17:51
← rgrinberg left17:53
← Maxattax left17:58
← PCatinean left18:01
→ kenanmarasli joined18:01
← structoha left18:02
→ causasui joined18:02
→ snowyforest joined18:03
→ Maxattax joined18:03
→ Guest509 joined18:05
→ coot joined18:05
→ mat001_ joined18:06
← causasui left18:07
← mat001 left18:07
→ spare joined18:08
← Guest509 left18:08
→ tulpa_ joined18:09
→ Akiva joined18:13
← zen_coder left18:13
← murii_ left18:13
→ zen_coder joined18:15
→ murii joined18:15
→ causasui joined18:18
→ AbleBacon joined18:22
← causasui left18:23
→ wre^ joined18:25
→ omero joined18:29
← fikran left18:30
→ fikran joined18:31
← bytehackr left18:34
→ causasui joined18:35
justIrresolute → justJustache18:38
← coot left18:38
← john_johnk left18:38
← Akiva left18:39
← causasui left18:39
→ maxzor joined18:43
← snowyforest left18:43
→ snowyforest joined18:43
→ pyevery__ joined18:44
← duxsco left18:45
← zen_coder left18:48
→ maxzor_ joined18:49
→ jlucas joined18:51
← maxzor left18:51
jlucas ...18:52
→ causasui joined18:53
← vicfred left18:54
← goldfish left18:55
← Noisytoot left18:57
← maxzor_ left18:57
← causasui left18:58
← vysn left19:00
→ whatsupdoc joined19:01
→ node1 joined19:09
← graywolf left19:09
→ causasui joined19:10
← causasui left19:14
→ carl--- joined19:18
→ coot joined19:23
← node1 left19:24
← Murr left19:27
→ causasui joined19:27
→ Murr joined19:27
← mat001_ left19:30
→ mat001 joined19:31
← causasui left19:32
← mat001 left19:34
→ mat001 joined19:35
← cmbengue left19:36
← snowyforest left19:43
→ vatralum joined19:44
→ GlitterCooper joined19:54
→ terminalpusher joined19:58
→ Noisytoot joined20:01
→ causasui joined20:01
→ snowyforest joined20:02
← mud left20:03
← causasui left20:06
→ duxsco joined20:14
← duxsco left20:17
→ causasui joined20:19
← vatralum left20:20
← causasui left20:23
← snowyforest left20:28
→ mud joined20:30
← spare left20:34
← mud left20:34
← wre^ left20:36
→ causasui joined20:37
→ wre^ joined20:38
← fikran left20:38
← chexum left20:39
→ chexum joined20:40
→ fikran joined20:41
← causasui left20:41
→ cvmn joined20:44
→ snowyforest joined20:45
← TheCatBehemoth left20:46
→ jstein joined20:50
← murii left20:53
→ Codaraxis__ joined20:54
→ duderonomy joined20:54
→ causasui joined20:55
← Codaraxis_ left20:58
→ johnjaye joined20:58
johnjaye is there a guide or best practice on how to backup a git repository?20:58
would git clone followed by tar and gzip be sufficient?20:58
→ hedgecoder joined20:58
← causasui left20:59
Marmotte backup a git repository ?21:01
← meator left21:01
Marmotte git clone (with or without --bare) and git fetch to "backup" from remote to local, simply git push to "backup" from local to remote21:02
→ duxsco joined21:02
Marmotte nothing else IMHO21:02
→ molt joined21:05
← duxsco left21:05
← molt left21:07
← kenanmarasli left21:08
← jstein left21:08
→ kenanmarasli joined21:08
← EvilDMP left21:10
← Narrat left21:10
→ causasui joined21:11
→ murii joined21:12
← causasui left21:16
→ kn07_ joined21:22
hedgecoder My git repo kind of needs to be organized in 2 different ways for 2 different use cases which doesn't play well with history, so I want to use a script to copy files out of the git repo for testing purposes. is my approach wrong? more info https://upaste.de/4si21:27
→ causasui joined21:28
Nei why cant you organise your repo to match the required structure?21:30
hedgecoder i suppose I can just make those empty folders but it doesnt really change the main problem (I can't have 2 git repos living in my dedicated server's root folder)21:32
← causasui left21:32
hedgecoder i suppose i can just make the structure match exactly* i mean21:32
Nei does the server support symbolic links?21:32
then you could change "just" a singe link instead of all files21:33
hedgecoder i'd have to check. you can symlink folders right?21:33
Nei yes21:34
hedgecoder that sounds like it would probably work. thanks. then I only have to clean up a few symlinks, and no worries about cp not dealing with removed or renamed files21:35
→ Rashad joined21:35
Nei yes. if it works21:35
← hedgecoder left21:36
← Rashad left21:38
← gasbag left21:38
← mat001 left21:40
→ donald1 joined21:41
donald1 Hello. I want to use the command "cargo tarpaulin --ciserver travis-ci --coveralls <my SECRET token>" on travis ci with the yml file to setup coverall on github. But how to get <my SECRET token> if I can not hard code it in the yml file please?21:43
Nei travis ci has a concept of "secrets" that you put somewhere externally in their UI21:44
→ causasui joined21:44
Nei then you can use placeholders in the yml file and the secret is only there on travis21:44
donald1 Nei could you detail the steps please?21:44
ah21:44
then if I create a file know as .coverall nobody could read it and hack me?21:45
Nei https://docs.travis-ci.com/user/environment-variables/#defining-variables-in-repository-settings21:46
none of this is git related btw :)21:46
← causasui left21:48
← snowyforest left21:49
→ snowyforest joined21:50
→ mat001 joined21:55
→ jab416171 joined22:01
← odoood left22:04
← dansan_ left22:07
→ EvilDMP joined22:10
→ gustik joined22:12
← terminalpusher left22:12
→ ZacSharp joined22:12
← gustik left22:13
→ zebrag joined22:13
← donald1 left22:14
→ dansan joined22:15
← carl--- left22:17
← fstd left22:24
→ fstd_ joined22:24
← FinnElija left22:26
→ finn_elija joined22:26
finn_elija → FinnElija22:26
→ Celeo joined22:30
← fstd_ left22:31
← ZacSharp left22:34
→ TheCatBehemoth joined22:34
← GlitterCooper left22:35
← cvmn left22:35
→ rgrinberg joined22:37
← enoq left22:38
→ fstd joined22:39
← duderonomy left22:42
→ Rashad joined22:43
→ duderonomy joined22:46
→ mat001_ joined22:47
← fikran left22:48
→ ramblebamble joined22:48
← Rashad left22:49
← mat001 left22:49
← hoochmonger left22:49
→ fikran joined22:50
← thiago left22:56
← murii left22:57
← rgrinberg left23:02
← pizdets_ left23:02
→ pizdets joined23:03
→ rgrinberg joined23:09
→ ferdna joined23:09
heftig[m] → heftig23:11
← zebrag left23:13
← pyevery__ left23:14
→ pyevery__ joined23:14
← pyevery__ left23:20
← rgrinberg left23:21
→ causasui joined23:22
← otisolsen70 left23:24
← causasui left23:27
→ anaveragehuman joined23:27
← Pseudocrat left23:27
→ Pseudocrat joined23:28
← kenanmarasli left23:29
← EvilDMP left23:29
← tulpa_ left23:31
→ causasui joined23:39
← causasui left23:44
← Celeo left23:46
→ Xenguy joined23:51
→ chenqisu1 joined23:53
→ Guest81 joined23:54
→ jazzy joined23:54
← Guest81 left23:54
→ thiago joined23:55
← coot left23:58
← TheCatBehemoth left23:58

Logs Search ←Prev date Next date→ Channels Documentation