| 2021-12-01 |
| ← zopsi_ left | 00:00 |
| ← jinsun left | 00:00 |
| ← cdown left | 00:00 |
| ← Maxattax97 left | 00:00 |
| ← hoochmonger left | 00:00 |
| ← average left | 00:00 |
| ← maxzor_ left | 00:00 |
| ← AbleBacon left | 00:00 |
| ← rwp left | 00:00 |
| ← blmt left | 00:00 |
| ← foo left | 00:00 |
| ← laksith left | 00:00 |
| ← phryk left | 00:00 |
| ← earthbreaker left | 00:00 |
| ← haskl left | 00:00 |
| ← robertparkerx left | 00:00 |
| ← sahilister998 left | 00:00 |
| ← kaichiuc1u left | 00:00 |
| ← pflanze_ left | 00:00 |
| ← igemnace left | 00:00 |
| ← ChmEarl left | 00:00 |
| ← wolfdale left | 00:00 |
| ← arcatech left | 00:00 |
| ← analpaper left | 00:00 |
| ← nyah left | 00:00 |
| ← Forlorn left | 00:00 |
| ← thiago left | 00:00 |
| ← durham left | 00:00 |
| ← Shentino left | 00:00 |
| ← emf left | 00:00 |
| ← liefer left | 00:00 |
| ← unluckyshrubbery left | 00:00 |
| ← pretty_dumm_guy left | 00:00 |
| ← rahl left | 00:00 |
| ← Furai left | 00:00 |
| ← natechan left | 00:00 |
| ← hwrd left | 00:00 |
| ← alex88 left | 00:00 |
| ← terrorjack left | 00:00 |
| ← pmcnabb left | 00:00 |
| ← LogicAside left | 00:00 |
| ← glider left | 00:00 |
| ← lucerne left | 00:00 |
| ← wilz left | 00:00 |
| ← zmt00 left | 00:00 |
| ← batrick left | 00:00 |
| ← very_sneaky left | 00:00 |
| ← irrgit left | 00:00 |
| ← ztrawhcse left | 00:00 |
| ← ddevault left | 00:00 |
| ← gjnoonan left | 00:00 |
| ← bagels left | 00:00 |
| ← srinidhi left | 00:00 |
| ← samuelbernardo left | 00:00 |
| ← jim left | 00:00 |
| ← hanneso left | 00:00 |
| ← johncs left | 00:00 |
| ← reset left | 00:00 |
| ← jimklimov left | 00:00 |
| ← tuxifreund left | 00:00 |
| ← teddyc left | 00:00 |
| ← Nei left | 00:00 |
| ← trilobite left | 00:00 |
| ← indyZ left | 00:00 |
| ← TimWolla left | 00:00 |
| ← waterkip left | 00:00 |
| → bagels joined | 00:00 |
| → TimWolla joined | 00:00 |
| → unluckyshrubbery joined | 00:00 |
| → nyah joined | 00:00 |
| → Forlorn joined | 00:00 |
| → Maxattax97 joined | 00:00 |
| → teddyc joined | 00:00 |
| → trilobite joined | 00:00 |
| → ddevault joined | 00:00 |
| → kaichiuchu joined | 00:00 |
| → analpaper joined | 00:00 |
| → pflanze_ joined | 00:00 |
| → ChmEarl joined | 00:00 |
| → sahilister998 joined | 00:00 |
| → blmt joined | 00:00 |
| ← kaichiuchu left | 00:00 |
| → kaichiuchu joined | 00:00 |
| → Furai joined | 00:00 |
| ← ChmEarl left | 00:00 |
| → ChmEarl joined | 00:00 |
| → wilz joined | 00:00 |
| → Nei joined | 00:00 |
| → igemnace joined | 00:00 |
| ← analpaper left | 00:00 |
| → analpaper joined | 00:00 |
| → irrgit joined | 00:00 |
| → robertparkerx joined | 00:00 |
| → natechan joined | 00:00 |
| → average joined | 00:01 |
| → zopsi joined | 00:01 |
| → alex88 joined | 00:01 |
| ← DoofusCanadensis left | 00:01 |
| ← Nei left | 00:01 |
| → Nei joined | 00:01 |
| ← average left | 00:01 |
| → average joined | 00:01 |
| → batrick joined | 00:01 |
| ← robertparkerx left | 00:01 |
| → robertparkerx joined | 00:01 |
| → Shentino joined | 00:01 |
| → tuxifreund joined | 00:02 |
| → hwrd joined | 00:02 |
| → maxzor joined | 00:02 |
| → johncs joined | 00:02 |
| → cdown joined | 00:02 |
| → jinsun joined | 00:02 |
| ← Shentino left | 00:02 |
| → gjnoonan joined | 00:02 |
| → ztrawhcse joined | 00:02 |
| ← chemsmith left | 00:02 |
| → samuelbernardo joined | 00:02 |
| → phryk joined | 00:02 |
| → earthbreaker joined | 00:02 |
| → laksith joined | 00:02 |
| → haskl joined | 00:02 |
| → Shentino joined | 00:02 |
| → hoochmonger joined | 00:02 |
| → srinidhi joined | 00:03 |
| ← Portugol9 left | 00:03 |
| → durham joined | 00:03 |
| → pretty_dumm_guy joined | 00:03 |
| → very_sneaky joined | 00:03 |
| → glider joined | 00:04 |
| → LogicAside joined | 00:04 |
| → chemsmith joined | 00:04 |
| → waterkip joined | 00:05 |
| → foo joined | 00:05 |
| → indyZ joined | 00:05 |
| → rwp joined | 00:05 |
| → hanneso joined | 00:05 |
| → rahl joined | 00:05 |
| → arcatech joined | 00:05 |
| → emf joined | 00:05 |
| → Portugol9 joined | 00:06 |
| → thiago joined | 00:10 |
| ← ZacSharp left | 00:10 |
| → jimklimov joined | 00:11 |
| ← durham left | 00:11 |
| → ThorMojito joined | 00:17 |
| → chenqisu12 joined | 00:19 |
| ← chenqisu12 left | 00:20 |
| → chenqisu12 joined | 00:20 |
| ← jonosterman left | 00:22 |
| → jonosterman joined | 00:25 |
| ← lemonsnicks left | 00:32 |
| ← xayto left | 00:33 |
| justache → totallynotjustac | 00:33 |
| ← jim87 left | 00:33 |
| totallynotjustac → justache | 00:34 |
| → lemonsnicks joined | 00:35 |
| ← gast0n left | 00:38 |
| → xayto joined | 00:40 |
| ← thiago left | 00:40 |
| ← Wuzzy left | 00:43 |
| → jazzy joined | 00:46 |
| → superbolide joined | 00:54 |
| → jim joined | 00:55 |
| justache → zoite | 00:57 |
| ← pretty_dumm_guy left | 00:58 |
| zoite → z0ite | 00:59 |
| ← GNUmoon left | 01:01 |
| → GNUmoon joined | 01:01 |
| ← goldfish left | 01:02 |
| → ferdna joined | 01:03 |
| ← lionkor left | 01:05 |
|
jim
| hi.. hope thanksgiving was a good time (for those who celebrate that)... | 01:09 |
|
| say I've been commiting/pushing etc, and the last thing I committed and pushed worked fine... | 01:10 |
| ← rapha left | 01:12 |
| → rapha joined | 01:12 |
| ← jonosterman left | 01:12 |
|
jim
| then, say I'm trying to figure out a bug I introduced since then, I want to make it available, can I commit that code to another branch? (so, say there's uncommitted work, can I switch to a new branch which is off the last commit, and commit my (problem) code there? | 01:12 |
| ← stenno left | 01:14 |
| → jonosterman joined | 01:14 |
| ← acidjnk_new left | 01:15 |
| → stenno joined | 01:16 |
| ← xkuru left | 01:23 |
| ← jstein left | 01:24 |
| → BSaboia joined | 01:25 |
|
rewt
| jim, yep, just create the new branch (`git checkout -b mynewbranch`) before your commit (`git commit`) | 01:26 |
|
mackerman
| Or add, but don't commit. | 01:31 |
| ← Portugol9 left | 01:32 |
| → Portugol9 joined | 01:35 |
| ← superbolide left | 01:40 |
| → bambanxx joined | 01:46 |
| ← BSaboia left | 01:46 |
| → BSaboia joined | 01:47 |
|
jim
| so add, make new branch and switch to it, commit? | 01:53 |
|
| or, make new branch, switch to it, add, commit? | 01:54 |
| ← Maxattax97 left | 01:54 |
| ← cweiss07653 left | 01:55 |
|
mackerman
| add first, so the changes are in the index. | 01:55 |
|
| Either should work, however. | 01:55 |
|
| s/the index/staged/ | 01:55 |
| → thiago joined | 01:55 |
| → cweiss07653 joined | 01:57 |
| ← cweiss07653 left | 01:58 |
| sebastorama_ → sebastorama | 01:59 |
| → cweiss07653 joined | 01:59 |
| ← cweiss07653 left | 01:59 |
| ← igemnace left | 02:00 |
| → igemnace joined | 02:00 |
| ← BSaboia left | 02:00 |
| → cweiss07653 joined | 02:01 |
| ← jonosterman left | 02:02 |
| → jonosterman joined | 02:04 |
| → R2robot joined | 02:04 |
| → BSaboia joined | 02:09 |
| ← BSaboia left | 02:10 |
| → BSaboia joined | 02:11 |
| ← qpdb left | 02:11 |
| ← alzgh left | 02:19 |
| ← keypusher left | 02:24 |
| → qpdb joined | 02:25 |
| ← BSaboia left | 02:25 |
| → keypusher joined | 02:27 |
| → BSaboia joined | 02:29 |
| ← mgedmin left | 02:30 |
| ← BSaboia left | 02:30 |
| → BSaboia joined | 02:31 |
| ← BSaboia left | 02:31 |
| → mgedmin joined | 02:32 |
| → alzgh joined | 02:33 |
| ← ThorMojito left | 02:38 |
| ← alzgh left | 02:49 |
| ← thiago left | 02:49 |
| → alzgh joined | 02:55 |
| ← bambanxx left | 02:58 |
| ← llh left | 03:00 |
| → llh joined | 03:03 |
| → ThorMojito joined | 03:12 |
| → finn_elija joined | 03:12 |
| ← FinnElija left | 03:12 |
| finn_elija → FinnElija | 03:12 |
| ← bloody left | 03:20 |
| ← PerlAmutor left | 03:25 |
| → Xenguy joined | 03:31 |
| → bytehackr joined | 03:44 |
| → Nex6 joined | 03:46 |
| → gast0n joined | 03:50 |
| ← maxzor left | 03:57 |
| ← Dotz0cat left | 04:03 |
| → bambanxx joined | 04:03 |
| → maxzor joined | 04:09 |
| ← vishal left | 04:09 |
| ← zebrag left | 04:10 |
| → vishal joined | 04:11 |
| ← Nex6 left | 04:11 |
| → Nex6 joined | 04:12 |
| ← Nex6 left | 04:13 |
| → Nex6 joined | 04:13 |
| ← nyah left | 04:14 |
| ← Nex6 left | 04:14 |
| → Nex6 joined | 04:14 |
| → Nex6|Orc joined | 04:15 |
| ← Nex6 left | 04:15 |
| → Nex6 joined | 04:17 |
| ← Nex6|Orc left | 04:17 |
| ← Nex6 left | 04:17 |
| ← causa-sui left | 04:18 |
| → causa-sui joined | 04:19 |
| → thiago joined | 04:23 |
| ← causa-sui left | 04:24 |
| ← maroloccio left | 04:24 |
| ← hoochmonger left | 04:29 |
| ← bambanxx left | 04:32 |
| ← jonosterman left | 04:32 |
| → jonosterman joined | 04:33 |
| → sjkfasc joined | 04:33 |
| ← SirRippovMaple34 left | 04:34 |
| → SirRippovMaple34 joined | 04:34 |
| ← chenqisu12 left | 04:36 |
| ← ThorMojito left | 04:38 |
| ← gast0n left | 04:41 |
| ← mat001 left | 04:42 |
| ← ChmEarl left | 04:46 |
| → causa-sui joined | 04:48 |
| ← causa-sui left | 04:52 |
| → pyevery__ joined | 04:58 |
| ← alzgh left | 05:01 |
| ← great_taste left | 05:03 |
| z0ite → justache | 05:03 |
| → mat001 joined | 05:12 |
| ← ferdna left | 05:12 |
| → emeka joined | 05:14 |
| ← mat001 left | 05:17 |
| ← jonosterman left | 05:22 |
| → jonosterman joined | 05:24 |
| → AbleBacon joined | 05:32 |
| → arcatech_ joined | 05:32 |
| ← arcatech left | 05:34 |
| ← arcatech_ left | 05:36 |
| ← Xaldafax left | 05:40 |
| ← emeka left | 05:40 |
| → Dotz0cat joined | 05:45 |
| → causa-sui joined | 05:49 |
| ← maxzor left | 05:49 |
| → maxzor joined | 05:50 |
| ← causa-sui left | 05:53 |
| → jazzy2 joined | 05:53 |
| ← rahl left | 05:53 |
| → rahl joined | 05:55 |
| ← jazzy left | 05:56 |
| → cryptone1tor joined | 06:06 |
| ← cryptonector left | 06:08 |
| ← Xenguy left | 06:10 |
| ← hbautista left | 06:12 |
| ← jonosterman left | 06:12 |
| → jonosterman joined | 06:12 |
| ← average left | 06:15 |
| → neo43589367 joined | 06:20 |
|
neo43589367
| Hello! I could use some git assistance | 06:20 |
| → roadie joined | 06:20 |
|
neo43589367
| I'm trying to better understand git http-backend | 06:21 |
| ← sgn left | 06:21 |
|
neo43589367
| I read the documentation, but it's all for Apache and I'm trying to get it set up with Caddy | 06:21 |
| → sgn joined | 06:22 |
| ← neo43589367 left | 06:31 |
| ← pyevery__ left | 06:31 |
| → vysn joined | 06:33 |
| ← skapata left | 06:33 |
| ← jazzy2 left | 06:37 |
| → jazzy2 joined | 06:38 |
| → marw joined | 06:38 |
| → pizdets joined | 06:39 |
| ← thekingofbandit left | 06:42 |
| ← xcm_ left | 06:42 |
| → xcm_ joined | 06:42 |
| → thekingofbandit joined | 06:43 |
| ← maxzor left | 06:45 |
| ← sudoforge left | 06:49 |
| ← roadie left | 06:51 |
| ← Ilyu left | 06:53 |
| ← bn_work left | 06:53 |
| → jstein joined | 06:57 |
| ← jonosterman left | 07:01 |
| → jonosterman joined | 07:03 |
| ← magic_ninja left | 07:04 |
| → mattil joined | 07:04 |
| → magic_ninja joined | 07:06 |
| → causa-sui joined | 07:08 |
| ← magic_ninja left | 07:10 |
| ← daoudr left | 07:10 |
| → magic_ninja joined | 07:11 |
| → maxzor joined | 07:12 |
| ← AbleBacon left | 07:12 |
| ← causa-sui left | 07:13 |
| → txtsd joined | 07:15 |
| ← maxzor left | 07:23 |
| → hololeap joined | 07:24 |
| → john_johnk joined | 07:34 |
| ← thiago left | 07:37 |
| ← elastic_dog left | 07:39 |
| → elastic_dog joined | 07:41 |
| → palasso joined | 07:42 |
| → Guest27 joined | 07:46 |
| → mat001 joined | 07:46 |
| ← Betal left | 07:50 |
| ← mat001 left | 07:51 |
| ← jazzy2 left | 07:51 |
| → jazzy3 joined | 07:51 |
| ← jonosterman left | 07:52 |
| → whatsupdoc joined | 07:52 |
| → jonosterman joined | 07:53 |
| → tsujp joined | 07:53 |
| → otisolsen70 joined | 07:56 |
| ← rgrinberg left | 07:57 |
| → rfuentess joined | 08:01 |
| ← unluckyshrubbery left | 08:07 |
| → Ilyu joined | 08:07 |
| → jusski joined | 08:09 |
| → RiFo joined | 08:09 |
| ← Furai left | 08:14 |
| → Furai joined | 08:14 |
| ← xx left | 08:18 |
| ← m0viefreak left | 08:21 |
| → EvilDMP joined | 08:26 |
| → Sulky joined | 08:26 |
| → vladoski joined | 08:28 |
| ← dermoth left | 08:30 |
| ← crabbedhaloablut left | 08:32 |
| → pyevery__ joined | 08:32 |
| → crabbedhaloablut joined | 08:33 |
| ← hendry left | 08:34 |
| → rfuentess_ joined | 08:34 |
| → hendry joined | 08:36 |
| ← rfuentess left | 08:37 |
| → rfuentess__ joined | 08:37 |
| ← pyevery__ left | 08:38 |
| ← rfuentess_ left | 08:39 |
| → Guest22 joined | 08:41 |
| ← jonosterman left | 08:41 |
| ← Ilyu left | 08:42 |
| → jonosterman joined | 08:43 |
|
Guest22
| Hello everyone!:) I have a problem i get a error when i try to push my first commit to Azure. I get this Error "Error: LibGit2Sharp.LibGit2SharpException: cross host redirect not allowed" and i dont know what it means. I have tried to find a solution on Google but nothing helped me so far. Does somebody know where this error comes from? | 08:45 |
| → alzgh joined | 08:45 |
| ← txtsd left | 08:46 |
| → Codaraxis_ joined | 08:46 |
| → kenanmarasli joined | 08:46 |
| ← Codaraxis left | 08:48 |
| → Sulky_ joined | 08:51 |
| → Ilyu joined | 08:51 |
| ← Ilyu left | 08:52 |
| → dermoth joined | 08:53 |
|
canton7
| Guest22, it looks like you're trying to push to domain1.com, and that's issuing a redirect to domain2.com, which libgit2 doesn't like | 08:54 |
| ← Sulky left | 08:54 |
|
canton7
| Guest22, presumably you're pushing over http, of course? I'd access the url you're pushing to in a browser (with the developer console up) and just see what redirect you're getting. If it's to somewhere sensible (i.e. it looks fairly generic, and not like the address of a specific machine somewhere), you can probably just update your git config to | 08:55 |
|
| push there instead | 08:55 |
| → furrymcgee joined | 08:55 |
|
Guest22
| domain1.com? Well i use the https of the repository i created at azure. | 08:56 |
|
| It worked a few days ago and i didnt had any problems but since yesterday i alway get this Exception when i try to push a first commit of a new Project. | 08:57 |
|
hendry
| I want to page through the changes in one file (whilst viewing the entire file), how do people do that? https://s.natalian.org/2021-12-01/git-file.mp4 | 08:58 |
| → TomyWork joined | 08:59 |
| → reset joined | 09:00 |
|
Guest22
| I have also uninstalled and installed GIT several times but it doesn't help | 09:00 |
| → drogas joined | 09:00 |
| ← sjkfasc left | 09:02 |
| ← jusski left | 09:03 |
| ← getSomethingGood left | 09:04 |
| → getSomethingGood joined | 09:05 |
| → acidjnk_new joined | 09:05 |
| ← Sulky_ left | 09:07 |
| → Sulky_ joined | 09:07 |
| ← nrl^ left | 09:07 |
|
bookworm
| hendry: git integration in my editor (neovim + fugitive) | 09:07 |
| → joo-_ joined | 09:08 |
|
joo-_
| can git find out which unix user changed the file and blame that user somehow ? the user could make a commit, but if the user doesnt, - is there a way for git to "find out" ? | 09:09 |
|
hendry
| bookworm: yes, I use :0Gclog for this, and it's the only feature i use from fugitive, haha | 09:09 |
|
selckin
| joo-_: no | 09:09 |
| → causa-sui joined | 09:10 |
| ← drogas left | 09:11 |
| → drogas joined | 09:12 |
| ← sgn left | 09:13 |
| → sgn joined | 09:13 |
| ← causa-sui left | 09:14 |
|
canton7
| Guest22, what URL are you pushing to? | 09:19 |
|
| Guest22, what does `git remote -v` output? | 09:19 |
|
Guest22
| i use the command git remote -v in git cmd or? | 09:21 |
| ← NeilRG left | 09:22 |
|
canton7
| Guest22, sure, or look at your git configuration in whatever UI you're using to see what URL it's configured to push to | 09:23 |
|
Guest22
| i get there fatal: not a git repository (or any of the parent directories): .git | 09:24 |
| ← mattil left | 09:25 |
|
henk
| j416: just FYI: quite possibly "lazygit" https://github.com/jesseduffield/lazygit is what I have been looking for yesterday but haven’t tried it yet (: | 09:27 |
| ← raffaele_ left | 09:30 |
| → raffaele_ joined | 09:30 |
| → theoceaniscool joined | 09:32 |
| ← jonosterman left | 09:32 |
| → jonosterman joined | 09:33 |
| → The_Jag joined | 09:35 |
| → clime joined | 09:35 |
| → spare joined | 09:39 |
| → dsrt^ joined | 09:40 |
| → natrys joined | 09:41 |
|
joo-_
| selckin: ok thanks :-) i guess i should make the user do some commits also | 09:49 |
| ← Sulky_ left | 09:51 |
| → lionkor joined | 09:53 |
| ← lehinsun left | 09:54 |
| → R2robot_ joined | 09:56 |
| ← starfarer_ left | 09:56 |
| ← R2robot left | 09:57 |
| → xkuru joined | 09:57 |
| ← GNUmoon left | 09:58 |
| → GNUmoon joined | 09:59 |
| → ZachGibbens joined | 10:00 |
| ← hololeap left | 10:01 |
| → ubique joined | 10:03 |
| → Lord_of_Life_ joined | 10:04 |
| → BigShip8 joined | 10:04 |
| → hololeap joined | 10:04 |
| ← Lord_of_Life left | 10:05 |
| ← BigShip left | 10:05 |
| BigShip8 → BigShip | 10:05 |
| ← sgn left | 10:06 |
| Lord_of_Life_ → Lord_of_Life | 10:07 |
| ← bindu left | 10:09 |
| → bindu joined | 10:09 |
| → Benett joined | 10:10 |
| → ueberall joined | 10:10 |
| → Vonter joined | 10:11 |
| ← The_Blode left | 10:12 |
| → roadie joined | 10:13 |
| → jusski joined | 10:14 |
| → starfarer joined | 10:18 |
| ← Guest22 left | 10:20 |
| → julien joined | 10:21 |
| ← jonosterman left | 10:21 |
| → jonosterman joined | 10:24 |
|
j416
| henk: huh. seems complex. | 10:27 |
|
henk
| j416: yeah, possibly. I’ll let you know when I have tested it a bit … | 10:30 |
| ← hololeap left | 10:35 |
| → hololeap joined | 10:36 |
| ← vimal left | 10:41 |
| ← roadie left | 10:45 |
| → Guest22 joined | 10:45 |
| ← Guest22 left | 10:48 |
| ← EvilDMP left | 10:49 |
| → Guest22 joined | 10:50 |
| → Guest2288 joined | 10:52 |
| ← Guest22 left | 10:52 |
| → bbju joined | 10:54 |
| → barteks2x joined | 10:55 |
| → bbju33 joined | 10:57 |
| → jmd joined | 10:58 |
|
jmd
| How can I find out what was the latest thing that was pushed? | 10:59 |
| ← bbju left | 10:59 |
| → vimal joined | 11:01 |
|
selckin
| don't think you can, git fetch, will pull in the changes to the remote branches, you can then check the commit/author times | 11:01 |
|
jmd
| But I would have to check each and every branch individually ? | 11:03 |
|
selckin
| but those have the date the commit was made, not pushed | 11:03 |
|
jmd
| I don't really care what time/date it was pushed. I just want to see that most recently pushed commit. | 11:04 |
|
| /that/the/ | 11:04 |
| ← Guest2288 left | 11:04 |
|
selckin
| on a specific branch? | 11:05 |
|
osse
| jmd: to a remote repo, or from the current local one? | 11:05 |
| → Sulky joined | 11:06 |
| → Guest22 joined | 11:06 |
| → pretty_dumm_guy joined | 11:09 |
| → enoq joined | 11:10 |
| → mbalmer_ joined | 11:11 |
| ← Guest22 left | 11:11 |
| → DibbTubberOne joined | 11:11 |
| ← jonosterman left | 11:11 |
| → jonosterman joined | 11:13 |
| ← mbalmer left | 11:15 |
| → Sulky_ joined | 11:16 |
| ← Sulky left | 11:17 |
| → Sulky__ joined | 11:18 |
|
furrymcgee
| reflog? | 11:19 |
| ← Sulky_ left | 11:21 |
| → EvilDMP joined | 11:23 |
|
ikke
| git itself does not keep track of it | 11:23 |
| → terrorjack joined | 11:24 |
| ← jusski left | 11:30 |
|
furrymcgee
| back to subversion | 11:31 |
| ← john_johnk left | 11:34 |
|
jmd
| osse: The remote repo | 11:34 |
| ← vimal left | 11:43 |
| ← wwwi_ left | 11:43 |
| ← atrigent left | 11:47 |
| ← julien left | 11:47 |
|
furrymcgee
| perhaps your webservice can tell the latest push | 11:49 |
|
ikke
| jmd: What is the actual problem you try to solve? | 11:52 |
| → ChmEarl joined | 11:52 |
|
furrymcgee
| man githooks | 11:56 |
|
gitinfo
| the githooks manpage is available at https://gitirc.eu/githooks.html | 11:56 |
| → The_Blode joined | 11:58 |
| → nyany joined | 11:59 |
| ← bbju33 left | 12:02 |
| ← DibbTubberOne left | 12:06 |
| ← EvilDMP left | 12:07 |
| ← jmd left | 12:10 |
| ← jazzy3 left | 12:11 |
| → cmbengue joined | 12:12 |
| → Guest88 joined | 12:14 |
| ← Sulky__ left | 12:15 |
| → Sulky__ joined | 12:15 |
| → EvilDMP joined | 12:18 |
| ← Guest88 left | 12:19 |
| → mbalmer joined | 12:20 |
| ← mbalmer_ left | 12:21 |
| ← Sulky__ left | 12:24 |
| → Sulky_ joined | 12:24 |
| ← whatsupdoc left | 12:25 |
| → pmcnabb joined | 12:26 |
| → maxzor joined | 12:26 |
| ← spare left | 12:26 |
| → spare joined | 12:27 |
| → ThePhilgrim joined | 12:31 |
| ← vladoski left | 12:32 |
| ← clime left | 12:32 |
| → Guest88 joined | 12:38 |
| ← spare left | 12:39 |
| → spare joined | 12:40 |
| ← barteks2x left | 12:47 |
| ← Guest88 left | 12:48 |
| ← ThePhilgrim left | 12:48 |
| → oxymoron93 joined | 12:51 |
| ← jonosterman left | 12:52 |
| → john_johnk joined | 12:53 |
| → jonosterman joined | 12:54 |
| → vimal joined | 12:56 |
| ← xkuru left | 13:00 |
| → xkuru joined | 13:02 |
| ← wombawomba left | 13:04 |
| → wombawomba joined | 13:06 |
| ← maxzor left | 13:07 |
| ← ChmEarl left | 13:09 |
| → ChmEarl joined | 13:10 |
| ← drogas left | 13:11 |
| ← otisolsen70 left | 13:11 |
| → vladoski joined | 13:14 |
| → drogas joined | 13:25 |
| → ZachGibbens_ joined | 13:31 |
| ← Shentino left | 13:32 |
| ← ZachGibbens_ left | 13:34 |
| ← aminvakil left | 13:37 |
| → aLeSD joined | 13:37 |
| → aminvakil joined | 13:37 |
| → f-a joined | 13:39 |
| → Shentino joined | 13:40 |
| ← jonosterman left | 13:41 |
| → jusski joined | 13:42 |
|
f-a
| hello: http://ariis.it/link/repos/test-git-repo/ ← this is a git repo I rsync’d to my site. | 13:42 |
|
| git clone http://ariis.it/link/repos/test-git-repo/ does not work (not found) | 13:43 |
| → jonosterman joined | 13:43 |
|
f-a
| with other vcs (say, darcs), I can do that (copy files to server and then `darcs get`). Is this possible w/ git too? | 13:44 |
|
ztrawhcse
| f-a: sure, just check it into the repo and push it as a revision ;) | 13:47 |
|
| Also your site doesn't seem to have been validly rsynced, it doesn't have the .git directory | 13:48 |
|
| Also also: git push is like rsync except specially designed for git, so it's probably better to use it | 13:49 |
| → nyah joined | 13:50 |
|
f-a
| it does, ztrawhcse http://ariis.it/link/repos/test-git-repo/.git/ | 13:50 |
|
ztrawhcse
| Ah, the directory listing lied :/ | 13:51 |
|
f-a
| I do not rsync to server | 13:52 |
|
| I rsync to local folder and then `sitecopy` to it | 13:53 |
|
| Why does git not recognise this as a repository? | 13:53 |
|
ztrawhcse
| https://www.git-scm.com/docs/http-protocol#_dumb_clients | 13:58 |
|
| You need to do a bit of extra work if you don't have a git daemon running on the remote. I'm not positive what creates the info/refs file, actually. | 13:59 |
| → causa-sui joined | 14:01 |
| → ThorMojito joined | 14:02 |
| → bloody joined | 14:03 |
|
ztrawhcse
| https://git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols#_dumb_http | 14:03 |
|
| There we go | 14:03 |
| → txtsd joined | 14:03 |
|
ztrawhcse
| f-a: run the referenced command there, or add the referenced hook and use git push over ssh instead of rsync over ssh | 14:03 |
| → Sario joined | 14:04 |
|
f-a
| this is shared hosting, I do not have access to command line. Hence that is impossible for me? | 14:05 |
|
ztrawhcse
| Then run the command locally on the local repo before each upload :) | 14:07 |
|
Nei
| you need a local dumb repo that you can rsync to the server if it's a dumb host | 14:08 |
| ← kenanmarasli left | 14:10 |
| ← acidjnk_new left | 14:11 |
| ← cmbengue left | 14:13 |
| → cmbengue joined | 14:14 |
| → gh34 joined | 14:19 |
| → bbju joined | 14:20 |
| → skapata joined | 14:21 |
| ← skapata left | 14:21 |
| → skapata joined | 14:21 |
| ← ThorMojito left | 14:25 |
| ← Dotz0cat left | 14:25 |
| ← lionkor left | 14:26 |
| → Dotz0cat joined | 14:29 |
| ← jonosterman left | 14:32 |
| → ThorMojito joined | 14:32 |
| → jonosterman joined | 14:33 |
| ← dsrt^ left | 14:38 |
| ← Strom left | 14:43 |
| → Xaldafax joined | 14:43 |
| → gast0n joined | 14:43 |
|
f-a
| Nei: what is a dumb repo? I think I followed the instruction shared by ztrawhcse but no dice, git clone http://ariis.it/link/repos/test-git-repo/ still errors | 14:45 |
| ← enoq left | 14:47 |
|
ztrawhcse
| It's a way to describe servers that serve a repo using http file access, but not using one of: ssh, the git-daemon, or a CGI program | 14:47 |
| ← jusski left | 14:48 |
|
ztrawhcse
| f-a: I can successfully clone that repo, but I need to add .git/ to the end because that is a checked-oit repo instead of one that is created by git init --bare and pushed to | 14:51 |
|
f-a
| oh | 14:51 |
|
| I did not init it with git init bare | 14:51 |
|
ztrawhcse
| Also when I do clone http://ariis.it/link/repos/test-git-repo/.git/ I get an empty master branch and a valid origin/master branch | 14:51 |
|
Nei
| f-a: if you want to make a repo that is similar to the one github exposes, try "git clone --bare your/work/repo myrepo.git" | 14:51 |
|
| then in myrepo.git folder, run "git update-server-info"; then rsync the folder | 14:52 |
|
f-a
| let me tryyyyyyyyy | 14:52 |
|
ztrawhcse
| So yeah, you probably want to clone your repo with --bare into your server upload staging directory | 14:52 |
|
f-a
| Nei: don’t have a github repo, `git init --bare` will do, right? | 14:52 |
|
Nei
| you can also start a fresh repo with init --bare | 14:52 |
| → Thanatermesis joined | 14:52 |
|
Nei
| but keep in mind you cannot "work" with a bare repo,m you have to clone it first | 14:52 |
|
ztrawhcse
| And then git pull in the staging directory to update from your worktree, don't use rsync | 14:53 |
|
| Actually you can use the post update hooks in that case ;) | 14:53 |
|
Nei
| the problem with using a dumb server with ftp only is that you cannot "push" to it | 14:54 |
|
ztrawhcse
| Yes but apparently there is a staging directory locally, which is synced using a tool that does have upload access | 14:55 |
|
| So you can push to the local staging directory as if it were the server :D | 14:55 |
|
f-a
| ok, this is wat an `init --bare` repo should look like, am I wrong? http://ariis.it/link/repos/test-git-repo/ | 14:55 |
|
ztrawhcse
| Yes | 14:56 |
|
Nei
| yes but if you want to use this repo from multiple computers you will need to rsync the server side repo and cannot use the normal git pull/push | 14:56 |
|
f-a
| I would not use git push | 14:56 |
|
| but git pull would be handy | 14:56 |
|
| I think I understand this a little bit better, thanks everyone | 14:57 |
|
ztrawhcse
| Although it is missing the info/refs file you generated before. | 14:57 |
| → epolanski joined | 14:57 |
| → atrigent joined | 14:59 |
| ← ThorMojito left | 15:06 |
| → meator joined | 15:07 |
| ← justache left | 15:08 |
| → ThorMojito joined | 15:13 |
| → mrcrypto joined | 15:18 |
| → yksi joined | 15:25 |
| ← cbreak left | 15:27 |
| → maxzor joined | 15:27 |
| → justache joined | 15:29 |
| → cbreak joined | 15:30 |
| ← avar left | 15:30 |
| → cation21 joined | 15:35 |
| ← dermato left | 15:35 |
| ← cation left | 15:35 |
| → superbolide joined | 15:37 |
| → rgrinberg joined | 15:37 |
| → thiago joined | 15:38 |
| cation21 → cation | 15:38 |
| → lightningwright joined | 15:39 |
| ← justache left | 15:41 |
| → justache joined | 15:43 |
| → vesuvi88 joined | 15:43 |
| ← Guest27 left | 15:43 |
| → sudoforge joined | 15:44 |
|
vesuvi88
| hi all! please, help! why some changes may not work after executing the git merge command? | 15:45 |
|
| and how can I avoid this? | 15:45 |
| ← john_johnk left | 15:47 |
| ← oxymoron93 left | 15:48 |
| ← f-a left | 15:49 |
| → jusski joined | 15:50 |
| → avar joined | 15:51 |
| → barteks2x joined | 15:51 |
| → FFY00_ joined | 15:52 |
| ← avar left | 15:52 |
| ← vesuvi88 left | 15:53 |
| → avar joined | 15:53 |
| → zer0bitz joined | 15:53 |
| ← FFY00 left | 15:54 |
| ← rgrinberg left | 15:54 |
| ← ThorMojito left | 15:58 |
| → AbleBacon joined | 16:00 |
| → rgrinberg joined | 16:01 |
|
anddam
| he left, still… | 16:02 |
|
| WAT? | 16:02 |
| justache → justSleigh | 16:02 |
| ← atrigent left | 16:03 |
| → durham joined | 16:04 |
| → nvmd joined | 16:04 |
| → bambanxx joined | 16:05 |
|
anddam
| question of my own, can I add a config/hook so that I prevent a certain branch to be pushed on a remote? | 16:06 |
| ← gast0n left | 16:06 |
|
anddam
| so even typing git push remote forbidden-branch would not succeeed | 16:06 |
|
imMute
| I think one of the post-receive examples is exactly that | 16:07 |
|
ikke
| pre-receive hook | 16:08 |
|
| not sure if there is an example | 16:09 |
|
imMute
| oh, right it's pre-receive. https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks#Server-Side-Hooks says " It takes a list of references that are being pushed from stdin; if it exits non-zero, none of them are accepted. You can use this hook to do things like make sure none of the updated references are non-fast-forwards, or to do access control for all the refs and files they’re modifying with the | 16:10 |
|
| push." | 16:10 |
| → gast0n joined | 16:10 |
|
imMute
| so a simple shell script that checks stdin would suffice. | 16:10 |
| → mat001 joined | 16:11 |
| ← jonosterman left | 16:12 |
| → jonosterman joined | 16:13 |
| ← Murr left | 16:15 |
| → Murr joined | 16:15 |
| ← mat001 left | 16:16 |
| ← durham left | 16:17 |
| ← gast0n left | 16:18 |
| ← Misotauros left | 16:18 |
| → Nex6 joined | 16:18 |
| → Tabmow joined | 16:20 |
| → zebrag joined | 16:20 |
| ← Sulky_ left | 16:23 |
|
leah2
| it would be nice to disable git commit -a on a repo level... | 16:24 |
|
ikke
| `git add .` | 16:25 |
| → rsx joined | 16:27 |
| → hbautista joined | 16:28 |
| ← siers left | 16:28 |
| ← alzgh left | 16:29 |
| → neo43589367 joined | 16:31 |
| ← mallkrampus left | 16:32 |
| ← rfuentess__ left | 16:34 |
| → gast0n joined | 16:34 |
| → ThorMojito joined | 16:36 |
| ← jusski left | 16:36 |
| → atrigent joined | 16:38 |
| ← gast0n left | 16:42 |
| → alzgh joined | 16:42 |
| ← jonosterman left | 16:44 |
| → mallkrampus joined | 16:45 |
| ← nvmd left | 16:45 |
| → gast0n joined | 16:48 |
| ← Thanatermesis left | 16:50 |
| → Betal joined | 16:56 |
|
neo43589367
| Hi can anybody help with my caddy problem? | 16:57 |
| → vesuvi88 joined | 16:57 |
|
neo43589367
| That uses git-http-backend. It would help for me to understand how git-http-backend works. I don't fully understand cgi | 16:58 |
| → jonosterman joined | 16:58 |
|
vesuvi88
| hi all! please, help! why some changes may not work after executing the git merge command? and how can I avoid this? | 16:59 |
|
imMute
| vesuvi88: what do you mean "some changes may not work" ?? | 17:00 |
|
vesuvi88
| some changes were not transferred to my branch | 17:04 |
|
imMute
| I've not heard of that happening... | 17:05 |
| ← vladoski left | 17:09 |
| ← drogas left | 17:11 |
| Techcable_ → Techcable | 17:12 |
| ← rgrinberg left | 17:12 |
| ← epolanski left | 17:17 |
| → Misotauros joined | 17:20 |
| → reallymemorable joined | 17:21 |
|
reallymemorable
| how do I force a merge? I want to overwrite my branch with the master | 17:21 |
|
| and anytime there is a conflict, just use the master version | 17:21 |
|
imMute
| if you want to throw away everything you did on your branch, you could do 'git reset --hard origin/master' | 17:22 |
|
reallymemorable
| ok | 17:22 |
| ← vesuvi88 left | 17:23 |
| ← bbju left | 17:23 |
| → mat001 joined | 17:28 |
| → bremner joined | 17:33 |
| ← mrcrypto left | 17:36 |
| ← natrys left | 17:41 |
|
anddam
| ikke: thanks | 17:44 |
|
| imMute: ^ | 17:44 |
|
| imMute: but that's a server hook (receive), I'll go with pre-commit | 17:45 |
|
imMute
| pre-commit would prevent people from comitting to local branches, which doesn't make sense. and they'd be able to remove the hook to bypass your restriction | 17:46 |
| ← ThorMojito left | 17:46 |
| ← neo43589367 left | 17:48 |
| ← rsx left | 17:51 |
| ← jonosterman left | 17:51 |
| ← ProperN[out] left | 17:53 |
| → jonosterman joined | 17:53 |
| → natrys joined | 17:54 |
| ← superbolide left | 17:55 |
| ← The_Blode left | 17:58 |
| → The_Blode joined | 18:03 |
| ← vysn left | 18:05 |
| ← bambanxx left | 18:06 |
| → john_johnk joined | 18:13 |
| ← bytehackr left | 18:14 |
| ← stenno left | 18:14 |
| → m0viefreak joined | 18:14 |
| → bambanxx joined | 18:19 |
| → dimi1947 joined | 18:22 |
| ← Vonter left | 18:24 |
| ← charly left | 18:28 |
| ← bambanxx left | 18:28 |
| ← alzgh left | 18:30 |
| fling → ciphersalad | 18:30 |
| → alzgh joined | 18:30 |
| ← barteks2x left | 18:31 |
| ← fercell left | 18:36 |
| ciphersalad → fling | 18:36 |
| ← furrymcgee left | 18:37 |
| → cvmn joined | 18:37 |
| → kenanmarasli joined | 18:41 |
| ← TomyWork left | 18:42 |
| ← jonosterman left | 18:42 |
| → orbyt joined | 18:42 |
| → jonosterman joined | 18:43 |
| → ThorMojito joined | 18:49 |
| ← w1bble left | 18:49 |
| → xx joined | 18:49 |
| → Guest27 joined | 18:50 |
| → hbautista_ joined | 18:51 |
| → w1bble joined | 18:51 |
| ← hbautista left | 18:52 |
| → mjbatty joined | 18:53 |
| → DoofusCanadensis joined | 18:53 |
| ← EvilDMP left | 18:53 |
| → redartist joined | 18:54 |
|
redartist
| check | 18:54 |
| ← Guest27 left | 18:55 |
| ← redartist left | 19:00 |
| ← spare left | 19:02 |
| → spare joined | 19:03 |
| ← dimi1947 left | 19:04 |
| → nvmd joined | 19:04 |
| ← ThorMojito left | 19:07 |
| → EvilDMP joined | 19:07 |
| ← alzgh left | 19:07 |
| ← hololeap left | 19:07 |
| → alzgh joined | 19:07 |
| → hololeap joined | 19:08 |
| ← igemnace left | 19:15 |
| → iffraff joined | 19:17 |
| → ThorMojito joined | 19:21 |
| ← tsujp left | 19:27 |
| ← meator left | 19:32 |
| ← jonosterman left | 19:32 |
| → ezzieyguywuf joined | 19:32 |
| → CarloWood joined | 19:33 |
|
ezzieyguywuf
| why would `git remote -v` return nothing? if I check .git/config I can see that I have a remote set up for the master branch | 19:33 |
| → jonosterman joined | 19:33 |
|
ezzieyguywuf
| ah, I guess the branch had a remote tracking repo but I hadn't set up the remote itself | 19:34 |
|
CarloWood
| Hello. I made quite a few changes and the 'git diff' became unpleasantly large. But the largest part is caused by renaming 'VulkanWindow' to 'SynchronousWindow'. Is there a way to have git diff ignore that change? | 19:34 |
|
ezzieyguywuf
| nvm | 19:34 |
|
| CarloWood: try `git diff --find-copies-harder` | 19:34 |
| ← ubique left | 19:34 |
| → ubique joined | 19:35 |
|
CarloWood
| It's not the filename that got changes - but the name of the class, all over the place. | 19:35 |
|
ezzieyguywuf
| ahh | 19:37 |
|
| just a sec, I'm pretty sure there's a way to do this | 19:37 |
| → lionkor joined | 19:37 |
|
ezzieyguywuf
| oh neat - I haven't used this option yet but `git diff -M` looks like what you want | 19:38 |
|
| hrm, actually that'll require the two names be somewhat similar | 19:38 |
| ← mjbatty left | 19:39 |
|
CarloWood
| -I<regex>, --ignore-matching-lines=<regex> comes close, but if the line has other changes I still want to see it. | 19:40 |
|
ezzieyguywuf
| CarloWood: looks like your best bet may be `git diff -I<regex>` where <regex> is something to match the lines you want to ignore | 19:40 |
|
| hrm | 19:40 |
|
| you know the real lesson here? | 19:41 |
|
| break up your commits into smaller units 😅 | 19:41 |
| ← cvmn left | 19:42 |
|
CarloWood
| I can use sed to toggle the renaming, guess I'll do that. | 19:42 |
|
ezzieyguywuf
| CarloWood: I was going to suggest the same | 19:43 |
| ← lightningwright left | 19:43 |
| → mfiano joined | 19:44 |
| ← EvilDMP left | 19:45 |
| ← mfiano left | 19:48 |
| → mfiano joined | 19:50 |
| ← vdamewood left | 19:53 |
| ← alzgh left | 19:55 |
| → bambanxx joined | 19:57 |
| → alzgh joined | 19:59 |
| ← wombawomba left | 20:01 |
| → BSaboia joined | 20:03 |
| → roadie joined | 20:08 |
| → lightyaer joined | 20:08 |
| ← spare left | 20:09 |
| → spare joined | 20:09 |
| → odoood joined | 20:09 |
| → fructose joined | 20:09 |
| → rgrinberg joined | 20:11 |
| → dtminus joined | 20:12 |
| → lightningwright joined | 20:14 |
| ← spare left | 20:16 |
| → spare joined | 20:16 |
| ← lightyaer left | 20:16 |
| ← rgrinberg left | 20:17 |
| → cvmn joined | 20:17 |
| → charly joined | 20:19 |
| ← jonosterman left | 20:22 |
| → jonosterman joined | 20:23 |
| ← dtminus left | 20:24 |
| → EvilDMP joined | 20:32 |
| → ZacSharp joined | 20:32 |
| → Yruama joined | 20:37 |
| ← hqdruxn08_ left | 20:44 |
| ← nyah left | 20:44 |
| → hqdruxn08_ joined | 20:45 |
| → nyah joined | 20:48 |
| ← bambanxx left | 20:52 |
| ← GNUmoon left | 20:54 |
| ← lionkor left | 20:59 |
| → lionkor joined | 21:00 |
| ← maxzor left | 21:00 |
| ← dermoth left | 21:06 |
| → rgrinberg joined | 21:07 |
| ← kenanmarasli left | 21:09 |
| → jazzy joined | 21:10 |
| ← jonosterman left | 21:11 |
| → jonosterman joined | 21:13 |
| → Codaraxis__ joined | 21:13 |
| ← ThorMojito left | 21:17 |
| ← Codaraxis_ left | 21:17 |
| → dermoth joined | 21:18 |
| → bambanxx joined | 21:20 |
| ← odoood left | 21:21 |
| → acidjnk_new joined | 21:21 |
| → wombawomba joined | 21:21 |
| → maxzor joined | 21:22 |
| ← wombawomba left | 21:26 |
| → ThorMojito joined | 21:27 |
| ← john_johnk left | 21:27 |
| → john_johnk joined | 21:27 |
| ← john_johnk left | 21:31 |
| ← ThorMojito left | 21:35 |
| ← roadie left | 21:38 |
| → roadie joined | 21:39 |
| → ThorMojito joined | 21:39 |
| ← ThorMojito left | 21:40 |
| → redoc9 joined | 21:41 |
| ← marw left | 21:41 |
| ← AbleBacon left | 21:43 |
| ← redoc left | 21:43 |
| redoc9 → redoc | 21:43 |
| ← jazzy left | 21:44 |
| ← roadie left | 21:44 |
| → jazzy joined | 21:44 |
| → GNUmoon joined | 21:47 |
| ← ubique left | 21:47 |
| → AbleBacon joined | 21:47 |
|
cbreak
| CarloWood: you could try a different diff visualization algorithm like --color-words | 21:52 |
| ← ZacSharp left | 21:52 |
|
cbreak
| but that'll have other effects of course, and potentially making everything harder to read | 21:52 |
| → ThorMojito joined | 21:52 |
|
cbreak
| --word-diff might be easier to process if you want to outright remove such changes | 21:53 |
|
| especially in --word-diff=porcelain mode | 21:53 |
| ← ThorMojito left | 21:55 |
| ← gh34 left | 21:58 |
| ← maxzor left | 21:59 |
| → ThorMojito joined | 22:00 |
| ← ThorMojito left | 22:03 |
| ← zulutango left | 22:08 |
| → roadie joined | 22:09 |
| → wombawomba joined | 22:11 |
| → maxzor joined | 22:11 |
| → zulutango joined | 22:11 |
| ← maxzor left | 22:14 |
| ← roadie left | 22:18 |
| → maxzor joined | 22:24 |
| ← maxzor left | 22:24 |
| → mikail joined | 22:24 |
| → mikail_ joined | 22:24 |
| ← mikail_ left | 22:24 |
| ← mikail left | 22:24 |
| → mikail joined | 22:25 |
| → ZacSharp joined | 22:29 |
| → maxzor joined | 22:37 |
| R2robot_ → R2robot | 22:38 |
| ← alzgh left | 22:40 |
| → alzgh joined | 22:41 |
| → roadie joined | 22:44 |
| ← FinnElija left | 22:45 |
| → FinnElija joined | 22:45 |
| ← maxzor left | 22:47 |
| ← nvmd left | 22:48 |
| → nvmd joined | 22:50 |
| ← EvilDMP left | 22:50 |
| → neoweb joined | 22:51 |
|
neoweb
| https://usercontent.irccloud-cdn.com/file/WtkCgBYj/image.png | 22:51 |
| ← jonosterman left | 22:51 |
|
neoweb
| i think i was typing the command in the wrong window heh | 22:52 |
|
rawtaz
| what command did you actually run? | 22:52 |
| ← lightningwright left | 22:52 |
|
rawtaz
| also, know that there's always `git reflog` which shows you some stuff that you could probably have used to fix whatever you did :) | 22:52 |
| ← m0viefreak left | 22:53 |
| → jonosterman joined | 22:54 |
| ← roadie left | 22:54 |
|
neoweb
| i am looking | 22:55 |
|
| git push origin production2021 -f | 22:57 |
|
| i cloned a repo | 22:58 |
|
jinsun
| famous last words :D | 22:58 |
|
neoweb
| switch branches | 22:58 |
|
rawtaz
| so, the first thing i'd like to tell you is that you should be picky about where you place the arguments. the format if you check `git help push` isnt to put the flag -f at the end. one day not being proper with syntax will bite you in the ass | 22:58 |
|
neoweb
| but when i switched branches...and I think I forgot this, I need to pull... | 22:58 |
|
| the entire action i was doing, was trying to delete one file from a git repo, and it was giving me trouble, so I thought the error message was complaining about that | 22:59 |
|
| thanks rawtaz | 22:59 |
|
rawtaz
| you switched to that production2021 branch i take it? so you were locally on that? | 23:00 |
|
| neoweb: dont worry about having hit the fan, shit happens. at least you managed to correct it in the end, as i understand it? | 23:01 |
|
| now you know about reflog so you can check that and foremost you can ask here as well if you get stuck sometime again :) | 23:01 |
|
neoweb
| well i did but it might be nice to know how to go back | 23:03 |
|
| i think this is the folder i was in when i pushed | 23:03 |
|
| https://usercontent.irccloud-cdn.com/file/A4uLgdnT/image.png | 23:03 |
| ← pizdets left | 23:03 |
| → pizdets_ joined | 23:03 |
|
rawtaz
| is that from you now trying to reproduce the problem? | 23:04 |
|
neoweb
| no i entered the dir | 23:04 |
|
rawtaz
| looks like you cloned, switched branch, committed a file deletion | 23:05 |
|
neoweb
| and just rand that command | 23:05 |
| ← bindu left | 23:05 |
|
neoweb
| right, but for some reason when I clone, and switch to the branch | 23:05 |
|
| it is not the latest commit heh | 23:05 |
| ← dermoth left | 23:05 |
| → bindu joined | 23:05 |
|
neoweb
| iirc dont i have to tell git to pull branch updates or something too | 23:05 |
|
rawtaz
| let me sum it up | 23:06 |
| ← cvmn left | 23:06 |
|
neoweb
| git clone, git branch mybranch - and the code is 1 year old heh | 23:06 |
| ← mfiano left | 23:06 |
| ← Thomas25 left | 23:06 |
|
rawtaz
| if on that branch after you added the commit, you push to origin, then git will try to send that new commit to the origin. if the origin hasnt changed at all since you cloned the repo, it should be successful. but if the origin branch hasnt got the same commit history as your local clone anymore, then the push will probably fail | 23:07 |
| → Thomas25 joined | 23:07 |
|
neoweb
| right | 23:08 |
|
| but how do i ask git to pull the latest commits from the branch | 23:08 |
| ← bambanxx left | 23:08 |
|
neoweb
| i am pulling a branch, but it is giving me from when I first branched it | 23:08 |
|
rawtaz
| if you do want to update that local branch of yours to have what is in the remote, you can do `git fetch origin` and then `git merge --ff-only origin/production2021` to make git fast-forward the commit history on your local branch to where it is on the origin production2021 branch | 23:08 |
|
neoweb
| check out | 23:08 |
|
| due | 23:08 |
|
| dammit | 23:08 |
|
rawtaz
| you do that with fetch and then merge | 23:08 |
|
neoweb
| i created a new branch locally i think instead of cehcking out | 23:08 |
|
| dammit | 23:08 |
|
rawtaz
| some people use pull which is those two in one go, but i recommend against that because it's more magic and you get less control if you dont know what youre doing. | 23:09 |
|
| oh ok | 23:09 |
|
neoweb
| dude | 23:09 |
|
| dammit | 23:09 |
|
| that is what i was doing heh | 23:09 |
|
rawtaz
| im not sure i agree, if you used checkout then you *switch* to a branch dont you? assuming you dont do checkout -b | 23:10 |
| → dermoth joined | 23:10 |
|
neoweb
| no i was not checking out the branch | 23:10 |
|
rawtaz
| then what did you do, what command did you run? | 23:10 |
|
neoweb
| i thought i was switching to the branch when i typed in git branch branchname | 23:10 |
|
rawtaz
| oh ok, got it | 23:10 |
|
neoweb
| so i was cloning, git branch | 23:10 |
|
| and missed the git checkout branch | 23:10 |
|
rawtaz
| if oyu did that on master then your new branch there should have gotten the commit that master was on as the tip of it | 23:11 |
|
neoweb
| what is wrong with git pull | 23:11 |
|
| ahh ic | 23:12 |
|
| man, that is so crazy, i guess i get the power of the force command now, but damn did I never think since the way git tracks changes through additions, that I would be able to erase stuff so easily | 23:13 |
|
rawtaz
| now you know. i mean when you force you're telling git to completely ignore whatever is on the other end and just overwrite it | 23:14 |
|
neoweb
| yeh | 23:14 |
|
rawtaz
| why else would you need to use force? | 23:14 |
|
neoweb
| right | 23:14 |
|
rawtaz
| as in, what use case did you have in mind for it? | 23:14 |
| ← mikail left | 23:14 |
|
neoweb
| i figured i needed it. i am trying to delete this one file, and not matter what I did it would not go away (but I think that was because I was not checking out, and switching branches), and i thought I needed to force to delete the history of the file or somethinig | 23:15 |
|
rawtaz
| ok :D | 23:15 |
|
| but just to make sure, you now have the stuff restored etc, you dont have a data loss? | 23:15 |
|
neoweb
| nope, but if I did not have the code on a copy of a testing device I would have lost everything heh | 23:16 |
|
| i guess it is time to link in some git backup stuff | 23:16 |
|
| i mean, i commited master over production2021 and I think master was 3 years old | 23:17 |
|
| so crazy heh | 23:17 |
|
ZacSharp
| and the repo you pushed to has no reflog you could use? | 23:17 |
|
rawtaz
| i wonder... is there any "reflog" on the remote site? does anyone know? | 23:17 |
|
| if there is, how do you access it (E.g. if that remote is on github or something like that)? | 23:17 |
|
neoweb
| i can check | 23:17 |
|
| i renamed the branch i pushed to to production2021-bad | 23:18 |
|
| let me check it out and run reflog | 23:18 |
|
DoofusCanadensis
| reflog is available on my server , but I had to enable it explicitly | 23:18 |
|
neoweb
| https://usercontent.irccloud-cdn.com/file/FEcc8jfq/image.png | 23:19 |
| ← nvmd left | 23:19 |
|
neoweb
| so i do not know how to read this list. i guess ccaadcc is the actual commit? | 23:19 |
| → roadie joined | 23:20 |
| ← dermoth left | 23:20 |
|
neoweb
| it looks like f50429b was the branch i created a month ago heh | 23:20 |
|
ZacSharp
| it is the list of commits head pointed to in the last few days (in your case everything since you cloned the repo) | 23:20 |
|
| did you clone the repo in the screenshot just now or is it the one you pushed from? | 23:21 |
|
neoweb
| i just did a checkout on f50429b and it looks like my last change was there | 23:22 |
|
| this one i just cloned | 23:22 |
|
| ZacSharp: | 23:23 |
|
ZacSharp
| the reflog is per repo, what you need is the remote reflog on github (which doesn't seem to exist) | 23:23 |
|
| however it seems like you can use githubs event api to find the old commit | 23:24 |
| → dermoth joined | 23:24 |
| → Codaraxis_ joined | 23:24 |
|
neoweb
| so i erased the ref log basically | 23:24 |
|
| reflog | 23:24 |
|
ZacSharp
| no | 23:24 |
|
neoweb
| but checkout of f50429b has the code that i erased | 23:25 |
|
| but the git log is non existant heh | 23:25 |
|
mackerman
| More like github doesn't expose the reflog like a git server you can log into | 23:25 |
|
ZacSharp
| effectively the same thing | 23:25 |
|
| but yes, they at least keep something similar | 23:25 |
| → jkordani joined | 23:27 |
|
neoweb
| yup | 23:27 |
|
| i just created a new branch from f50429b and compared it to the one I manually recovered, and they are exactly the same | 23:27 |
|
ZacSharp
| what about the history? | 23:28 |
| ← Codaraxis__ left | 23:28 |
|
neoweb
| nope, all the history is gone | 23:29 |
|
| https://usercontent.irccloud-cdn.com/file/bLuuGZBT/image.png | 23:29 |
| ← roadie left | 23:29 |
|
neoweb
| it has some of the mistakes i made heh | 23:29 |
|
| https://usercontent.irccloud-cdn.com/file/X6kTBlr4/image.png | 23:29 |
|
| so crazy heh | 23:31 |
|
| so i guess i erased the log | 23:31 |
|
| what is the diff between log, and reflog | 23:31 |
|
ZacSharp
| no you did not | 23:31 |
|
| git log shows the commit history leading to a specific commit | 23:31 |
|
| git reflog shows the latest few commits a reference pointed to | 23:32 |
|
rawtaz
| neoweb: please slow down a bit and also do read some of the documentation. it will be beneficial for you in the long run | 23:33 |
|
ZacSharp
| this tool should be capable of formatting the github api answer in a readable format https://github.com/criswell/github-reflog | 23:33 |
|
| haven't tried it though | 23:33 |
| → Xenguy joined | 23:34 |
|
neoweb
| thanks | 23:38 |
|
| have a good night folks | 23:38 |
| ← rgrinberg left | 23:38 |
|
rawtaz
| nite! | 23:38 |
| ← Yruama left | 23:41 |
| ← palasso left | 23:42 |
| ← jonosterman left | 23:42 |
| ← The_Jag left | 23:42 |
| → jonosterman joined | 23:43 |
| ← orbyt left | 23:46 |
| → vysn joined | 23:47 |
| ← xayto left | 23:48 |
| ← ZacSharp left | 23:49 |
| → igemnace joined | 23:49 |
| → xayto joined | 23:51 |
| ← reallymemorable left | 23:54 |
| ← zer0bitz left | 23:56 |
