| 2024-06-11 |
| → Left_Turn joined | 00:03 |
| ← Left_Turn left | 00:04 |
| ← makara1 left | 00:06 |
| → makara1 joined | 00:07 |
| ← chandash left | 00:09 |
| → Lord_of_Life_ joined | 00:10 |
| ← Lord_of_Life left | 00:11 |
| Lord_of_Life_ → Lord_of_Life | 00:12 |
| ← arch-angel left | 00:16 |
| ← jenia2 left | 00:16 |
| ← printfdebugging left | 00:16 |
| ← guru_ left | 00:18 |
| → Rodney_ joined | 00:19 |
| ← vadparaszt left | 00:23 |
| ← bloody left | 00:24 |
| → chandash joined | 00:25 |
| ← ZMarkGC left | 00:27 |
| ← cpackham left | 00:30 |
| → cpackham joined | 00:31 |
| → junyx joined | 00:49 |
| → ZMarkGC joined | 00:49 |
| → printfdebugging joined | 00:54 |
| ← printfdebugging left | 00:54 |
| → printfdebugging joined | 00:54 |
| ← haxalot left | 01:10 |
| → memset joined | 01:11 |
| → antranigv_ joined | 01:13 |
| ← antranigv left | 01:13 |
| ← de-facto left | 01:14 |
| ← fo9 left | 01:18 |
| → gsi_ joined | 01:21 |
| ← chandash left | 01:22 |
| ← gsi left | 01:23 |
| ← YuGiOhJCJ left | 01:24 |
| ← donofrio left | 01:24 |
| ← Rodney_ left | 01:28 |
| → wys joined | 01:35 |
| → vadparaszt joined | 01:38 |
| → TheCaptain8982 joined | 01:43 |
| ← TheCaptain898 left | 01:45 |
| TheCaptain8982 → TheCaptain898 | 01:45 |
| → chandash joined | 01:47 |
| → Gary_Sinise joined | 01:57 |
| ← navi left | 02:00 |
| → printfdebugging1 joined | 02:04 |
| ← rigid left | 02:04 |
| → rigid joined | 02:05 |
| ← vadparaszt left | 02:06 |
| → vadparaszt joined | 02:07 |
| ← lostbeard left | 02:13 |
| → lostbeard joined | 02:17 |
| → SoniEx2 joined | 02:24 |
| SoniEx2 → Soni | 02:28 |
| ← vadparaszt left | 02:34 |
| → pedahzur joined | 02:36 |
| ← Gary_Sinise left | 02:37 |
| → Guru_DE joined | 02:38 |
| → vadparaszt joined | 02:39 |
| ← printfdebugging1 left | 02:52 |
| ← gast0n left | 02:54 |
|
aB9X
| is there a better and/or somewhat standard/conventional way to bring a set of git config for a particular repo when it's cloned? currently i just have a README to copy paste the `git config` commands. maybe a ./.git-init.sh script in the root of the folder or a /.gitconfig to copy to ./.git/config | 02:59 |
| → fo9 joined | 03:00 |
| ← fo9 left | 03:06 |
| → de-facto joined | 03:07 |
|
b0nn
| ou can have a .gitconfig in a project directory that is specific for that directory, the issue is tracking it | 03:09 |
| ← LiENUX left | 03:10 |
| → LiENUS joined | 03:10 |
|
b0nn
| most people ignore their .gitconfig to prevent it being updated, which also means it's not included in the clone | 03:10 |
| → luna_ joined | 03:11 |
| ← de-facto left | 03:12 |
| → wuyuansheng joined | 03:13 |
| ← wuyuansheng left | 03:13 |
| ← wys left | 03:16 |
| → Gary_Sinise joined | 03:16 |
| ← luna_ left | 03:20 |
| → de-facto joined | 03:25 |
| → donofrio joined | 03:31 |
| ← dlh404 left | 03:33 |
| → very_sneaky joined | 03:37 |
| → jenia2 joined | 03:38 |
| → wys joined | 03:40 |
| → dsrt^ joined | 03:46 |
| ← fflam left | 03:46 |
| → fflam joined | 03:49 |
| ← stagas left | 03:52 |
| → stagas joined | 03:54 |
| ← travisghansen left | 04:00 |
| → travisghansen joined | 04:01 |
| → fo9 joined | 04:03 |
| ← stagas left | 04:04 |
| → danse-nr3 joined | 04:04 |
| → thiago joined | 04:06 |
| → hbautista joined | 04:06 |
| ← fo9 left | 04:07 |
| → YuGiOhJCJ joined | 04:19 |
| ← thiago left | 04:19 |
| ← hdh left | 04:20 |
| → thiago joined | 04:20 |
| ← Ishmael left | 04:26 |
| → jmd joined | 04:26 |
| → Ishmael joined | 04:27 |
| ← junyx left | 04:33 |
| ← danse-nr3 left | 04:36 |
| → danse-nr3 joined | 04:37 |
| ← bindu left | 04:38 |
|
aB9X
| i want to pull from upstream, push to own repo by default (git push/git pull without args). correct me if i'm wrong, but `git remote set-url` controls *both* fetch/push so is not suitable, and only `git config remote.pushDefault = myrepo` would work with the remote still being upstream for fetching? why is there no `fetchDefault` equivalent? | 04:39 |
| ← lemuria left | 04:39 |
| → lemuria joined | 04:39 |
| ← lemuria left | 04:39 |
| → lemuria joined | 04:41 |
| ← lemuria left | 04:41 |
| → lemuria joined | 04:42 |
| ← Gary_Sinise left | 04:44 |
|
grawity
| likely because fetch is the least relevant part of the pull operation; IIRC the pull default is controlled by branch upstream (git branch -u; branch.*.{remote,merge}; merge.defaultToUpstream) | 04:46 |
|
osse
| aB9X: pushDefault overrides *which* remote should be pushed to and overrides the 'remote' config option. That is different from configuring the url for a particular remote | 04:47 |
| ← newpy left | 04:48 |
| ← chandash left | 04:50 |
| → bindu joined | 04:56 |
| ← bindu left | 04:57 |
| → bindu joined | 04:58 |
| ← aristaware443921 left | 04:58 |
| → aristaware443921 joined | 05:00 |
| ← Masklin left | 05:04 |
| → pebble joined | 05:07 |
| ← ChmEarl left | 05:09 |
| ← hbautista left | 05:14 |
| ← R2robot left | 05:16 |
| → R2robot joined | 05:20 |
| → hritik joined | 05:24 |
| → Guest24 joined | 05:25 |
| ← thiago left | 05:27 |
| → stagas joined | 05:29 |
| Guest24 → help | 05:31 |
| help → Clangbeard | 05:31 |
| ← jiffe3 left | 05:37 |
| → jiffe3 joined | 05:39 |
| ← cpackham left | 05:40 |
| → Ox7C5_ joined | 05:41 |
| ← Betal left | 05:41 |
| ← Clangbeard left | 05:45 |
| → Guest24 joined | 05:45 |
| ← Guest24 left | 05:46 |
| → duxsco joined | 05:53 |
| ← jenia2 left | 05:55 |
| ← skapata left | 05:58 |
| ← zulutango left | 06:00 |
| ← Thanzex0 left | 06:04 |
| ← jmd left | 06:06 |
| → peirik_ joined | 06:06 |
| → Thanzex0 joined | 06:07 |
| antranigv_ → antranigv | 06:09 |
| → zulutango joined | 06:13 |
| ← hritik left | 06:14 |
| → ccreate joined | 06:17 |
| ← danse-nr3 left | 06:21 |
| → printfdebugging1 joined | 06:24 |
| → hritik joined | 06:31 |
| ← aB9X left | 06:34 |
| ← Ox7C5_ left | 06:37 |
| ← peirik_ left | 06:43 |
| → MGF_Fabio joined | 06:44 |
| ← hritik left | 06:50 |
| ← printfdebugging1 left | 06:51 |
| → printfdebugging1 joined | 06:52 |
| → gandhibobandhi joined | 06:56 |
| antranigv → antranigv_ | 06:57 |
| → rfuentess joined | 06:58 |
| antranigv_ → antranigv | 06:58 |
| → peirik_ joined | 06:59 |
| → danse-nr3 joined | 07:00 |
| → AnrDaemon joined | 07:03 |
| ← danse-nr3 left | 07:05 |
| → danse-nr3 joined | 07:06 |
| antranigv → antranigv_ | 07:06 |
| ← ccreate left | 07:09 |
| antranigv_ → antranigv | 07:09 |
| antranigv → antranigv_ | 07:13 |
| antranigv_ → antranigv | 07:17 |
| ← gandhibobandhi left | 07:17 |
| → gandhibobandhi joined | 07:17 |
| ← darkAffinity left | 07:18 |
| antranigv → antranigv_ | 07:19 |
| → konsolebox joined | 07:24 |
| → epicout joined | 07:29 |
| ← epicout left | 07:29 |
| → epicout joined | 07:29 |
| → bluesmonk joined | 07:31 |
| ← danse-nr3 left | 07:34 |
| ← makara left | 07:34 |
| ← another| left | 07:34 |
| ← leftyfb left | 07:34 |
| ← ljharb left | 07:34 |
| ← krushia left | 07:34 |
| ← crabbedhaloablut left | 07:34 |
| ← osse left | 07:34 |
| ← wizadmin left | 07:34 |
| ← lag left | 07:34 |
| ← jmjl left | 07:34 |
| ← DreamweaverN left | 07:34 |
| ← fossdd left | 07:34 |
| ← drocan left | 07:34 |
| ← davidsenk left | 07:34 |
| ← haritz left | 07:34 |
| ← juergh left | 07:34 |
| ← Ingvix left | 07:34 |
| ← toralf left | 07:34 |
| ← celphi left | 07:34 |
| ← keypusher left | 07:34 |
| ← germ left | 07:34 |
| ← NightMonkey left | 07:34 |
| ← berkay left | 07:34 |
| ← Wolf480pl left | 07:34 |
| ← flowji left | 07:34 |
| ← kjetilho left | 07:34 |
| ← Mmike_ left | 07:34 |
| ← selckin left | 07:34 |
| ← YoungFrog left | 07:34 |
| ← b0nn left | 07:34 |
| ← ephemera_ left | 07:34 |
| ← LadyLioness left | 07:34 |
| → b0nn joined | 07:35 |
| → haritz joined | 07:35 |
| → DreamweaverN joined | 07:35 |
| → leftyfb joined | 07:35 |
| ← haritz left | 07:35 |
| → haritz joined | 07:35 |
| → celphi joined | 07:35 |
| → ljharb joined | 07:35 |
| → Mmike_ joined | 07:35 |
| → ephemera_ joined | 07:35 |
| → keypusher joined | 07:35 |
| → crabbedhaloablut joined | 07:35 |
| → toralf joined | 07:35 |
| → selckin joined | 07:35 |
| → fossdd_ joined | 07:35 |
| → flowji joined | 07:35 |
| → LadyLioness joined | 07:35 |
| → drocan joined | 07:35 |
| → makara joined | 07:35 |
| → YoungFrog joined | 07:35 |
| → another| joined | 07:35 |
| → kjetilho joined | 07:35 |
| → NightMonkey joined | 07:35 |
| → Ingvix joined | 07:35 |
| → wizadmin joined | 07:35 |
| → osse joined | 07:35 |
| → jmjl joined | 07:35 |
| → juergh joined | 07:35 |
| → berkay joined | 07:35 |
| → germ joined | 07:36 |
| → lag joined | 07:36 |
| → Wolf480pl joined | 07:37 |
| → davispuh joined | 07:37 |
| → danse-nr3 joined | 07:38 |
| ← duckworld left | 07:38 |
| → krushia joined | 07:38 |
| → davidsenk joined | 07:39 |
| → duckworld joined | 07:39 |
| antranigv_ → antranigv | 07:41 |
| ← lachesis left | 07:41 |
| → derpydoo joined | 07:42 |
| ← pedahzur left | 07:42 |
| ← samuelbernardo left | 07:43 |
| ← YuGiOhJCJ left | 07:44 |
| → lachesis joined | 07:44 |
| → becm joined | 07:46 |
| ← TomyLobo left | 07:47 |
| ← printfdebugging1 left | 07:50 |
| ← sgm left | 07:51 |
| ← gildasio left | 07:51 |
| → fdan joined | 07:51 |
| → gildasio joined | 07:53 |
| → sgm joined | 07:53 |
| antranigv → antranigv_ | 07:57 |
| antranigv_ → antranigv | 07:57 |
| antranigv → antranigv_ | 07:57 |
| → TomyWork joined | 07:57 |
| antranigv_ → antranigv | 07:59 |
| → AnpMoot joined | 08:01 |
| → JohnMao joined | 08:05 |
|
AnrDaemon
| Greetings. I'm writing some scripts and I'd like to make Git more performant in a specific case. I'm running through a list of directories and checking if these are Git dirs or not by running smth like `find … -execdir git -C '{}' rev-parse --is-inside-git-dir \;` | 08:08 |
|
| What I'd like is to stop it trying to do the repository discovery up the directory tree. | 08:09 |
|
| And just tell me if the dir is a repo or not. | 08:10 |
|
osse
| you can fiddle with GIT_CEILING_DIRECTORIES, or set GIT_DIR/use --git-dir | 08:11 |
|
| you already use -C, so switch that out with --git-dir (and --work-tree perhaps) | 08:14 |
|
| Using --git-dir disables the upward discovery. -C doesn't | 08:15 |
|
AnrDaemon
| What happens if it is NOT a git repo? (I.e. a parent directory.) | 08:16 |
|
| Although… I can search for objects or refs direcotry and omit -C althogether. | 08:18 |
|
| Does that sound plausible? | 08:18 |
|
osse
| AnrDaemon: if it's not a git repo then git rev-parse will fail | 08:20 |
|
| note that git rev-parse --is-this-and-that prints true/false to answer the question, and fails with an exit code if it can't answer it | 08:20 |
| → Left_Turn joined | 08:21 |
|
osse
| (usually if it can't answer that means the answer is false, but still) | 08:21 |
|
AnrDaemon
| Oh-ho-ho. I see what you mean. | 08:22 |
|
| git rev-parse --is-inside-git-dir looking for being inside actual .git dir, not inside a repo. It discovers repository and if inside repo, but not inside git dir, it prints false. | 08:22 |
|
osse
| indeed | 08:23 |
|
| but there's a --is-inside-work-tree | 08:23 |
|
| or something like that | 08:23 |
|
AnrDaemon
| That said, my idea of looking for objects/ sounds better. Since I need the .git dir (or bare repo, in this specific case). | 08:23 |
|
osse
| and if that is true you can consider find's -prune to avoid descending into dirs you already know are in a repo | 08:24 |
|
| (maybe that's the reason for the slowness in the first plce) | 08:24 |
|
selckin
| seems unlikely anything but the process forking is the bottleneck | 08:25 |
|
osse
| agreed. but -prune might avoid a lot of forks | 08:25 |
| ← JohnMao left | 08:26 |
| ← antranigv left | 08:27 |
| ← chiselfuse left | 08:28 |
|
AnrDaemon
| Success. | 08:28 |
| → chiselfuse joined | 08:28 |
|
AnrDaemon
| If only I could tell git to report with exit code only, that would be even better. | 08:29 |
|
osse
| Even better: If you could tell git to report with exit code only and I get a million dollars | 08:33 |
|
AnrDaemon
| Yes. A million dollars would be wonderful. | 08:34 |
|
| I would not need a toilet paper for a long time. | 08:34 |
|
osse
| Can you show the find command? | 08:37 |
| Ocupado → pausadd | 08:41 |
|
AnrDaemon
| osse: https://github.com/AnrDaemon/samba4-ads/blob/master/home/git/git-shell-commands/list | 08:43 |
|
osse
| can make it sliightly faster by just doing 'head -1 ./description' at the end | 08:45 |
| ← fdan left | 08:46 |
| ← memset left | 09:01 |
|
lag
| Does anyone know why adding `[core] abbrev = 12` to my .gitconfig makes Git seg fault? | 09:01 |
|
selckin
| a bug | 09:01 |
|
lag
| No kiddin' :) | 09:01 |
|
| Are you sure it's not a feature? | 09:01 |
|
selckin
| can't be sure with the kids these days | 09:02 |
|
osse
| It wouldn't surpise me that somewhere it's assumed that the abbrev is 7-8 | 09:02 |
|
lag
| True, true! | 09:02 |
|
selckin
| enable core dumps, get backtrace with gdb? | 09:02 |
|
lag
| I have a core dump - bear with | 09:02 |
| ← MGF_Fabio left | 09:05 |
|
lag
| https://pastebin.com/uWAdy83S | 09:07 |
|
| Probably cocking something up | 09:07 |
|
selckin
| apt install git-dbgsym | 09:08 |
|
geirha
| AnrDaemon: with -maxdepth 2 there's not that much point in using find, you could just use a shell loop; for dir in */objects/ ; do | 09:11 |
|
| and depth 1 has just one possibility objects/ which you can include in the loop or check separately | 09:11 |
|
AnrDaemon
| It is current restrictions. But I'm considering lifting them. | 09:11 |
|
| osse: If ./description does not end in EOL, it will screw the results. | 09:12 |
| → memset joined | 09:13 |
|
geirha
| IFS= read -r desc < description ; printf "%s\n" "$desc" | 09:13 |
|
AnrDaemon
| head -1 | 09:14 |
|
selckin
| AnrDaemon: its a "useless use of cat" which is popular meme, head can read from files, don't need cat | 09:14 |
|
lag
| https://pastebin.com/bBATPgYZ | 09:14 |
|
geirha
| if you must use head, use -n 1 rather than the obsolete -1 | 09:14 |
|
AnrDaemon
| geirha: Noted. | 09:15 |
|
osse
| AnrDaemon: ah, missed the - in the cat command | 09:15 |
|
AnrDaemon
| And head can't catenate multiple inputs. Especially not with STDIN. | 09:16 |
|
| I could have used some convoluted sed, but… convoluted. | 09:18 |
|
lag
| selckin: the_hash_algo == NULL? | 09:19 |
| → ElKowar joined | 09:22 |
| ← Albright left | 09:23 |
| ← JTL left | 09:23 |
| → TheCaptain8985 joined | 09:23 |
| → Albright joined | 09:24 |
| → siak joined | 09:25 |
|
selckin
| found GIT_TEST_DEFAULT_HASH_ALGO=sha1 in the code, does it work then? what version of git? | 09:25 |
| ← TheCaptain898 left | 09:25 |
| TheCaptain8985 → TheCaptain898 | 09:25 |
| → peirik___ joined | 09:26 |
| ← pebble left | 09:27 |
| ← peirik___ left | 09:28 |
| → JTL joined | 09:28 |
| → peirik___ joined | 09:29 |
| ← peirik left | 09:30 |
| ← fundatillus left | 09:30 |
| → fundatillus joined | 09:31 |
| ← epicout left | 09:31 |
|
lag
| selckin: git version 2.45.2.505 | 09:31 |
|
selckin
| thats all i know how todo , can mail the git mailing list or post to debian bug tracker with the backtrace | 09:32 |
| → fo9 joined | 09:35 |
| → falafel joined | 09:37 |
| → dermoth_ joined | 09:42 |
| ← dermoth left | 09:43 |
| ← peirik_ left | 09:44 |
| dermoth_ → dermoth | 09:47 |
| → KnoP joined | 09:50 |
| → gandhibobandhi_ joined | 09:52 |
| ← gandhibobandhi left | 09:55 |
| → hritik joined | 09:57 |
| ← hritik left | 09:57 |
| → hritik joined | 09:57 |
| → Masklin__Gurder joined | 10:05 |
| pausadd → Ocupado | 10:06 |
| Masklin__Gurder → Masklin | 10:07 |
| ← donofrio left | 10:14 |
| ← bindu left | 10:14 |
| → pebble joined | 10:16 |
| ← pebble left | 10:16 |
| → bindu joined | 10:16 |
| → GuestZero_ joined | 10:20 |
| ← GuestZero left | 10:23 |
| ← peirik___ left | 10:28 |
| → peirik joined | 10:29 |
| ← peirik left | 10:30 |
| ← ikke left | 10:30 |
| → ikke joined | 10:30 |
| → peirik joined | 10:30 |
| ← yuljk left | 10:32 |
| → yuljk joined | 10:32 |
| ← Thanzex0 left | 10:33 |
| → Thanzex0 joined | 10:34 |
| → peirik_ joined | 10:35 |
| → wootehfoot joined | 10:36 |
| Ocupado → pausadd | 10:36 |
| ← falafel left | 10:40 |
| → donofrio joined | 10:47 |
| ← derpydoo left | 10:56 |
| ← thelounge689748 left | 11:00 |
| → thelounge689748 joined | 11:00 |
| ← danse-nr3 left | 11:04 |
| → danse-nr3 joined | 11:05 |
| → savolla joined | 11:15 |
| → dlh404 joined | 11:15 |
| ← becm left | 11:19 |
| ← hritik left | 11:19 |
| → petaflot joined | 11:24 |
| ← fo9 left | 11:24 |
|
petaflot
| hello! I'm having an issue with rebasing/merging ; I guess the best explanation is with this very simple example http://lutolf.vserver.nimag.net/files/test.tgz ; help would be really appreciated | 11:28 |
| ← ikke left | 11:29 |
| → ikke joined | 11:29 |
| → powftw joined | 11:31 |
| ← ikke left | 11:33 |
|
osse
| I don't think there is a way to do that | 11:33 |
| → ikke joined | 11:33 |
|
osse
| "third" and "4th" are just as much a part of the conflict | 11:33 |
|
petaflot
| oh crap | 11:34 |
|
| thanks | 11:34 |
| → navi joined | 11:35 |
|
petaflot
| for some reason it feels so natural to me to want this | 11:36 |
|
osse
| petaflot: you might like merge.conflictStyle diff3 which interleaves the common ancestor content as well | 11:36 |
|
| hmm, maybe that just makes this particular case worse | 11:37 |
| ← lemuria left | 11:38 |
| → lemuria joined | 11:38 |
| → fonini joined | 11:39 |
| ← thuna` left | 11:42 |
| ← dsimic left | 11:45 |
| → dsimic joined | 11:46 |
| ← peirik_ left | 11:55 |
|
AnrDaemon
| :) Conflicts are like that, sometimes. | 11:56 |
| → becm joined | 11:58 |
| → jenia2 joined | 11:59 |
| → bloody joined | 12:01 |
| → hritik joined | 12:02 |
| ← siak left | 12:03 |
| ← danse-nr3 left | 12:04 |
| ← hritik left | 12:07 |
| ← ljharb left | 12:10 |
| → ljharb joined | 12:10 |
| ← tirnanog left | 12:14 |
| ← gildasio left | 12:16 |
| → gildasio joined | 12:17 |
| → hritik joined | 12:24 |
| → tirnanog joined | 12:26 |
| ← tirnanog left | 12:30 |
| → Turn_Left joined | 12:50 |
| → ghormoon joined | 12:53 |
| ← Left_Turn left | 12:53 |
| → z0e joined | 12:55 |
| ← savolla left | 12:56 |
| ← wys left | 12:57 |
| → danse-nr3 joined | 13:07 |
| ← danse-nr3 left | 13:08 |
| → danse-nr3 joined | 13:08 |
| ← jfsimon1981 left | 13:08 |
| → jfsimon1981 joined | 13:09 |
| ← jiffe3 left | 13:09 |
| → jiffe3 joined | 13:10 |
| → thiago joined | 13:13 |
| pausadd → Ocupado | 13:17 |
| ← thiago left | 13:18 |
| → thiago joined | 13:23 |
| → jokoon joined | 13:26 |
| ← hritik left | 13:26 |
| → junyx joined | 13:28 |
| → hritik joined | 13:31 |
| → wys joined | 13:31 |
| → LoCrealloc joined | 13:37 |
| ← rfuentess left | 13:39 |
| → bn_work joined | 13:45 |
| ← hritik left | 13:46 |
| → hritik joined | 13:46 |
| → rfuentess joined | 13:46 |
| ← wys left | 13:46 |
| ← rustyshackleford left | 13:52 |
| ← AnpMoot left | 13:52 |
| → belsirk joined | 13:53 |
| ← jenia2 left | 13:54 |
| ← rfuentess left | 13:56 |
| → jensen joined | 14:00 |
| ← powftw left | 14:01 |
| ← LoCrealloc left | 14:01 |
| ← redbool left | 14:03 |
| → redbool joined | 14:03 |
| → celmor joined | 14:05 |
| ← thiago left | 14:06 |
| → thiago joined | 14:08 |
| → zetef joined | 14:09 |
| ← hritik left | 14:15 |
| → rustyshackleford joined | 14:16 |
| → LoCrealloc joined | 14:17 |
| → hritik joined | 14:18 |
| ← jokoon left | 14:20 |
| jensen → a548 | 14:20 |
| ← zer0bitz left | 14:20 |
| → zer0bitz joined | 14:23 |
| ← LoCrealloc left | 14:23 |
| → GuestZero joined | 14:24 |
| → hbautista joined | 14:24 |
| → peirik_ joined | 14:24 |
| ← GuestZero_ left | 14:24 |
| ← peirik_ left | 14:25 |
| → peirik_ joined | 14:25 |
| → rendar joined | 14:27 |
|
rendar
| what is the best way to completely erase a file from my entire repo, also old commits? | 14:27 |
| ← peirik left | 14:28 |
|
ikke
| !filter-repo | 14:28 |
|
gitinfo
| A third-party git add-on that can quickly rewrite git history. See https://github.com/newren/git-filter-repo. | 14:28 |
| ← zer0bitz left | 14:29 |
|
a548
| do you generally need to be fully aware that a project has a merge vs. rebase workflow and would it be a bad idea for projects that do rebasing to set git pull to --rebase instead of the default merge (i.e. it's better to always be explicit and pass --rebase to git pull)? what other typical commands have rebase-related arguments/commands besides git pull and git rebase? | 14:30 |
| ← gnoo left | 14:31 |
| ← hritik left | 14:35 |
| → hritik joined | 14:35 |
| → ccreate joined | 14:37 |
|
rendar
| and what about some string `WordIWantToErase` from every sources present and past of my git repo? is that possible to do? | 14:38 |
|
kjetilho
| no. just change your password. | 14:39 |
|
rendar
| huh? | 14:39 |
|
| i don't have to change a password | 14:39 |
| → zer0bitz joined | 14:42 |
| ← ccreate left | 14:46 |
|
kjetilho
| hehe. just guessing why you want to remove a specific word from history. | 14:51 |
|
selckin
| also filter repo https://github.com/newren/git-filter-repo/blob/main/Documentation/converting-from-bfg-repo-cleaner.md#removing-sensitive-content | 14:53 |
| ← Thanzex0 left | 14:53 |
| → savolla joined | 14:54 |
| ← memset left | 14:54 |
| → Lights joined | 14:55 |
|
Lights
| Hey! | 14:55 |
| ← savolla left | 14:57 |
| ← APic left | 14:57 |
|
Lights
| There's a code that does the following: `git status; { git fetch || git clone 'https://someremote' .; } && git pull;`. Is the latter redundant? Should it be `git status; { git fetch || git clone 'https://someremote' .; } && git merge;` instead? | 14:57 |
|
| The main idea is to actualize the current directory with the remote repo, and fail if any file that is tracked conflicts. | 14:59 |
| ← zetef left | 14:59 |
|
selckin
| you're trying to avoid pull fetching again? | 14:59 |
|
Lights
| I am not sure, actually. Doesn't `git pull` fetches and merges identically to `git fetch && git merge`? | 15:00 |
| ← fonini left | 15:02 |
| ← danse-nr3 left | 15:04 |
| → jenia2 joined | 15:05 |
| → Thanzex0 joined | 15:05 |
| → fonini joined | 15:05 |
| → memset joined | 15:06 |
| → lucasta joined | 15:06 |
| → ChmEarl joined | 15:08 |
| ← belsirk left | 15:08 |
| → zetef joined | 15:09 |
| ← fonini left | 15:10 |
| ← dsrt^ left | 15:12 |
| → thuna` joined | 15:13 |
|
Lights
| fetch and merge* | 15:13 |
|
osse
| Yes | 15:13 |
| → savolla joined | 15:14 |
|
osse
| If you clone there's no need to pull/merge | 15:14 |
|
selckin
| just use an if statement, it won't bite | 15:15 |
| → dsrt^ joined | 15:16 |
|
kjetilho
| if git status; then git pull; else git clone; fi | 15:17 |
|
| but the existing code is fine, no need to optimise it. | 15:17 |
|
Lights
| I see! How would you differentiate between `git pull`/`git merge` and fail to clone the repo in this case? | 15:19 |
| ← duxsco left | 15:20 |
|
Lights
| Oh. Wait. I might have got confused. | 15:21 |
|
| So `git status` returns 0 status if a repo is found locally regardless any tracked file mismatches with remote. | 15:24 |
|
| If no repo is found - 128. | 15:24 |
|
| That is what `git clone` fore above. | 15:24 |
|
| for* | 15:24 |
|
j416
| Lights: git status does not talk to the remote | 15:25 |
|
| in case that was not clear | 15:25 |
| → danse-nr3 joined | 15:26 |
|
Lights
| Of course! This is clear I believe. Then you execute `git pull` if `git status` returns 0. Though, does `git status` return 0 regardless local changes that mismatch with fetched local repo? | 15:27 |
|
kjetilho
| if there are local changes, the git pull will fail anyway. | 15:28 |
|
Lights
| `man git` and `man git-status` does not include an exit status codes reference apparently. I'll search it up. | 15:28 |
|
gitinfo
| the git manpage is available at https://gitirc.eu/git.html | 15:28 |
|
| the git-status manpage is available at https://gitirc.eu/git-status.html | 15:28 |
|
Lights
| kjetilho and `git status` won't? | 15:28 |
| → ash_worksi joined | 15:30 |
|
Lights
| `git diff --quiet;` is nice actually, but it produces output if executed in a directory with no repo found. | 15:31 |
| ← junyx left | 15:31 |
| → duxsco joined | 15:32 |
| ← thiago left | 15:34 |
| ← jfsimon1981 left | 15:34 |
| → jfsimon1981 joined | 15:35 |
| → junyx joined | 15:36 |
| → dmj`_ joined | 15:36 |
| ← savolla left | 15:41 |
|
j416
| Lights: why are you running 'git status'? | 15:41 |
| ← misanthropos left | 15:46 |
| ← celmor left | 15:47 |
| ← danse-nr3 left | 15:47 |
| → chemsmith_ joined | 15:48 |
| ← CrunchyFlakes left | 15:49 |
| → CrunchyFlakes joined | 15:49 |
|
j416
| kjetilho: git pull doesn't necessarily fail if there are local changes. It only fails if those changes conflict with what is being merged. | 15:50 |
| ← chemsmith left | 15:50 |
| chemsmith_ → chemsmith | 15:50 |
|
j416
| conflict as in, the same files are touched (not in the sense merge conflict) | 15:50 |
| ← Masklin left | 15:51 |
| → thiago joined | 15:51 |
| → rom1v joined | 15:52 |
| → Masklin joined | 15:57 |
| ← zetef left | 15:57 |
|
kjetilho
| good point - but in this case I think I would want the task to fail as soon as possible when local state diverges from repo state | 15:58 |
| → gh34 joined | 16:00 |
| → zetef joined | 16:02 |
| ← hritik left | 16:05 |
| ← thiago left | 16:05 |
| → hritik joined | 16:05 |
| ← jenia2 left | 16:06 |
| ← junyx left | 16:10 |
| → jmd joined | 16:12 |
| → fonini joined | 16:12 |
| → peirik joined | 16:14 |
| → printfdebugging1 joined | 16:20 |
| ← sgm left | 16:23 |
| ← FinnElija left | 16:23 |
| ← fling left | 16:23 |
| → sgm joined | 16:24 |
| → FinnElija joined | 16:24 |
| → fling joined | 16:24 |
| → hdh joined | 16:26 |
| → misanthropos joined | 16:27 |
| ← gandhibobandhi_ left | 16:27 |
| → thiago joined | 16:29 |
| ← zetef left | 16:33 |
| ← thiago left | 16:34 |
| → Elliria joined | 16:39 |
| → pedahzur joined | 16:39 |
| ← peirik left | 16:43 |
| → darkAffinity0 joined | 16:43 |
| darkAffinity0 → darkAffinity | 16:47 |
| → epicout joined | 16:47 |
| → forgotmynick joined | 16:50 |
| ← lucasta left | 16:51 |
| ← StucKman left | 16:57 |
| ← hbautista left | 17:00 |
| ← wootehfoot left | 17:00 |
| → john_johnk joined | 17:01 |
| → APic joined | 17:04 |
| → peirik joined | 17:05 |
| ← hritik left | 17:06 |
| → hritik joined | 17:07 |
| → gnoo joined | 17:12 |
| → jpw_alt joined | 17:16 |
| ← jpw left | 17:16 |
| → ccreate joined | 17:17 |
| → gas51627 joined | 17:19 |
| → skapata joined | 17:19 |
| → epicout_ joined | 17:20 |
| ← epicout_ left | 17:20 |
| → darkAffinity3 joined | 17:24 |
| ← epicout left | 17:24 |
| ← darkAffinity left | 17:25 |
| darkAffinity3 → darkAffinity | 17:25 |
| → printfdebugging2 joined | 17:27 |
| ← printfdebugging2 left | 17:29 |
| → printfdebugging2 joined | 17:30 |
| ← printfdebugging2 left | 17:30 |
| ← becm left | 17:32 |
| ← hritik left | 17:37 |
| → hritik joined | 17:37 |
| → Guest49 joined | 17:42 |
| ← Guest49 left | 17:45 |
| ← hritik left | 17:47 |
| ← Elliria left | 17:57 |
| → rosco joined | 18:00 |
| jpw_alt → jpw | 18:00 |
| ← jpw left | 18:00 |
| → jpw joined | 18:00 |
| → mven971 joined | 18:00 |
| → haxalot joined | 18:03 |
| ← mven97 left | 18:03 |
| mven971 → mven97 | 18:03 |
| ← darkAffinity left | 18:04 |
| → masber joined | 18:05 |
| → darkAffinity3 joined | 18:05 |
| darkAffinity3 → darkAffinity | 18:06 |
| ← peirik left | 18:10 |
| → savolla joined | 18:13 |
| ← jpw left | 18:15 |
| ← sgm left | 18:16 |
| → jpw joined | 18:16 |
| → sgm joined | 18:17 |
| ← jpw left | 18:17 |
| → jpw joined | 18:17 |
| → hritik joined | 18:20 |
| → danse-nr3 joined | 18:20 |
| ← danse-nr3 left | 18:21 |
| → danse-nr3 joined | 18:21 |
| ← hritik left | 18:25 |
| ← sgm left | 18:32 |
| → falafel joined | 18:32 |
| → sgm joined | 18:33 |
| ← rosco left | 18:39 |
| ← sentriz left | 18:40 |
| → m0viefreak joined | 18:45 |
| ← TomyWork left | 18:45 |
| → TomyLobo joined | 18:46 |
| → hritik joined | 18:46 |
| ← peirik_ left | 18:47 |
| ← hritik left | 18:47 |
| → hritik joined | 18:47 |
| → peirik joined | 18:47 |
| → datascraper joined | 18:49 |
| ← Juest left | 18:50 |
| ← haxalot left | 18:50 |
| → redberri joined | 18:52 |
| → rosco joined | 18:54 |
| ← redberri left | 18:54 |
| → Juest joined | 18:55 |
| ← danse-nr3 left | 18:55 |
| → ___nick___ joined | 18:57 |
| ← ___nick___ left | 18:57 |
| ← savolla left | 18:58 |
| → ___nick___ joined | 18:59 |
| → jenia2 joined | 19:01 |
| ← masber left | 19:04 |
| ← z0e left | 19:05 |
| ← forgotmynick left | 19:10 |
| → Nixkernal joined | 19:16 |
| ← john_johnk left | 19:16 |
| ← brw left | 19:16 |
| → brw joined | 19:17 |
| ← jfsimon1981 left | 19:18 |
| ← hritik left | 19:25 |
| → hritik joined | 19:25 |
| ← Coop left | 19:33 |
| → john_johnk joined | 19:33 |
| ← hritik left | 19:37 |
| → hritik joined | 19:38 |
| → haxalot joined | 19:43 |
| ← datascraper left | 19:44 |
| → ferdna joined | 19:47 |
| ← john_johnk left | 19:47 |
| → kjartan joined | 19:58 |
| ← gas51627 left | 19:59 |
| → Mooncairn joined | 20:01 |
| ← ___nick___ left | 20:04 |
| → theoceaniscool joined | 20:05 |
| ← jmd left | 20:11 |
| ← falafel left | 20:11 |
| dmj`_ → dmj` | 20:15 |
| ← rosco left | 20:19 |
| ← dsrt^ left | 20:25 |
| → peirik_ joined | 20:25 |
| → dsrt^ joined | 20:26 |
| → thiago joined | 20:26 |
| ← konsolebox left | 20:29 |
| ← jiffe3 left | 20:29 |
| ← Juest left | 20:30 |
| → jiffe3 joined | 20:31 |
| → junyx joined | 20:32 |
| → cpackham joined | 20:33 |
| ← ferdna left | 20:33 |
| ← m0viefreak left | 20:36 |
| → Juest joined | 20:36 |
| ← chiselfuse left | 20:37 |
| → chiselfuse joined | 20:38 |
| ← peirik_ left | 20:41 |
| ← jenia2 left | 20:41 |
| → samuelbernardo joined | 20:42 |
| → peirik_ joined | 20:43 |
| ← haxalot left | 20:43 |
| ← thiago left | 20:44 |
| ← chiselfuse left | 20:44 |
| → chiselfuse joined | 20:45 |
| ← rossome left | 20:47 |
| → jenia2 joined | 20:50 |
| → Betal joined | 20:50 |
| ← zer0bitz left | 20:54 |
| ← dionisis left | 20:56 |
| → rossome joined | 20:58 |
| ← duxsco left | 21:02 |
| → konsolebox joined | 21:04 |
| → alexherbo2 joined | 21:04 |
| ← kjartan left | 21:05 |
| → haxalot joined | 21:07 |
| → seanh1 joined | 21:07 |
| seanh1 → seanh | 21:09 |
| ← jenia2 left | 21:09 |
| ← davispuh left | 21:10 |
| ← jpw left | 21:13 |
| → jpw joined | 21:15 |
| ← jpw left | 21:16 |
| → jpw joined | 21:16 |
| ← printfdebugging1 left | 21:18 |
| → printfdebugging1 joined | 21:19 |
| ← printfdebugging1 left | 21:19 |
| → printfdebugging1 joined | 21:19 |
| ← printfdebugging1 left | 21:19 |
| → printfdebugging1 joined | 21:20 |
| ← printfdebugging1 left | 21:20 |
| ← alexherbo2 left | 21:21 |
| → alexherbo2 joined | 21:22 |
| → Left_Turn joined | 21:24 |
| ← Turn_Left left | 21:25 |
| ← Lights left | 21:28 |
| → donofrio_ joined | 21:29 |
| → jenia2 joined | 21:31 |
| ← donofrio left | 21:31 |
| → printfdebugging1 joined | 21:33 |
| → ks_ joined | 21:36 |
| ← peirik_ left | 21:36 |
| ← theoceaniscool left | 21:37 |
| ← hritik left | 21:38 |
| ← Left_Turn left | 21:38 |
| → hritik joined | 21:38 |
| → Left_Turn joined | 21:38 |
| → dionisis joined | 21:39 |
| → ferdna joined | 21:43 |
| ← KnoP left | 21:58 |
| → BrainB0ne joined | 22:03 |
| ← BrainB0ne left | 22:04 |
| → BrainB0ne joined | 22:05 |
| ← hritik left | 22:07 |
| → hritik joined | 22:07 |
| → peirik_ joined | 22:12 |
| ← junyx left | 22:14 |
| → falafel joined | 22:15 |
| ← konsolebox left | 22:18 |
| ← memset left | 22:18 |
| ← bluesmonk left | 22:19 |
| → Eddinn joined | 22:21 |
| ← Eddinn left | 22:21 |
| → EdMaverick joined | 22:22 |
| ← EdMaverick left | 22:22 |
| → EdMaverick joined | 22:22 |
| ← EdMaverick left | 22:23 |
| → memset joined | 22:28 |
| ← fonini left | 22:37 |
| ← hritik left | 22:37 |
| → hritik joined | 22:38 |
| → Turn_Left joined | 22:38 |
| ← Left_Turn left | 22:42 |
| ← falafel left | 22:45 |
| ← Turn_Left left | 22:49 |
| ← peirik_ left | 22:50 |
| ← alexherbo2 left | 22:56 |
| ← sgm left | 22:56 |
| → sgm joined | 22:57 |
| ← CrunchyFlakes left | 22:59 |
| → CrunchyFlakes joined | 23:02 |
| ← ggGuest2 left | 23:04 |
| ← bindu left | 23:04 |
| ← hritik left | 23:08 |
| → hritik joined | 23:08 |
| ← dmj` left | 23:12 |
| → ggGuest joined | 23:13 |
| → cluelessperson joined | 23:13 |
| ← ash_worksi left | 23:16 |
| ← hritik left | 23:17 |
| → hritik joined | 23:17 |
| ← very_sneaky left | 23:19 |
| ← hritik left | 23:19 |
| → hritik joined | 23:20 |
| → very_sneaky joined | 23:21 |
| ← ferdna left | 23:22 |
| ← BrainB0ne left | 23:22 |
| ← cluelessperson left | 23:29 |
| → thiago joined | 23:31 |
| ← Thanzex0 left | 23:33 |
| → Thanzex0 joined | 23:36 |
| ← hritik left | 23:37 |
| → hritik joined | 23:37 |
| ← printfdebugging1 left | 23:39 |
| ← haxalot left | 23:55 |