| 2022-03-09 |
| → kadoban joined | 00:00 |
| ← Sulky__ left | 00:00 |
| ← Saloframes left | 00:02 |
| ← austin987 left | 00:02 |
|
winter
| is there a way to expire reflog entires that are unreachable from all branches, not just the current one? (seems a bit overly destructive otherwise) | 00:03 |
|
| or does `git reflog expire` only act on the reflog for the current HEAD, therefore any other branch's reflog isn't touched? | 00:03 |
| ← wilz left | 00:08 |
| → Saloframes joined | 00:09 |
| ← sa0 left | 00:09 |
| → sa0 joined | 00:10 |
| → bambanxx joined | 00:10 |
| ← Tobbi_ left | 00:13 |
| ← sa0 left | 00:14 |
| ← bertvvvs left | 00:17 |
| → bertvvvs joined | 00:17 |
| ← bertvvvs left | 00:17 |
| ← hoochmonger left | 00:18 |
| → donofrio joined | 00:20 |
| → wilz joined | 00:21 |
| ← Saloframes left | 00:22 |
| → bertvvvs joined | 00:23 |
| ← sobkas left | 00:29 |
| → geowiesnot joined | 00:30 |
| → sobkas joined | 00:30 |
| → reprazent joined | 00:32 |
| ← vakera_pingveno left | 00:33 |
| ← rairden left | 00:33 |
| → Sulky__ joined | 00:35 |
| ← sobkas left | 00:35 |
| → kaiseisei joined | 00:35 |
| → sobkas joined | 00:36 |
| ← jmcb left | 00:37 |
| → jmcb joined | 00:37 |
| ← Sulky_ left | 00:38 |
| ← kaiseisei left | 00:39 |
| → kaiseisei joined | 00:39 |
| ← kaiseisei left | 00:40 |
| → kaiseisei1 joined | 00:40 |
| kaiseisei1 → kaiseisei | 00:42 |
| → R2robot joined | 00:46 |
| ← emf left | 00:47 |
| → Xenguy joined | 00:47 |
| ← reprazent left | 00:48 |
| ← foul_owl left | 00:48 |
| → foul_owl joined | 00:51 |
| → emf joined | 00:53 |
| ← sobkas left | 00:55 |
| → reprazent joined | 00:55 |
| ← Tangent-Man left | 00:57 |
| ← foul_owl left | 01:00 |
| ← vdamewood left | 01:02 |
| ← dsrt^ left | 01:03 |
| → nattiestnate joined | 01:03 |
| → vdamewood joined | 01:03 |
| ← nattiestnate left | 01:04 |
| ← kaiseisei left | 01:05 |
| → kaiseisei joined | 01:06 |
| ← analoq left | 01:07 |
| ← bambanxx left | 01:11 |
| ← geowiesnot left | 01:14 |
| → foul_owl joined | 01:15 |
| ← kaiseisei left | 01:15 |
| ← x88x88x left | 01:16 |
| → kaiseisei joined | 01:18 |
| ← kaiseisei left | 01:18 |
| → kaiseisei joined | 01:19 |
| → structoha joined | 01:21 |
| ← jstein left | 01:22 |
| → jstein joined | 01:22 |
| ← structoha1 left | 01:24 |
| → ThorMojito joined | 01:28 |
| ← Yruama left | 01:30 |
| ← kaiseisei left | 01:30 |
| → kaiseisei joined | 01:33 |
| → sa0 joined | 01:35 |
| ← jmcb left | 01:37 |
| ← sa0 left | 01:40 |
| → capn joined | 01:40 |
| → alt-romes joined | 01:44 |
| ← bertvvvs left | 01:44 |
| ← ThorMojito left | 01:45 |
| ← tehenderz left | 01:46 |
| → off^ joined | 01:46 |
| → tehenderz joined | 01:46 |
| ← romesrf left | 01:47 |
| → rgrinberg joined | 01:49 |
| ← ishutin left | 01:50 |
| → ishutin joined | 01:51 |
| ← jstein left | 01:53 |
| → jazzy joined | 01:56 |
| ← magic_ninja left | 01:59 |
| → magic_ninja joined | 02:00 |
| → analoq joined | 02:03 |
| ← rgrinberg left | 02:04 |
| → rgrinberg joined | 02:07 |
| ← nyah left | 02:08 |
| → srinidhi joined | 02:17 |
| → Saloframes joined | 02:22 |
| → vysn joined | 02:22 |
| ← emf left | 02:30 |
| ← mgedmin left | 02:30 |
| → mgedmin joined | 02:33 |
| → ColdKeyboard joined | 02:44 |
| ← alt-romes left | 02:45 |
| ← kaiseisei left | 02:50 |
| → kaiseisei joined | 02:50 |
| → Erisa joined | 02:58 |
| ← bloody left | 03:01 |
| ← tchan left | 03:05 |
| → Jacques joined | 03:08 |
| → saroy joined | 03:09 |
| → tchan joined | 03:10 |
| ← nivag left | 03:14 |
| → nivag joined | 03:15 |
| ← tehenderz left | 03:36 |
| → tehenderz joined | 03:36 |
| ← luke-jr left | 03:40 |
| → irc_user joined | 03:48 |
| → luke-jr joined | 03:50 |
| ← led_belly_ left | 04:05 |
| ← Jacques left | 04:06 |
| → ThorMojito joined | 04:08 |
| → forgotmynick joined | 04:15 |
| ← ThorMojito left | 04:23 |
| → anaveragehuman joined | 04:35 |
| ← structoha left | 04:40 |
| → structoha joined | 04:46 |
| ← DoofusCanadensis left | 04:56 |
|
mra90
| git show --name-only also gives commit message how to get ride of that and make it truly "file name only"? | 04:56 |
| → k8yun joined | 04:59 |
| → vakera_pingveno joined | 05:04 |
| ← Betal left | 05:06 |
| → Betal joined | 05:08 |
| ← tyson2 left | 05:16 |
| ← ferdna left | 05:23 |
| ← off^ left | 05:24 |
| → mcpackey joined | 05:26 |
| ← ChmEarl left | 05:27 |
| → hbautista joined | 05:27 |
| ← analoq left | 05:30 |
| → analoq joined | 05:32 |
| ← Thanatermesis left | 05:36 |
| ← xkuru left | 05:38 |
| ← great_taste left | 05:38 |
| ← rgrinberg left | 05:48 |
| ← crabbedhaloablut left | 05:48 |
| → crabbedhaloablut joined | 05:48 |
| ← Gustavo6046 left | 05:50 |
| ← omero left | 05:51 |
| → xkuru joined | 05:53 |
| → Gustavo6046 joined | 05:56 |
| ← chenqisu1 left | 05:59 |
| → omero joined | 05:59 |
| ← k8yun left | 06:01 |
| → coot joined | 06:01 |
|
mra90
| how to return to some entry from git reflog? | 06:03 |
|
| just git checkout <hash> ? | 06:03 |
| → madewokherd joined | 06:04 |
| ← pulse left | 06:05 |
|
mra90
| ok looks like git reset --hard <hash> is the way to go | 06:06 |
| ← madewokherd` left | 06:08 |
| ← Gustavo6046 left | 06:10 |
|
mra90
| I have an issue with gerrit - it says "! [remote rejected] ..." but yet the gerrit review page has been updated oO | 06:14 |
| ← CATS left | 06:17 |
| ← tejr left | 06:17 |
| ← bindu left | 06:17 |
| → szymon joined | 06:18 |
| → bindu joined | 06:18 |
| → tejr joined | 06:18 |
| → Gustavo6046 joined | 06:25 |
| ← xkuru left | 06:27 |
| ← structoha left | 06:28 |
| ← vicecea left | 06:40 |
| ← szymon left | 06:40 |
| → vicecea joined | 06:40 |
| → tsujp joined | 06:44 |
| ← kaiseisei left | 06:44 |
| → kaiseisei joined | 06:44 |
| ← kaiseisei left | 06:45 |
| → xkuru joined | 06:45 |
| ← xkuru left | 06:46 |
| → xkuru joined | 06:47 |
| → kaiseisei joined | 06:47 |
|
hendry
| i have this weird issue where git log is not the same as my `tig` view, is it because of merging? ... -very confused | 06:47 |
| ← pyeveryt_ left | 06:52 |
| ← forgotmynick left | 06:55 |
| ← Betal left | 06:55 |
| ← tehenderz left | 06:58 |
| → tehenderz joined | 06:59 |
| ← bigGopher left | 07:00 |
| → Intelo joined | 07:02 |
| ← skapata left | 07:02 |
| → AnapodoPsalidaki joined | 07:03 |
| ← xkuru left | 07:05 |
| → carl- joined | 07:05 |
| → austin987 joined | 07:08 |
| ← donofrio left | 07:16 |
| ← thiago left | 07:19 |
| ← whatsupdoc left | 07:21 |
| → l4s8g joined | 07:22 |
|
khronosschoty
| question if I git clone -b master --depth=1 --recurse-submodules.. wiil the shallow depth apply to all the sub modules as well? | 07:23 |
| → masoudd joined | 07:26 |
| ← ishutin left | 07:27 |
| ← l4s8g left | 07:28 |
| → ishutin joined | 07:29 |
|
nazarewk[m]
| is it just for me or cloning GH repos tops out at 2 MB/s? | 07:36 |
| → mannequin joined | 07:37 |
| → palasso joined | 07:38 |
| → EvilDMP joined | 07:38 |
|
hendry
| nazarewk[m]: i get similar performance in Singapore on my gigabit line | 07:39 |
|
nazarewk[m]
| yeah i'm on gigabit, but in EU | 07:39 |
|
| maybe it's time to set up some kind of local proxy for GH :D | 07:40 |
| → carl-- joined | 07:44 |
| ← carl- left | 07:47 |
| → stats4647 joined | 07:47 |
| → enzo_lim joined | 07:47 |
| ← enzo_lim left | 07:47 |
| ← sudoforge left | 07:48 |
|
hendry
| I have a strange issue where git log is showing merge commits. I've tried git log --first-parent --no-merges, but I still see the commits I don't want to see. They are not shown in tig. | 07:48 |
| → enzo_lim joined | 07:48 |
| ← enzo_lim left | 07:49 |
| → Enzo_LIM28 joined | 07:49 |
| ← hbautista left | 07:50 |
| ← Enzo_LIM28 left | 07:50 |
| → vanessa joined | 07:51 |
| ← stats4647 left | 07:51 |
| → enzo_lim joined | 07:57 |
| ← enzo_lim left | 07:57 |
| → Enzo_LIM joined | 08:02 |
| ← Enzo_LIM left | 08:02 |
| → realies2 joined | 08:03 |
| ← ColdKeyboard left | 08:04 |
| → ColdKeybo[a]rd joined | 08:04 |
| ← realies left | 08:04 |
| realies2 → realies | 08:04 |
| → jazzy2 joined | 08:06 |
| ← unluckyshrubbery left | 08:06 |
| → vimal joined | 08:08 |
| ← jazzy left | 08:09 |
| jazzy2 → jazzy | 08:09 |
| ← carl-- left | 08:10 |
| → stats4647 joined | 08:12 |
| → sa0 joined | 08:14 |
| ← sa0 left | 08:18 |
| → john_johnk joined | 08:23 |
| → sh0ne joined | 08:23 |
| → duxsco joined | 08:24 |
| → Guest84 joined | 08:29 |
| ← Guest84 left | 08:30 |
| → vladoski joined | 08:31 |
| ← john_johnk left | 08:34 |
| ← Furai left | 08:37 |
| → AnapodoPsalidi joined | 08:38 |
| → Haohmaru joined | 08:39 |
| → enoq joined | 08:39 |
| → arch-angel joined | 08:40 |
| ← AnapodoPsalidaki left | 08:41 |
| → Furai joined | 08:42 |
| → jmcb joined | 08:52 |
| → fercell joined | 08:57 |
| ← kaiseisei left | 08:59 |
| → kaiseisei joined | 09:00 |
| → aLeSD joined | 09:02 |
| → Tobbi_ joined | 09:03 |
| → iomari891 joined | 09:06 |
| → pretty_dumm_guy joined | 09:06 |
| ← jmcb left | 09:07 |
| ← cliluw left | 09:09 |
| → cliluw joined | 09:10 |
| ← ueberall left | 09:12 |
| → ueberall joined | 09:14 |
| ← stats4647 left | 09:15 |
| → Guest31 joined | 09:23 |
| ← anaveragehuman left | 09:25 |
| ← Guest31 left | 09:25 |
| → anaveragehuman joined | 09:25 |
| ← crabbedhaloablut left | 09:26 |
| ← coot left | 09:29 |
| → crabbedhaloablut joined | 09:30 |
| → john_johnk joined | 09:35 |
| ← ishutin left | 09:39 |
| → ishutin joined | 09:40 |
| ← john_johnk left | 09:42 |
| → cvmn joined | 09:44 |
| ← mra90 left | 09:51 |
| → cdown joined | 09:53 |
| → unluckyshrubbery joined | 09:59 |
| → paul424 joined | 10:02 |
| ← AbleBacon left | 10:02 |
| ← cvmn left | 10:03 |
| → MajorBiscuit joined | 10:06 |
|
paul424
| I changed the project name recently to OpenDungeonsPlus and don't know whwat do I need to change in my config file ,,, | 10:07 |
|
| probably url = https://github.com/johndoe/OpenDungeons.git -> url = https://github.com/johndoe/OpenDungeonsPlus.git | 10:08 |
|
| right ? | 10:08 |
| → Enzo_LIM joined | 10:09 |
| ← Enzo_LIM left | 10:09 |
| → cart_ joined | 10:10 |
| ← cdown left | 10:10 |
|
cart_
| Is it possible to host my Rust docs froma sub folder in the repo of the code? | 10:10 |
| → enzo_lim joined | 10:10 |
| → RiFo joined | 10:14 |
| → phylaz joined | 10:15 |
|
dob1
| if I clone a repository that I don't own, and I change remote of it to a repository that I own, what I am doing ? I am doing something similar to a fork? | 10:17 |
| → romesrf joined | 10:20 |
| ← tehenderz left | 10:22 |
| → tehenderz joined | 10:22 |
| ← Akiva left | 10:25 |
| → iomari892 joined | 10:26 |
| ← austin987 left | 10:26 |
| ← iomari891 left | 10:29 |
| ← tsujp left | 10:30 |
|
cart_
| It tells me that my Repo is private but my published site will be public and I can not find a way to change that. Also the docs do not seem to match up with what I am seeing | 10:37 |
| → menace joined | 10:39 |
| ← menace left | 10:39 |
| → menace joined | 10:39 |
| → l4s8g_ joined | 10:42 |
| → lgc joined | 10:44 |
| ← kaiseisei left | 10:46 |
| ← jazzy left | 10:51 |
| → rkta_ joined | 10:53 |
| rkta_ → rkta | 10:53 |
|
faceface
| join #code | 10:54 |
|
| oops | 10:55 |
| → iomari891 joined | 10:56 |
| ← iomari892 left | 11:00 |
| ← lgc left | 11:00 |
|
bookworm
| paul424: git remote --set-url origin $url | 11:02 |
|
| dob1: a "fork" in the classical sense is just a diverging codebase. Every repo you develop code in breaks from the origin and can be considered a fork | 11:04 |
| → bertvvvs joined | 11:07 |
| ← zulutango left | 11:09 |
| ← l4s8g_ left | 11:11 |
| ← enzo_lim left | 11:12 |
| menace → Deknos | 11:13 |
| → _vanessa_ joined | 11:15 |
| → coot joined | 11:15 |
| → Luminos joined | 11:16 |
| ← wilz left | 11:17 |
| ← Intelo left | 11:17 |
| ← vanessa left | 11:18 |
| ← zeenk left | 11:21 |
| → walterwhip joined | 11:22 |
| ← Gustavo6046 left | 11:22 |
| ← walterwhip left | 11:22 |
| → l4s8g_ joined | 11:23 |
| → geowiesnot joined | 11:24 |
| ← paul424 left | 11:31 |
| ← omero left | 11:32 |
| ← ishutin left | 11:34 |
| → ishutin joined | 11:36 |
| ← vishal left | 11:43 |
| → vishal joined | 11:45 |
| another → another| | 11:54 |
| → enzo_lim joined | 11:57 |
| ← enzo_lim left | 11:59 |
| → enzo_lim joined | 11:59 |
| → nyah joined | 11:59 |
| ← enoq left | 11:59 |
| → jmcb joined | 12:00 |
| ← enzo_lim left | 12:02 |
| ← makara left | 12:04 |
| ← makara1 left | 12:04 |
| ← coot left | 12:05 |
| → coot joined | 12:05 |
| → makara joined | 12:05 |
|
cart_
| Is there an easy way to redirect pages to subfolders in github pages? | 12:06 |
| → makara_ joined | 12:06 |
| → tyson2 joined | 12:08 |
| → vitali64 joined | 12:12 |
| ← tehenderz left | 12:13 |
| → tehenderz joined | 12:13 |
| ← vitali64 left | 12:16 |
| → vitali64 joined | 12:17 |
| → ^vanessa^ joined | 12:20 |
| ← _vanessa_ left | 12:23 |
| ← Jong left | 12:23 |
| → _vanessa_ joined | 12:24 |
| → bambanxx joined | 12:24 |
| ← ^vanessa^ left | 12:27 |
| → cperrin joined | 12:27 |
| → lpapp joined | 12:32 |
|
cperrin
| HI. I have an odd problem and I am trying to find out if there is a good solution. I have a git repo where sometimes a release branch is created and during that time commits from the main branch are cherry-picked into the release branch and after the release it gets merged back into the main branch. Now the problem is that when I create a git log | 12:33 |
|
| of a range that includes this branch and merge, the cherry-picked commits appear twice, once for the main and once for the release branch. Is there any way to exclude these commits from the log? | 12:33 |
|
lpapp
| ikke: does glab work for you? I am trying to create a merge request, but I get no warning, but it also does not fill in the assignee, reviewers, label, etc. Instead, it puts things like /label ~mylabel in the description or /assign laszlo.papp | 12:33 |
|
| ikke: this is the command I tried using glab mr create -a laszlo.papp -l team_ultraviolet --reviewer joe.biden,vladimir.putin -b my_target_branch -f --fill-commit-body --wip -w | 12:34 |
|
| the only thing it does right is picking up the desired target branch. | 12:34 |
|
| also, no errors with "failed to find user by name :" or something. | 12:36 |
|
| So, the user names are fine, I think. | 12:36 |
|
| glab version 1.22.0 (2022-01-10) | 12:36 |
| ← tejr left | 12:37 |
|
lpapp
| `glab auth login` was successful. | 12:37 |
|
cperrin
| lpapp: I don't think this is the correct IRC channel for you. This is for Git the software not GitLab. | 12:37 |
|
lpapp
| cperrin: well, ikke suggested it yesterday, so he may know how to use it. | 12:38 |
| → xkr47 joined | 12:38 |
|
lpapp
| strictly speaking, gitlab is an integral part of the git ecosystem | 12:38 |
| → tejr joined | 12:38 |
|
cperrin
| Not realy | 12:38 |
|
| GitLab is a software that uses Git. | 12:39 |
|
lpapp
| are you a channel op? | 12:40 |
|
cperrin
| no | 12:40 |
|
lpapp
| then, never mind. | 12:40 |
|
bertvvvs
| lol | 12:40 |
|
OMGOMG
| lol | 12:46 |
|
cperrin
| ??? | 12:47 |
| ← vysn left | 12:49 |
| → cerill joined | 12:50 |
| → Swahili joined | 12:58 |
| → Rashad joined | 13:00 |
| → bloody joined | 13:01 |
| ← lpapp left | 13:04 |
| ← GeorgeK left | 13:05 |
|
canton7
| cperrin, not really: they're entirely separate commits as far as git is concerned: they just happen to look similar | 13:11 |
| ← anaveragehuman left | 13:12 |
| → stats4647 joined | 13:12 |
| ← Sulky__ left | 13:13 |
| → Willtech joined | 13:13 |
| → Sulky joined | 13:15 |
| ← stats4647 left | 13:17 |
| → jstein joined | 13:18 |
| → The_Blode_ joined | 13:18 |
| ← masoudd left | 13:19 |
| ← The_Blode left | 13:19 |
|
ikke
| Note that it's not an issue to ask about tools related to git here | 13:23 |
| ← cerill left | 13:25 |
| → humanface joined | 13:27 |
|
cperrin
| canton7: I thought so. | 13:27 |
| → ThorMojito joined | 13:32 |
| ← duxsco left | 13:35 |
| → hoochmonger joined | 13:36 |
| → duxsco joined | 13:37 |
| ← epony left | 13:39 |
| → Guest5018 joined | 13:39 |
| ← Guest5018 left | 13:40 |
| ← duxsco left | 13:44 |
| ← cart_ left | 13:44 |
| → duxsco joined | 13:44 |
| → aniruddha joined | 13:44 |
| → bigGopher joined | 13:57 |
| ← bambanxx left | 13:58 |
| → skapata joined | 14:03 |
| ← skapata left | 14:03 |
| → skapata joined | 14:03 |
| ← Baphomet left | 14:04 |
| ← ishutin left | 14:04 |
| → john_johnk joined | 14:06 |
| → ishutin joined | 14:07 |
| ← sh0ne left | 14:07 |
| → gh34 joined | 14:07 |
| ← Xenguy left | 14:09 |
| ← Oblomov left | 14:23 |
| → otisolsen70 joined | 14:23 |
| → Thanatermesis joined | 14:23 |
| → darkbit joined | 14:23 |
| ← john_johnk left | 14:24 |
| → zer0bitz joined | 14:24 |
| → ^vanessa^ joined | 14:25 |
| ← nickel715 left | 14:27 |
| → sudoforge joined | 14:27 |
| ← _vanessa_ left | 14:28 |
| ← The_Blode_ left | 14:32 |
| → The_Blode joined | 14:33 |
| → nickel715 joined | 14:35 |
| ← bigGopher left | 14:36 |
| → epony joined | 14:39 |
| → pulse joined | 14:40 |
| → sidy joined | 14:41 |
| → m0viefreak joined | 14:43 |
| Willtech → NOD32Admin | 14:43 |
| → o[_] joined | 14:43 |
| ← o[_] left | 14:44 |
| → sco1 joined | 14:44 |
| NOD32Admin → Willtech | 14:44 |
| → _vanessa_ joined | 14:45 |
| ← Willtech left | 14:46 |
| → zulutango joined | 14:46 |
| → omero joined | 14:46 |
| → Willtech joined | 14:46 |
| ← omero left | 14:47 |
| ← ^vanessa^ left | 14:48 |
| → o[_] joined | 14:49 |
| ← Rashad left | 14:49 |
| ← o[_] left | 14:49 |
| → omero joined | 14:52 |
| ← omero left | 14:52 |
| → o[_] joined | 14:55 |
| ← o[_] left | 14:55 |
| → omero joined | 14:57 |
| ← omero left | 14:57 |
| ← mcpackey left | 14:58 |
| ← cperrin left | 15:02 |
| ← _vanessa_ left | 15:05 |
| → madewokherd` joined | 15:08 |
| → bigGopher joined | 15:10 |
| ← madewokherd left | 15:11 |
| → sa0 joined | 15:11 |
| → rgrinberg joined | 15:12 |
| ← humanface left | 15:12 |
| ← sa0 left | 15:16 |
| ← tehenderz left | 15:16 |
| → tehenderz joined | 15:17 |
| → GNUtoo joined | 15:18 |
|
GNUtoo
| Hi, does mediawiki:// respects the http.sslVerify parameters? | 15:18 |
| ← txtsd left | 15:19 |
| → bambanxx joined | 15:20 |
| ← sh4_ left | 15:20 |
| ← Thanatermesis left | 15:23 |
| → txtsd joined | 15:24 |
| ← rgrinberg left | 15:25 |
| → pyevery__ joined | 15:26 |
| → neilthereildeil joined | 15:26 |
|
neilthereildeil
| hey guys | 15:26 |
|
| i have 2 branches. one is master and the other is based on a tag with a few more commits on top of it | 15:26 |
| ← duxsco left | 15:26 |
|
neilthereildeil
| how can i copy those few changes since the tag into my master branch? | 15:27 |
|
imMute
| neilthereildeil: you could merge that other branch into master | 15:27 |
|
neilthereildeil
| how would that be different than rebase? | 15:27 |
|
imMute
| rebase "replays" the commits as if they were made against master instead of the original base (the tag) | 15:28 |
|
| the end result in the files is the same, but the history is different. | 15:28 |
|
neilthereildeil
| ok so ura saying the dates of those commits are preserved in merge? | 15:29 |
| ← Willtech left | 15:29 |
| → duxsco joined | 15:30 |
| → vysn joined | 15:31 |
|
imMute
| merge preserves the history exactly as it was | 15:31 |
|
neilthereildeil
| ok so then merge is what i wanna do | 15:32 |
|
imMute
| rebase recreates the commits. so the committer/commit date on the new ones will be different, but the original author/author date will be preserved. | 15:32 |
|
neilthereildeil
| how can i specify that i want everything in the source branch AFTER the tag? | 15:32 |
|
imMute
| you get everything in that branch's history, including stuff before the tag (if it wasn't merged into master already) | 15:33 |
| → Kulrak joined | 15:33 |
|
neilthereildeil
| ahh thats not what i want | 15:33 |
|
| theres only 3 commits after the tag, and i just want those 3 commits | 15:33 |
|
imMute
| might be best to just cherry-pick those three commits onto the master branch then | 15:34 |
|
neilthereildeil
| ok | 15:34 |
| ← makara left | 15:34 |
| ← makara_ left | 15:34 |
|
neilthereildeil
| would cherrypick preserve commit dates etc? | 15:34 |
| → Thanatermesis joined | 15:35 |
|
imMute
| it would preserve authorship dates, but new commit date/name would be used. but that's likely what you want even if you don't know it yet | 15:35 |
|
neilthereildeil
| whats the difference? | 15:36 |
| → makara joined | 15:36 |
|
osse
| a commit has two timestamps (and two authors). one is fixed forever, the other is updated when cherry-picks etc. occur | 15:36 |
| ← duxsco left | 15:36 |
| → makara1 joined | 15:36 |
| → Misotauros joined | 15:37 |
|
neilthereildeil
| what does git log show? | 15:37 |
|
osse
| the fixed one | 15:37 |
|
imMute
| I think most things show the Author name/date (unless it shows both) | 15:37 |
|
neilthereildeil
| i just want git log output to match | 15:37 |
|
imMute
| and it's not fixed forever, you can ask to have it changed when doing a rebase/cherry-pick | 15:37 |
| → thiago joined | 15:38 |
|
imMute
| neilthereildeil: git log shows the author name/date by default. which wont change if you do a rebase or cherry-pick | 15:38 |
|
neilthereildeil
| ok so authorshipdate = fixed date? | 15:39 |
| → duxsco joined | 15:39 |
|
imMute
| yes, the author name/date is the "fixed" information that osse was referring to | 15:39 |
|
neilthereildeil
| ok | 15:39 |
|
imMute
| if you do 'git show --format=fuller <branch/tag/sha>' it will show you both. if you leave off the --format=fuller it'll only show you the Author | 15:40 |
|
neilthereildeil
| ok yea see that | 15:41 |
|
| so how do i tell cherrypick to take all the commits since a certain commit? | 15:41 |
| → DoofusCanadensis joined | 15:41 |
|
imMute
| I think you can do 'git cherry-pick <tag>..<last commit>' where <tag> is the tag or commit just before the first commit you want to pick, and <last commit> is the 3rd of the 3 you want. | 15:42 |
|
| otherwise you can do 'git cherry-pick <sha>' 3 times - one for each of the 3 commits you want to pick (do the oldest one first) | 15:42 |
| ← neilthereildeil left | 15:43 |
| → neilthereildeil joined | 15:45 |
|
neilthereildeil
| ok lemme try that | 15:45 |
| ← jmcb left | 15:48 |
|
OnlineCop
| !submodule | 15:49 |
|
gitinfo
| git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules | 15:49 |
|
neilthereildeil
| ok i got a Merge conflict | 15:50 |
|
imMute
| okay, so one of the commits doesn't apply cleanly. you'll have to fix that conflict yourself and then commit the conflict resolution and the original commit with "git commit" | 15:51 |
| ← zer0bitz left | 15:53 |
| → sobkas joined | 15:53 |
| ← jumpcutking left | 15:54 |
| → zer0bitz joined | 15:55 |
| → bn_work joined | 15:56 |
|
OnlineCop
| !vscode | 15:57 |
| ← ThorMojito left | 15:57 |
| → taylan joined | 15:57 |
|
OnlineCop
| Is there a guide to indicate whether any `.vscode/` files should be committed to a repo? | 15:58 |
|
taylan
| hey all, just out of curiosity: why does 'git reset --hard' not reset the submodule commit being referenced by the parent repo? | 15:58 |
|
imMute
| taylan: submodules are fucky and have a bad UX. | 16:00 |
| → ThorMojito joined | 16:00 |
| ← RiFo left | 16:00 |
| → The_Blode_ joined | 16:01 |
|
DoofusCanadensis
| OnlineCop: try https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore | 16:01 |
| → rgrinberg joined | 16:01 |
| ← The_Blode left | 16:02 |
|
mackerman
| OnlineCop: Like anything else, if you would share the official version of something with collaborators, it might beling in version control | 16:03 |
|
imMute
| mackerman: I think the problem is knowing whether or not something needs to be shared. | 16:04 |
| ← ThorMojito left | 16:04 |
|
mackerman
| Or, projects exist that gitignore .vscode because it isn't the official tool and they don't want it committed by accident | 16:05 |
| ← HelloShitty left | 16:06 |
| → Dreadnaught joined | 16:07 |
| ← Kulrak left | 16:08 |
| → HelloShitty joined | 16:11 |
| → masoudd joined | 16:11 |
| → The_Blode joined | 16:12 |
| ← Luminos left | 16:13 |
| → donofrio joined | 16:14 |
| → Luminos joined | 16:15 |
| ← ishutin left | 16:15 |
| ← The_Blode_ left | 16:16 |
| ← Luminos left | 16:17 |
| → neverfindme joined | 16:17 |
| → ishutin joined | 16:17 |
|
OnlineCop
| To understand this .gitignore: `.vscode/*` should be ignored, but... lines starting with '!.vscode/...' should NOT be ignored? | 16:17 |
| → structoha joined | 16:17 |
|
imMute
| correct. | 16:19 |
|
| "ignore everything in .vscode except these files" | 16:19 |
|
OnlineCop
| I was merging across submodules and I've now got an untracked `.vscode/c_cpp_properties.json` file showing up. That one should be user-specific and not part of the project? | 16:19 |
|
imMute
| according to that gitignore project that DoofusCanadensis mentioned earlier, yes, that's correct. | 16:20 |
| → nuh^ joined | 16:20 |
| ← vysn left | 16:21 |
| → omero joined | 16:24 |
| → o[_] joined | 16:25 |
| ← The_Blode left | 16:26 |
| ← duxsco left | 16:27 |
| → duxsco joined | 16:27 |
| → mra90 joined | 16:27 |
| ← GNUtoo left | 16:27 |
| ← ano left | 16:27 |
| ← gxt_ left | 16:27 |
| ← chexum left | 16:27 |
| ← hololeap left | 16:27 |
| ← GNUmoon left | 16:27 |
| → ano joined | 16:28 |
| → GNUmoon joined | 16:28 |
| → gxt_ joined | 16:28 |
|
OnlineCop
| I wasn't aware there was even a dedicated `gitignore` repo on github. | 16:28 |
|
| !gitignore | 16:28 |
|
gitinfo
| [!gitignore_template] Github has compiled a set of good .gitignore templates, and licensed them very liberally. https://github.com/github/gitignore | 16:28 |
| → hololeap joined | 16:29 |
| → chexum joined | 16:29 |
| ← geowiesnot left | 16:29 |
| ← avu left | 16:30 |
| ← thekingofbandit left | 16:30 |
| → avu joined | 16:31 |
| → thekingofbandit joined | 16:31 |
| → GNUtoo joined | 16:32 |
| → jmcb joined | 16:34 |
| ← Codaraxis left | 16:37 |
| ← Murr left | 16:37 |
| → Murr joined | 16:37 |
| ← rgrinberg left | 16:37 |
| ← bambanxx left | 16:42 |
| ← otisolsen70 left | 16:43 |
| → vicfred joined | 16:43 |
| ← tyson2 left | 16:43 |
| ← saroy left | 16:43 |
| → great_taste joined | 16:43 |
|
lungaro
| can I make a alias for "git push --set-upstream origin XXX" where XXX is the current branch name somehow? | 16:44 |
|
| "git push_upstream" or something | 16:44 |
| → humanface joined | 16:44 |
| ← igemnace left | 16:44 |
| ← Sulky left | 16:45 |
| → Sulky joined | 16:45 |
| ← structoha left | 16:45 |
|
OnlineCop
| !alias | 16:46 |
|
gitinfo
| You can set up alias to be used by git, see: http://git-scm.com/book/en/v2/Git-Basics-Git-Aliases | 16:46 |
|
ikke
| lungaro: you can use HEAD or @ to refer to the current branch (assuming you have a branch checked out, not on a detached HEAD) | 16:47 |
|
lungaro
| alias's dont support arguments or have the ability to get the current branch name... that's why i'm asking. | 16:47 |
| ← arch-angel left | 16:47 |
|
lungaro
| oh. Sweet! | 16:47 |
|
ikke
| lungaro: they do if you start with a ! | 16:47 |
|
lungaro
| so 'git push --set-upstream @' | 16:47 |
|
OnlineCop
| When the alias starts with `! git ...` then it runs the full command. | 16:47 |
|
lungaro
| oops. Thanks | 16:48 |
|
ikke
| lungaro: you first need to specify a remote | 16:48 |
|
lungaro
| yeh... | 16:48 |
|
ikke
| and even without a !, arguments are appended to aliases | 16:48 |
|
imMute
| lungaro: aliases support arguments, though they're simply appended to the end of the alias | 16:48 |
| ← nyah left | 16:48 |
|
OnlineCop
| I'm actually a fan of the `alias` alias. :) | 16:49 |
| → nyah joined | 16:49 |
| → bambanxx joined | 16:49 |
| → rgrinberg joined | 16:50 |
|
lungaro
| it says its a bad line in my config. Under [alias] I have this push_upstream = "push --set-upstream @" | 16:50 |
|
OnlineCop
| Within my .gitconfig_global file, it's: `alias = ! git config --get-regexp ^alias[.] | sed -e 's/^alias[.]\\([^ ]*\\) \(.*\\)/\\1=\"\\2\"/'` so you can then see what other `git alias`-es you have. :) | 16:50 |
|
| Remove the double quotes? | 16:51 |
|
lungaro
| same thing | 16:51 |
|
ikke
| OnlineCop: you need to at least quote the entire string | 16:51 |
|
| And then escape inner quotes | 16:51 |
|
lungaro
| oh weird, is underscore reserved? | 16:52 |
|
OnlineCop
| I just did a `grep alias ~/.gitconfig_global` and ^ that was what I had. | 16:52 |
|
ikke
| It's easier to use git config to set it, not edit the config file directly | 16:52 |
|
OnlineCop
| True. | 16:52 |
| ← vicfred left | 16:52 |
| → rsx joined | 16:52 |
|
lungaro
| yeah, i guess key's cant' have underscores. Oh well | 16:53 |
|
| k | 16:53 |
|
OnlineCop
| What would that be for lungaro then? `git config --global alias.push_upstream 'push --set-upstream @'` perhaps? | 16:53 |
| → AbleBacon joined | 16:53 |
| ← neverfindme left | 16:53 |
|
OnlineCop
| Looks like underscore is being rejected on mine too. | 16:54 |
| ← nyah left | 16:54 |
| ← madewokherd` left | 16:54 |
| → nyah joined | 16:55 |
|
lungaro
| i can remove it, no worries | 16:55 |
|
ikke
| It's more common to use - | 16:55 |
|
lungaro
| i have hundreds of lines of bash automating my git workflow. Another function bites the dust | 16:56 |
| → ThorMojito joined | 16:59 |
| ← coot left | 17:02 |
| → The_Blode joined | 17:03 |
| ← rgrinberg left | 17:03 |
| → john_johnk joined | 17:04 |
| ← ThorMojito left | 17:09 |
| ← neilthereildeil left | 17:10 |
| → tyson2 joined | 17:13 |
| → Akiva joined | 17:13 |
| ← bambanxx left | 17:13 |
| → bambanxx joined | 17:13 |
| ← zer0bitz left | 17:13 |
| → stats4647 joined | 17:14 |
| → wowi421309 joined | 17:14 |
| wowi421309 → wowi42130 | 17:15 |
| ← duxsco left | 17:16 |
| ← pretty_dumm_guy left | 17:17 |
| ← stats4647 left | 17:18 |
| ← bambanxx left | 17:19 |
| → pretty_dumm_guy joined | 17:19 |
| → kenanmarasli joined | 17:20 |
| → vysn joined | 17:23 |
| → zer0bitz joined | 17:25 |
| ← vladoski left | 17:25 |
| ← Haohmaru left | 17:25 |
| → ThorMojito joined | 17:26 |
| → zumba_addict joined | 17:26 |
| → Codaraxis joined | 17:27 |
| → Codaraxis_ joined | 17:27 |
| → madewokherd joined | 17:27 |
|
DoofusCanadensis
| OnlineCop: there are tools to automate fetching from that gitignore project into your .gitignore file | 17:27 |
|
| I have a fish function that lets me do `getignore maven eclipse jetbrains` for work projects | 17:28 |
| ← john_johnk left | 17:29 |
| ← Codaraxis left | 17:32 |
| ← skapata left | 17:32 |
| → k8yun joined | 17:32 |
| → bambanxx joined | 17:33 |
| ← bambanxx left | 17:34 |
| → sadtaco joined | 17:34 |
| ← sadtaco left | 17:34 |
| ← aLeSD left | 17:35 |
| ← Akiva left | 17:35 |
| → sadtaco joined | 17:35 |
| → duxsco joined | 17:36 |
| ← duxsco left | 17:37 |
| ← romesrf left | 17:37 |
| → bambanxx joined | 17:37 |
| ← kadobanana left | 17:38 |
| → kadobanana joined | 17:39 |
| ← humanface left | 17:39 |
| → stenno joined | 17:40 |
|
stenno
| good day, assume i create feature branch F from main. i commit FC1 to F. then, MC1 gets committed to main. i am rebasing F onto master so Fs history now looks like MC1->FC1.now i am merging F into main. | 17:43 |
|
| will MC1 now appear twice in mains history? | 17:43 |
|
| s/master/main/ | 17:44 |
|
imMute
| main and master are two separate branches? | 17:44 |
|
stenno
| nope, typo | 17:44 |
|
imMute
| no, MC1 won't appear twice. | 17:44 |
|
stenno
| great, thanks | 17:44 |
|
imMute
| because it's already in master. so merging F into master won't consider that commit | 17:44 |
|
stenno
| thats smart | 17:45 |
|
| i assume it works the same for cherry-picking | 17:45 |
|
imMute
| cherry-picking just copy/pastes a commit | 17:45 |
|
stenno
| with the same hash | 17:46 |
|
imMute
| no | 17:46 |
|
stenno
| oh ok, so it wont work for cherry picking | 17:46 |
|
imMute
| I'm not sure what you think "won't work" for cherry picking | 17:47 |
| ← ThorMojito left | 17:47 |
|
stenno
| sorry | 17:47 |
|
imMute
| cherry-picked and rebased commits will not have teh same commit hashes as the originals. because the commits have different parents, so it's impossible for them to have the same hashes | 17:47 |
|
stenno
| how exactly does git determine if a commit is already in a branch? | 17:47 |
|
thiago
| if you rebased F onto main, then F's history contains MC1 | 17:48 |
|
| F will be a superset of main and you can fast-forward | 17:48 |
| → arand___ joined | 17:48 |
|
thiago
| that's what merge will do | 17:48 |
| ← darkbit left | 17:48 |
|
stenno
| if instead of rebasing, i would have cherry-picked MC1, and then merge F into main, would it _then_ be twice in mains history? | 17:49 |
| ← jmcb left | 17:49 |
|
imMute
| if you had cherry-picked MC1 into F and then merged F into main, yes, MC1 will appear twice (because it's two different commits) | 17:49 |
|
stenno
| gotcha, thanks again | 17:50 |
|
imMute
| because it's actually MC1' that's in F, not MC1 | 17:50 |
|
stenno
| right | 17:50 |
|
thiago
| if you cherry-pick MC1 into F, then *merge* F into main, it'll appear twice | 17:50 |
|
| if you rebase F on top of main before merging, the rebase will drop the MC1 copy | 17:50 |
|
imMute
| (git people like to use ' as a way to indicate that a commit was rebased / cherry-picked. as it has the same "contents" but the hashes are different, so it helps to differentiate which commit exactly is being talked about) | 17:51 |
|
stenno
| ohh right | 17:51 |
|
| thats quite the important caveat for cherry-picking though that i wasn't really aware of | 17:52 |
|
imMute
| what is? (just for my own understanding. personally I don't see any "caveats" to using cherry-pick) | 17:52 |
|
stenno
| this assumes that having that kind of 'duplicate' commits in your history is bad | 17:53 |
|
imMute
| it's not necessarily "bad" to have duplicated commits, but most people probably try to avoid them | 17:54 |
|
stenno
| so if F1 and F2 are branched off main, and F1 cherry-picks from F2, then F1 gets rebased + merged into main, now if F2 gets merged into main it will be in mains history twice even if F2 gets rebased onto main first | 17:55 |
|
| hm or does it | 17:55 |
|
| sorry i am confused lol | 17:56 |
|
imMute
| if you rebase F2 after merging F1, it will drop the duplicate commit | 17:56 |
| → sa0 joined | 17:56 |
|
stenno
| oh yeah | 17:56 |
|
| so a feature branch should always rebase onto master before merge | 17:57 |
|
imMute
| eh, maybe, maybe not. depends on what kind of workflow you want | 17:58 |
|
| there is no "best" workflow | 17:58 |
|
thiago
| the best is the one you're most comfortable with and achieves your goals | 17:58 |
|
stenno
| noted | 17:58 |
|
| i guess i will figure this out from using git more | 17:58 |
| ← great_taste left | 18:00 |
|
nightstrike
| how do you do a "git cp" that retains history? There doesn't seem to be a cp subcommand | 18:01 |
| ← ishutin left | 18:03 |
|
thiago
| cp always writes a new commit | 18:03 |
|
| it can't not | 18:03 |
|
| (sorry for the double negative) | 18:03 |
|
| git rebase is a sequence of git cp, but it's smart enough to know when you haven't changed anything up until a point, so it doesn't cp those commits | 18:04 |
|
| that's just an optimisation. In ages past, it would rewrite | 18:04 |
|
imMute
| "git cp" isn't a git command... | 18:04 |
|
arand___
| nightstrike: Git does not track moves or copies, but you can use heuristics to make log and diff guess that the new file was a copy since it looks very similar to another one. | 18:05 |
|
thiago
| $ git config --global alias.cp | 18:05 |
|
| cherry-pick | 18:05 |
| → ishutin joined | 18:05 |
|
imMute
| thiago: ah. | 18:05 |
|
thiago
| I assume everyone has the same aliases as I do... cp, ci, co, br, sw | 18:05 |
|
imMute
| thiago: I have all of those except cp. maybe I should add that one lol | 18:05 |
|
nightstrike
| imMute: that's what I said :) | 18:05 |
|
| arand___: that seems like a terrible idea | 18:06 |
|
| so if I change my file too much, I lose its history? | 18:06 |
|
thiago
| yes and no | 18:06 |
|
| since there's no history to be kept in the first place (git doesn't track that way), nothing is actually lost | 18:06 |
|
nightstrike
| well that sounds like a management answer | 18:06 |
| → zebrag joined | 18:06 |
|
DoofusCanadensis
| if you move a file, try to move it without changes... makes it easier for git to follow | 18:06 |
|
thiago
| all that tracking is done by the log/blame tools after the fact | 18:06 |
|
| so it's entirely possible to convince them that two files actually should be shared history | 18:07 |
|
| in practice, yes, you'd "lose" history | 18:07 |
|
imMute
| nightstrike: it's ony a concern when you rename/copy files. you can modify a file all you want otherwise and it'll never lose history | 18:07 |
|
thiago
| so my recommendation when renaming or copying a file is that you keep changes to a bare minimum. Preferably no changes. | 18:07 |
|
nightstrike
| from a user perspective, there's history, and I don't care what magic git does to retain history, but I do expect that it's actually retained | 18:07 |
|
imMute
| nightstrike: even when you rename a file, the history is never *lost*, it just might take a bit of work on top of what git does to find it | 18:08 |
|
nightstrike
| I'll take your suggestion, but that's a frustrating, unexpected, and terribly designed feature | 18:08 |
|
DoofusCanadensis
| possibly | 18:08 |
|
thiago
| it's one of the features that make Git fast | 18:09 |
|
arand___
| nightstrike you have for example a `--find-renames[=<n>]` option to git log, so you can tweak the percent likeness needed for git to show it as a match in that command instance. | 18:09 |
|
thiago
| one of the core features of Git even, what set it apart from almost everything that came before | 18:09 |
| → great_taste joined | 18:10 |
| → crashrep joined | 18:10 |
|
nightstrike
| different is not guaranteed to be better | 18:10 |
|
| it can be a core git feature that's different than everything else, and still suck | 18:11 |
|
imMute
| it's not guaranteed to be worse either. but different is definitely a PITA if you're expecting it to be something it's not | 18:11 |
|
thiago
| sure, it can be different, faster, and an incredibly horrible UX | 18:12 |
|
nightstrike
| fast also is a funny thing.... remember debian and ssh and their performance improvement? | 18:12 |
|
thiago
| yep | 18:12 |
| → FFY00_ joined | 18:13 |
|
imMute
| nightstrike: do you trust the Linux kernel developers? | 18:14 |
|
nightstrike
| I trust them to make tools that work for them | 18:14 |
|
thiago
| indeed | 18:14 |
|
nightstrike
| I do not trust them to make general purpose tools that work for a wide audience, which is what git has become. And I attribute most of my issues with git to that | 18:14 |
|
thiago
| just look at the number of people who aren't kernel developers and attempt to use Git for deployment, and then complain about files getting overwritten or somesuch | 18:15 |
|
mackerman
| There is no git cp comamnd, as it would be in effect copying a file to a different name at the OS level, and adding that. | 18:15 |
|
| Differently named blob that happens to have the same content. | 18:15 |
|
imMute
| thiago: you'd have the same problem with SVN (if SVN were cabable of pushing anywhere except the central server) | 18:16 |
| ← FFY00 left | 18:16 |
| ← arand___ left | 18:16 |
| → arand___ joined | 18:17 |
|
nightstrike
| svn has "svn cp" :) | 18:17 |
|
DoofusCanadensis
| then use svn? | 18:17 |
|
nightstrike
| svn also handles binary files perfectly, which is a big plus for a general purpose tool | 18:18 |
|
| I wish I could. But I don't make those decisions on most projects | 18:18 |
|
thiago
| git handles binary files just fine too | 18:19 |
|
| better than text files, TBH | 18:19 |
|
DoofusCanadensis
| dunno about that | 18:19 |
| → DoofusCan joined | 18:20 |
|
thiago
| Git was designed by and for Linux (kernel) developers, meaning that for them all files were binary | 18:21 |
| ← great_taste left | 18:21 |
|
thiago
| like renames, diffs are an afterthought | 18:21 |
|
| but handling the content is easy: never transform anything, ever. | 18:21 |
|
| retrofitting it to make Windows experience moderately tolerable took effort | 18:22 |
| → ThorMojito joined | 18:23 |
| ← k8yun left | 18:23 |
| → rgrinberg joined | 18:24 |
| ← GNUmoon left | 18:25 |
| → DrowningElysium joined | 18:25 |
| → GNUmoon joined | 18:25 |
| → k8yun joined | 18:28 |
| ← ThorMojito left | 18:28 |
| → coot joined | 18:28 |
| → neilthereildeil joined | 18:29 |
|
nightstrike
| thiago: git doesn't handle binaries well | 18:32 |
| ← donofrio left | 18:33 |
|
nightstrike
| I'm on one project that stores binaries that are hundreds of megs (AI models), and cloning the repo is becoming a non-starter | 18:33 |
| ← k8yun left | 18:33 |
|
mackerman
| git diff has been a tool, since what, pre git 1.0 ? Friendly string tools on top of the blobs has been a thing since the beginning. | 18:34 |
|
thiago
| it hanbdles binaries very well | 18:34 |
|
| the problem is cloning the entire repository | 18:34 |
|
| if you did that with SVN, you'd have the same problem | 18:34 |
| → pretty_d1 joined | 18:34 |
| ← pretty_dumm_guy left | 18:34 |
| ← MajorBiscuit left | 18:36 |
| ← Murr left | 18:36 |
| → jmcb joined | 18:36 |
| → Murr joined | 18:37 |
| → ___nick___ joined | 18:37 |
| ← neilthereildeil left | 18:38 |
|
DoofusCan
| That's why Microsoft wrote their own VFS layer for Git when they converted their repos to Git... the need to handle massive amount of binaries in the repository | 18:41 |
|
thiago
| there's nothing wrong with how Git handles binaries. The problem is checking binaries into the repository in the first place. | 18:42 |
| → great_taste joined | 18:43 |
| ← rgrinberg left | 18:43 |
|
thiago
| by design | 18:43 |
|
| you may disagree with the design (and a lot of people do), but the fact is that this is the design and, following from there, Git is operating properly | 18:44 |
|
mackerman
| Microsoft's enormous repo and VFS layer is not for binaries. Its for 300 GB of history of something like 6 million files. | 18:46 |
|
thiago
| I understand | 18:47 |
|
| but again, a different use philosophy | 18:47 |
|
| most people wouldn't have checked out the entire 6 million files in the prior VCS, would they? | 18:47 |
| ← sa0 left | 18:48 |
|
mackerman
| No, because most cannot scale that large at all. | 18:48 |
|
DoofusCan
| mackerman: ah, I misremembered the blog entry then | 18:51 |
| → duxsco joined | 18:53 |
| ← iomari891 left | 18:53 |
| → structoha joined | 19:02 |
| ← zumba_addict left | 19:03 |
| ← bambanxx left | 19:03 |
| → pretty_dumm_guy joined | 19:05 |
| ← rsx left | 19:05 |
| ← pretty_d1 left | 19:05 |
| → bambanxx joined | 19:07 |
| ← bambanxx left | 19:07 |
| → rsx joined | 19:09 |
| ← rsx left | 19:11 |
| ← crashrep left | 19:17 |
| ← Crispy left | 19:17 |
| ← ___nick___ left | 19:19 |
| → ___nick___ joined | 19:22 |
| → bambanxx joined | 19:23 |
| ← tyson2 left | 19:23 |
| → ThorMojito joined | 19:27 |
| ← ThorMojito left | 19:27 |
| ← fflam left | 19:31 |
| → fflam joined | 19:32 |
| → hbautista joined | 19:35 |
| ← great_taste left | 19:35 |
| ← duxsco left | 19:36 |
| → canton7 joined | 19:39 |
| ← arand___ left | 19:43 |
| ← fflam left | 19:44 |
| → cdown joined | 19:46 |
| → great_taste joined | 19:46 |
| → fflam joined | 19:46 |
| ← ishutin left | 19:47 |
| → ishutin joined | 19:49 |
| ← vitali64 left | 19:52 |
| ← kenanmarasli left | 19:53 |
|
nightstrike
| What did Microsoft convert from? | 19:55 |
|
| As for binaries in git vs svn, svn handles binary diffs, so dB size is more manageable | 19:56 |
|
DoofusCan
| TFS | 19:56 |
| → Lord_of_Life_ joined | 19:56 |
| ← l4s8g_ left | 19:56 |
| ← Lord_of_Life left | 19:57 |
| Lord_of_Life_ → Lord_of_Life | 19:57 |
| → Rashad joined | 19:58 |
|
nightstrike
| Also, thiago, you know you're being pedantic. You know the difference between handling binaries without corruption or some other critical issue and delivering a user experience that is easy and scalable and intuitive | 19:59 |
|
imMute
| the only intuitive interface is the nipple. everything else is learned. | 20:01 |
| → Crispy joined | 20:04 |
|
nightstrike
| hah! | 20:13 |
| → sa0 joined | 20:14 |
| ← structoha left | 20:15 |
| ← hbautista left | 20:16 |
| ← sa0 left | 20:18 |
| ← ___nick___ left | 20:18 |
| → l4s8g joined | 20:19 |
| → tyson2 joined | 20:19 |
| → ___nick___ joined | 20:20 |
| → hbautista joined | 20:21 |
| ← makara1 left | 20:26 |
| ← makara left | 20:26 |
| → makara joined | 20:27 |
| ← mannequin left | 20:27 |
| → makara1 joined | 20:27 |
| → ChmEarl joined | 20:28 |
| ← bambanxx left | 20:29 |
| → donofrio joined | 20:34 |
| ← bindu left | 20:36 |
| → bambanxx joined | 20:36 |
| → bindu joined | 20:36 |
| → otisolsen70 joined | 20:37 |
| ← GNUmoon left | 20:38 |
| → john_johnk joined | 20:39 |
| ← yuljk left | 20:40 |
| → yuljk joined | 20:42 |
| ← bambanxx left | 20:44 |
| → causasui joined | 20:51 |
| ← pyevery__ left | 20:57 |
| ← john_johnk left | 20:58 |
| → m0viefreak2 joined | 21:00 |
| ← m0viefreak left | 21:00 |
| m0viefreak2 → m0viefreak | 21:00 |
| ← l4s8g left | 21:01 |
| ← ___nick___ left | 21:03 |
| → xkuru joined | 21:06 |
| ← jinsun left | 21:11 |
| → Gustavo6046 joined | 21:11 |
| ← sobkas left | 21:12 |
| ← bigGopher left | 21:12 |
| ← Gustavo6046 left | 21:12 |
| → Gustavo6046 joined | 21:13 |
| → jinsun joined | 21:15 |
| → stats4647 joined | 21:15 |
|
mra90
| git run in msys2 on windows changes my line endings! | 21:16 |
|
| I also noticed that when I do git status in gitbahs & msys2 it shows different output (different files modified) and those that were modified have line endings changed! WHy is that? | 21:17 |
| ← stats4647 left | 21:20 |
|
canton7
| mra90, check the output of 'git config core.eol' in both? | 21:21 |
|
mra90
| canton7, no output | 21:21 |
|
canton7
| Maybe it's being auto-detected incorrectly on msys? | 21:22 |
|
mra90
| auto-detected what? | 21:22 |
|
canton7
| Try setting it explicitly to either lf or crlf (depending on what line endings you want in your checked-out files) | 21:22 |
|
| As in, git bash is auto-detecting it as crlf, and msys is auto-detecting it as lf. Or vice versa I guess, but that would surprise me | 21:23 |
| ← aniruddha left | 21:24 |
|
mra90
| even so neither one should change the line endings on its own right? | 21:24 |
|
| I mean changing line endings of the file | 21:24 |
| ← nuh^ left | 21:25 |
|
canton7
| No, but... If core.eol = crlf and a file has CRLF line endings in the working copy but LF in the repo, that's not something that 'git diff' would show. But if core.eol = lf, that would be a difference | 21:26 |
| ← srinidhi left | 21:27 |
|
mra90
| core.eol in my case is not even set | 21:27 |
|
canton7
| I'm a little hazy on how exactly git diff and core.eol interact, but I feel like it must be taken into account on some level. And if core.eol is different between your two environments, and you've got a mix of line endings, it wouldn't surprise me if that's causing some fun | 21:27 |
|
| mra90, if it's not set, git auto-detects whether you're on Windows or Linux, and sets it appropriately | 21:27 |
| ← cdown left | 21:27 |
|
canton7
| mra90, my guess is that, since core.eol isn't set, git on msys is auto-detecting that you're on linux, therefore that it should use lf | 21:28 |
|
| That's why I suggested setting it explicitly in both msys and git bash | 21:28 |
|
| see core.eol in man git-config | 21:28 |
|
gitinfo
| the git-config manpage is available at https://gitirc.eu/git-config.html | 21:28 |
| ← xkuru left | 21:28 |
|
canton7
| "Alternatives are lf, crlf and native, which uses the platform’s native line ending. The default value is native." | 21:29 |
| → rgrinberg joined | 21:30 |
|
mra90
| hmm autocrlf says -> Set to true if you want to have CRLF line endings in your working directory and the repository has LF line endings. | 21:30 |
| → GNUmoon joined | 21:30 |
|
mra90
| does it mean on git coommit, git will convert line endings? | 21:31 |
|
ikke
| mra90: git add | 21:32 |
|
| the conversion happens between the working tree and the index | 21:33 |
|
| git has so called smudge and clean filters | 21:34 |
| ← bertvvvs left | 21:35 |
|
ikke
| clean filters happen when git adds things from the workingtree to the index | 21:35 |
|
| and smudge filters happen when things are copied in the opposite direction | 21:35 |
|
mra90
| ok, ikke how do you explain different status output in msys2 and gitbash? | 21:43 |
| ← m0viefreak left | 21:46 |
| ← rgrinberg left | 21:49 |
| → dsrt^ joined | 21:51 |
| → romesrf joined | 21:52 |
| → rgrinberg joined | 21:52 |
| ← hbautista left | 21:53 |
| ← cliluw left | 21:55 |
| → cliluw joined | 21:56 |
| → xkuru joined | 21:56 |
| → ThorMojito joined | 21:57 |
| ← ThorMojito left | 21:57 |
| ← ishutin left | 21:59 |
| → sa0 joined | 22:00 |
| → ishutin joined | 22:00 |
| ← coot left | 22:01 |
| → hbautista joined | 22:02 |
| ← junktext_ left | 22:03 |
| ← analoq left | 22:03 |
| ← hololeap left | 22:04 |
| → junktext_ joined | 22:04 |
| → analoq joined | 22:05 |
| → hololeap joined | 22:05 |
| ← madewokherd left | 22:07 |
| → pyeveryt_ joined | 22:14 |
| ← hbautista left | 22:17 |
| ← xkuru left | 22:19 |
|
canton7
| mra90, I tried to explain that before. Have you just tried setting core.eol to the same value in both environments? | 22:22 |
|
| I'm off now anyway, good luck! And, maybe, if you ask for help, try listening to the suggestions you get :) | 22:23 |
| ← gh34 left | 22:24 |
| ← Rashad left | 22:24 |
| ← pyeveryt_ left | 22:25 |
|
mra90
| canton7, I appreciate your suggestion and will check in a momement. I asked ikke as I was curious if he has some idea as well | 22:25 |
| ← phryk left | 22:27 |
| → pyevery__ joined | 22:28 |
| → phryk joined | 22:28 |
| → cdown joined | 22:29 |
| → hbautista joined | 22:30 |
| → xkuru joined | 22:31 |
| ← cdown left | 22:33 |
| ← Murr left | 22:36 |
| → Murr joined | 22:37 |
| → x_kuru joined | 22:42 |
| → x_kuru_ joined | 22:43 |
| → madewokherd joined | 22:44 |
| ← xkuru left | 22:45 |
| ← x_kuru left | 22:47 |
| ← x_kuru_ left | 22:48 |
| ← rgrinberg left | 22:59 |
| ← otisolsen70 left | 23:01 |
| ← romesrf left | 23:01 |
| → ThorMojito joined | 23:02 |
| → igemnace joined | 23:02 |
| ← pizdets left | 23:02 |
| ← ThorMojito left | 23:02 |
| → pizdets joined | 23:04 |
| → Anu4 joined | 23:06 |
| Anu4 → Anu | 23:08 |
|
OnlineCop
| mra90: Git bash on my system is found under C:\Program Files\Git\ and within its /etc/ directory, there's a 'gitconfig' file with [core] `autocrlf = true` set. If you check msys2's /etc/ (or whatever) path, does it have any kind of gitconfig file? | 23:08 |
| → Xenguy joined | 23:11 |
| → cebor joined | 23:11 |
|
mra90
| OnlineCop, yes it has .gitconfig under /home/username/ | 23:14 |
|
| but it has autocrlf = false | 23:14 |
| → LuKaRo_ joined | 23:14 |
| ← LuKaRo left | 23:14 |
|
OnlineCop
| Looks like Git Bash and msys2 aren't agreeing on it then. | 23:15 |
| ← cebor left | 23:15 |
| → cebor joined | 23:16 |
| ← pretty_dumm_guy left | 23:16 |
| → ferdna joined | 23:16 |
| ← kadobanana left | 23:17 |
| → mud joined | 23:18 |
|
mra90
| OnlineCop, well if both have autocrlf=false then it should be no problem then? | 23:18 |
| ← causasui left | 23:19 |
| ← vakera_pingveno left | 23:22 |
| ← palasso left | 23:23 |
| ← Xenguy left | 23:24 |
| → fabs joined | 23:26 |
| → Xenguy joined | 23:30 |
| ← madewokherd left | 23:34 |
|
OnlineCop
| I expect that as long as both get set to the same, that it should take care of the problems that you're seeing. | 23:37 |
|
mra90
| it definitely doesn't happen on git add or git commit as I see all files changed in git diff | 23:41 |
|
| which suggests me that this is the editor fault but this is unlikely... | 23:41 |
| → vakera_pingveno joined | 23:43 |
| ← LuKaRo_ left | 23:45 |
| → LuKaRo joined | 23:47 |
| → ThorMojito joined | 23:56 |
| ← ThorMojito left | 23:57 |