| 2020-09-24 |
| → igemnace joined | 00:02 |
| → SwiftMatt joined | 00:05 |
| ← deltab left | 00:09 |
| ← tiin57 left | 00:11 |
| → tiin57 joined | 00:14 |
| ← kerframil left | 00:14 |
| → Xenguy joined | 00:14 |
| ← maxzor left | 00:15 |
| → cim209 joined | 00:16 |
| → init joined | 00:17 |
| ← EvanCarroll left | 00:17 |
| → deltab joined | 00:19 |
| ← arcatech left | 00:21 |
| ← init left | 00:22 |
| → cdown_ joined | 00:26 |
| → Thorn joined | 00:27 |
| → tilpner_ joined | 00:27 |
| ← zebrag left | 00:27 |
| ← cdown left | 00:29 |
| cdown_ → cdown | 00:29 |
| ← tilpner left | 00:30 |
| tilpner_ → tilpner | 00:30 |
| → zebrag joined | 00:30 |
| ← tafa2 left | 00:34 |
| → jsatk joined | 00:40 |
| ← yamashitatan left | 00:41 |
| → Muimi joined | 00:41 |
| ← impermanence left | 00:41 |
| ← tiin57 left | 00:41 |
|
jsatk
| Hello. I'm suddenly having a hell of a time pushing a new remote to git. When I'm on `master` I run `git checkout -b foo` and then `git push --set-upstream origin foo` but when I run `git branch -vv` it shows that `foo` is pointed at `master` still. And the aformentioned push fails because git thinks I'm trying to push on top of `master` which is a protected branch. | 00:41 |
|
| Any ideas what weird settings or config could be causing this? I've been using git for a decade... this is... strange. | 00:42 |
| ← Aki-lucky left | 00:43 |
| ← Gurkenglas left | 00:43 |
| → alesan joined | 00:44 |
|
alesan
| hello | 00:44 |
| ← relipse left | 00:45 |
| → tiin57 joined | 00:45 |
|
alesan
| I am using git in a scenario that I think is pretty common these dys, I have a remote called "origin" that has a MASTER branc, I clone it on my local machine, I create a different branch, I push it bach with push origin <branchname> | 00:45 |
|
nedbat
| sounds pretty standard | 00:46 |
|
alesan
| what I am asking is: why do I need to specify a branchname? Cannot just take the current branch name, UNLESS I want to push to a different branch? | 00:46 |
|
| (and what would be the semantics to push to a different branch I am not sure) | 00:46 |
|
nedbat
| alesan: a great question. i don't know the answer | 00:46 |
|
jsatk
| nedbat: https://stackoverflow.com/questions/37770467/why-do-i-have-to-git-push-set-upstream-origin-branch | 00:47 |
|
alesan
| OK thanks anyway :) | 00:47 |
|
jsatk
| i am over here stumped trying to figure out why the hell `git checkout -b foo && git push -u origin foo` is still causing `foo` to track against `master`. | 00:48 |
| → Wetmelon joined | 00:51 |
| ← kupi left | 00:52 |
|
jsatk
| Okay it's either something about branch.autosetupmerge=true or rebase.autosquash=true. | 00:57 |
| ← Wetmelon left | 01:00 |
| ← Irish left | 01:01 |
| ← Xenguy left | 01:02 |
| → Xenguy joined | 01:02 |
| ← SwiftMatt left | 01:02 |
| → POQDavid joined | 01:04 |
| ← vngx left | 01:04 |
| ← Jookia left | 01:06 |
| → yonder joined | 01:10 |
| → arcatech joined | 01:10 |
| ← tiin57 left | 01:11 |
| ← Xenguy left | 01:11 |
| → Tk55 joined | 01:12 |
| ← stats4647 left | 01:13 |
| → stats4647 joined | 01:13 |
| → tiin57 joined | 01:14 |
| → acetakwas joined | 01:18 |
| ← stats4647 left | 01:18 |
| ← F0rTex left | 01:19 |
| ← gschanuel left | 01:20 |
| → F0rTex joined | 01:20 |
| → gschanuel joined | 01:21 |
| → Jookia joined | 01:22 |
| → mud joined | 01:24 |
| ← leprechau left | 01:27 |
| → javashin joined | 01:28 |
| → davispuhh joined | 01:28 |
| ← davispuh left | 01:30 |
| → Xenguy joined | 01:33 |
| → fstd_ joined | 01:34 |
| ← AnAverageHuman left | 01:35 |
| → leprechau joined | 01:36 |
| ← fstd left | 01:38 |
| fstd_ → fstd | 01:38 |
| ← tiin57 left | 01:41 |
| → tiin57 joined | 01:44 |
| ← acetakwas left | 01:48 |
| ← POQDavid left | 01:49 |
| → acetakwas joined | 01:49 |
| → drbean joined | 01:50 |
| → POQDavid joined | 01:50 |
| → stats4647 joined | 01:50 |
| ← POQDavid left | 01:50 |
| → POQDavid joined | 01:51 |
| → binTrl joined | 01:51 |
| ← binTrl left | 01:54 |
| ← acetakwas left | 01:55 |
| ← POQDavid left | 01:55 |
| ← arcatech left | 01:55 |
| → POQDavid joined | 01:56 |
| → acetakwas joined | 01:56 |
| → javashin_ joined | 02:05 |
| → AnAverageHuman joined | 02:06 |
| → arcatech joined | 02:07 |
| ← javashin left | 02:08 |
| → init joined | 02:09 |
| ← dfee left | 02:09 |
| ← arcatech left | 02:10 |
| ← tiin57 left | 02:11 |
| ← POQDavid left | 02:11 |
| ← acetakwas left | 02:11 |
| → dfee joined | 02:11 |
| → POQDavid joined | 02:12 |
| → acetakwas joined | 02:12 |
| → arcatech joined | 02:12 |
| ← init left | 02:14 |
| → tiin57 joined | 02:15 |
| ← arcatech left | 02:17 |
| → SwiftMatt joined | 02:19 |
| → Goplat joined | 02:22 |
| ← s2013 left | 02:23 |
| → marslander joined | 02:25 |
| → init joined | 02:25 |
| lagothrix → Guest42381 | 02:29 |
| ← Guest42381 left | 02:29 |
| → lagothrix joined | 02:29 |
| ← init left | 02:30 |
| → arcatech joined | 02:30 |
| ← gast0n left | 02:32 |
| → gast0n joined | 02:34 |
| ← POQDavid left | 02:37 |
| ← yousef9 left | 02:37 |
| → POQDavid joined | 02:37 |
| ← gast0n left | 02:38 |
| ← acetakwas left | 02:38 |
| → acetakwas joined | 02:40 |
| ← tiin57 left | 02:41 |
| → tiin57 joined | 02:44 |
| → init joined | 02:44 |
| → Cabanoss- joined | 02:49 |
| ← init left | 02:49 |
| ← Cabanossi left | 02:49 |
| Cabanoss- → Cabanossi | 02:49 |
| ← SwiftMatt left | 02:53 |
| ← Jookia left | 02:57 |
| ← chachasmooth left | 02:57 |
| → kent\n joined | 02:58 |
| → chachasmooth joined | 02:59 |
| → tgunr joined | 03:01 |
| → Jookia joined | 03:04 |
| ← stats4647 left | 03:06 |
| ← wagle left | 03:09 |
| → wagle joined | 03:10 |
| ← tiin57 left | 03:11 |
| → sudoforge joined | 03:14 |
| ← mowcat left | 03:14 |
| → tiin57 joined | 03:15 |
| ← marslander left | 03:15 |
| → init joined | 03:20 |
| ← cuppajoeman left | 03:24 |
| ← oatmealraisin left | 03:25 |
| ← init left | 03:25 |
| ← wagle left | 03:29 |
| → wagle joined | 03:29 |
| ← Xiti left | 03:30 |
| → Xiti joined | 03:32 |
| ← davispuhh left | 03:33 |
| ← tiin57 left | 03:41 |
| → tiin57 joined | 03:45 |
| → Guest20 joined | 03:48 |
| ← powerhouse left | 03:53 |
| ← javashin_ left | 03:55 |
| ← AnAverageHuman left | 04:02 |
| ← acetakwas left | 04:02 |
| ← POQDavid left | 04:02 |
| → acetakwas joined | 04:03 |
| → POQDavid joined | 04:04 |
| ← n-st left | 04:06 |
| ← thomasross left | 04:10 |
| ← tiin57 left | 04:11 |
| → buckworst joined | 04:11 |
| ← Thominus left | 04:12 |
| ← buckworst left | 04:13 |
| → tiin57 joined | 04:14 |
| → mat001_ joined | 04:15 |
| ← mat001 left | 04:17 |
| → pikapika joined | 04:17 |
| → n-st joined | 04:21 |
| ← vicfred left | 04:22 |
| → vicfred joined | 04:24 |
| → a-l-e joined | 04:26 |
| ← dermoth left | 04:28 |
| → dermoth joined | 04:30 |
| → s2013 joined | 04:36 |
| → crose joined | 04:36 |
| → powerhouse joined | 04:40 |
| ← tiin57 left | 04:41 |
| → tiin57 joined | 04:44 |
| ← drbean left | 04:48 |
| → init joined | 04:55 |
| → wgrant joined | 04:57 |
| ← init left | 05:02 |
| ← meropyri left | 05:03 |
| → meropyri joined | 05:03 |
| ← zrhoffman left | 05:09 |
| ← tiin57 left | 05:11 |
| → matelot joined | 05:14 |
| → tiin57 joined | 05:14 |
| ← Abbott left | 05:26 |
| → Abbott joined | 05:26 |
| → mightyjens joined | 05:30 |
| → mirrorbird joined | 05:30 |
| → init joined | 05:32 |
| → SwiftMatt joined | 05:33 |
| ← sudoforge left | 05:36 |
| ← init left | 05:38 |
| → stats4647 joined | 05:39 |
| ← kent\n left | 05:40 |
| ← tiin57 left | 05:41 |
| → kent\n joined | 05:41 |
| ← stats4647 left | 05:44 |
| → tiin57 joined | 05:44 |
| → theoceaniscool joined | 05:49 |
| ← Xenguy left | 05:52 |
| → ekh joined | 05:53 |
| → Xenguy joined | 05:54 |
| ← geosmile left | 05:55 |
| ← jaziz left | 05:56 |
| ← SwiftMatt left | 05:58 |
| ← arcatech left | 06:05 |
| → macrover joined | 06:06 |
| ← mir100 left | 06:07 |
| → karab44 joined | 06:11 |
| → SwiftMatt joined | 06:11 |
| ← tiin57 left | 06:11 |
| ← thiago left | 06:11 |
| → rfuentess joined | 06:13 |
| → tiin57 joined | 06:14 |
| → mat001 joined | 06:14 |
| ← mirrorbird left | 06:15 |
| → fatalhalt joined | 06:15 |
| ← SwiftMatt left | 06:16 |
| ← mat001_ left | 06:16 |
| → stats4647 joined | 06:19 |
| → konrados joined | 06:23 |
| ← stats4647 left | 06:24 |
| ← VectorX left | 06:26 |
| ← karab44 left | 06:31 |
| → OnkelBlade joined | 06:37 |
| ← tiin57 left | 06:41 |
| ← Muimi left | 06:44 |
| → tiin57 joined | 06:44 |
| ← irc_user left | 06:45 |
| ← txtsd left | 06:48 |
| → tarkus joined | 06:48 |
|
jsatk
| I figured it out. It's `autosetupmerge = always` that I'd added to my gitconfig. I thought I understand what it did but clearly not... | 06:50 |
| → chele joined | 06:50 |
|
osse
| alesan: if you add -u to the first push from the new branch, you can then just use 'git push' with no args thereafter | 06:52 |
| → R2robot joined | 06:55 |
| ← causasui left | 06:56 |
| → KnoP joined | 06:58 |
| → VectorX joined | 06:58 |
| ← theoceaniscool left | 07:00 |
| ← unluckyshrubbery left | 07:02 |
| ← FH_thecat left | 07:05 |
| → FH_thecat joined | 07:05 |
| ← matelot left | 07:05 |
| → SerialSmile joined | 07:06 |
| → oxymoron93 joined | 07:08 |
| ← tiin57 left | 07:11 |
| → Muimi joined | 07:11 |
| ← hussam left | 07:13 |
| → Mattiaslndstrm joined | 07:14 |
| → tiin57 joined | 07:15 |
| ← justanotheruser left | 07:16 |
| ← Mattiaslndstrm left | 07:18 |
| ← crose left | 07:21 |
| → txtsd joined | 07:22 |
| → crose joined | 07:22 |
| ← Goplat left | 07:28 |
| → kegger joined | 07:29 |
| → nikivi joined | 07:31 |
| → PJBoy joined | 07:31 |
| → causasui joined | 07:31 |
| ← a-l-e left | 07:32 |
| → Exagone313 joined | 07:34 |
| ← Exagone313 left | 07:34 |
| → shtrb joined | 07:34 |
| → mirrorbird joined | 07:34 |
| → Exagone313 joined | 07:34 |
|
shtrb
| Is "Received disconnect from ip: 11: Bye Bye" message specific to a provider or general for git and can indicate some kind of user problem ? | 07:35 |
| → feriman joined | 07:36 |
| ← kjartan left | 07:37 |
| → nee joined | 07:37 |
| ← fatalhalt left | 07:37 |
| ← nee left | 07:38 |
| → kjartan joined | 07:39 |
| ← tiin57 left | 07:41 |
| ← vicfred left | 07:43 |
| → vicfred joined | 07:43 |
| → tiin57 joined | 07:44 |
| ← s2013 left | 07:48 |
| → a-l-e joined | 07:49 |
|
selckin
| google says, its ssh auth failure | 07:49 |
|
shtrb
| I doubt it as I got it mid clone (after getting over 200 mb) | 07:51 |
| → wrobinso1 joined | 07:51 |
|
shtrb
| Or is there several times an auth is being done during clone ? | 07:52 |
| ← wrobinson left | 07:54 |
| → benfelin joined | 07:59 |
| → wrksx_ joined | 08:00 |
| ← wrksx left | 08:00 |
|
selckin
| are you the user or provider | 08:01 |
| ← mightyjens left | 08:05 |
| ← FH_thecat left | 08:05 |
|
shtrb
| user | 08:06 |
|
selckin
| other ppl complaining on google, its either ppl trying to brute force login (doesn't apply here i would say), or maybe some incompatible ssh versions obscure bug, but i can't find references to the bye bye error message in openssh code | 08:06 |
|
shtrb
| that happend with github , I had disconnects in the past but not with "Bye Bye"message | 08:06 |
|
| running the same command few seconds later seem to work just fine (which is odd ) . | 08:07 |
|
| Could it be something related to the provider ? | 08:08 |
| → maxzor joined | 08:08 |
|
selckin
| on windows? | 08:08 |
|
shtrb
| yes | 08:08 |
|
selckin
| what does 'ssh -vT [email@hidden.address] say, give the error? | 08:09 |
| → stats4647 joined | 08:09 |
| → FH_thecat joined | 08:09 |
|
shtrb
| I do not get that error | 08:10 |
|
| I have a passphrase if it have any implications | 08:10 |
| ← konrados left | 08:11 |
| ← tiin57 left | 08:11 |
|
shtrb
| and on win10 pro | 08:11 |
|
selckin
| then you need to update your ssh version probably | 08:11 |
|
shtrb
| thanks , will try | 08:11 |
| → tafa2 joined | 08:11 |
| → tiin57 joined | 08:14 |
| ← stats4647 left | 08:16 |
| → a-l-e--- joined | 08:16 |
| ← SerialSmile left | 08:17 |
| → zrhoffman joined | 08:17 |
| ← a-l-e left | 08:19 |
| ← chele left | 08:19 |
| ← yonder left | 08:20 |
|
alesan
| osse, it has to be the very first push with -u, or it can be at any time? | 08:21 |
| → clara97 joined | 08:21 |
|
clara97
| hi | 08:21 |
|
osse
| alesan: any time | 08:21 |
|
| alesan: -u sets up tracking info | 08:22 |
|
| after that git push alone will work | 08:22 |
|
clara97
| if I want to read commitment in 2days | 08:22 |
|
| what should I do? | 08:22 |
|
shtrb
| selckin, I had found the issue , if I enter a correct passphrase after 90 seconds it fails | 08:22 |
|
alesan
| I'll try but | 08:23 |
|
| I am absolutely surprised - why a push isn't done by default to a branch of the same exact name UNLESS a different one is specified? Is it a technical limitation of GIT? | 08:24 |
|
| or is it a design choice | 08:24 |
|
osse
| that too is configurable | 08:24 |
|
| man git-config, see push.default | 08:25 |
|
gitinfo
| the git-config manpage is available at https://gitirc.eu/git-config.html | 08:25 |
| → mat001_ joined | 08:25 |
|
alesan
| there must be something I fail to understand because I cannot think of a use case where one wouldn't want that to be the default | 08:25 |
|
| ok thanks | 08:25 |
|
| out of curiosity - who is the git developer? Still Mr. L. Torvalds or now is somebody else? | 08:26 |
|
osse
| alesan: it sounds like you want to change push.default to current | 08:26 |
|
alesan
| osse, maybe, I'll need to make sure on the documentation | 08:26 |
|
| :D thanks | 08:26 |
| → Gurkenglas joined | 08:26 |
|
osse
| alesan: it's not a single guy. | 08:26 |
| ← mat001 left | 08:27 |
|
ikke
| Junio C. Hamano is the maintainer | 08:27 |
|
osse
| Torvalds wrote the initial implementation and became the maintainer. After a while a new guy took over as maintainer. | 08:27 |
|
| alesan: actually, next time just run 'git push' without any args. either it does what you want immediately or it will tell you want to do | 08:28 |
| → unluckyshrubbery joined | 08:30 |
|
clara97
| hello what should I do to read log in 2daysv | 08:32 |
|
| ? | 08:32 |
|
osse
| what do you mean? | 08:32 |
| ← bvdw left | 08:33 |
|
clara97
| I just want to read commits in 2 days | 08:33 |
| → bvdw joined | 08:33 |
|
osse
| then run 'git log' in 2 days | 08:33 |
|
clara97
| git log would return all log? | 08:34 |
|
Jookia
| clara97: do you over the past two days or do you mean you will be reading two commits on friday | 08:34 |
|
clara97
| the past 2 days | 08:35 |
|
osse
| git log --since='2 days ago' | 08:39 |
| → calcul0n joined | 08:40 |
| ← tiin57 left | 08:41 |
|
clara97
| thanks | 08:41 |
|
Jookia
| osse: is that the same as 'git log ..@{2 days ago}' and is that all the commits within 2 days, so inclusive, or does it miss one? | 08:42 |
| → cosimone joined | 08:44 |
| ← kegger left | 08:44 |
| → tiin57 joined | 08:44 |
|
osse
| Jookia: it's not the same | 08:45 |
|
| as for whehter it's inclusive, I'm not sure | 08:46 |
| → mozgalom joined | 08:48 |
| ← meropyri left | 08:48 |
| → meropyri joined | 08:49 |
| ← downunder left | 08:52 |
| ← OnkelBlade left | 08:53 |
| → nelgin joined | 08:53 |
|
nelgin
| Hi all, this may be a stupid question but I don't use git much, only as an end user. When using git pull I find some filenames are truncted by prefixing with ... - Is there any way to force the whole path to be printed regardless of the number of columns? I use the result of the git pull to do certain things with certain files, but I need the full path. Thanks. | 08:54 |
|
pa
| hi, why git reset HEAD^ somefile produces both a staged and an unstaged change for that file? | 08:57 |
|
nkuttler
| nelgin: hm, i'd probably ask for an explicit list of files, not use a tool that does something else and dumps random info | 08:58 |
|
| nelgin: like git fetch && git diff --name-only <remote> | 08:58 |
| ← cd left | 08:58 |
|
nelgin
| Well, it wouldn't be random to me if it had the full path. | 08:58 |
|
osse
| nelgin: you can configure the width of a diffstat. maybe pull respects those settings | 08:59 |
|
| try git config diff.statGraphWidth 999999 | 08:59 |
| → downunder joined | 08:59 |
|
osse
| no that's the graph part, bleh | 09:00 |
| → init joined | 09:01 |
|
osse
| try git config diff.statGraphWidth 80,99999 | 09:01 |
|
nelgin
| OK, I set that. I'll see wht happens next time I do a pull. | 09:02 |
|
osse
| the comma version doesn't work | 09:02 |
|
| you can test it by doing git reset --hard @~5 and pulling again | 09:02 |
| ← DerHorst left | 09:03 |
|
nelgin
| fatal: bad numeric config value '80,99999' for 'diff.statgraphwidth': invalid unit | 09:03 |
|
| Ah my bad. | 09:03 |
|
| Hang on | 09:04 |
|
| Oh nope. I thought it was case issue but I entered as you gave me. | 09:04 |
|
osse
| the comma thing was a guess | 09:05 |
| → OnkelBlade joined | 09:05 |
| ← init left | 09:06 |
|
nelgin
| It only checked out 5 items when I did a git pull and none of them over 80 chars. Oh well. | 09:06 |
|
osse
| after a pull git prints out something like "Updating 01146e6757..2460146bdb" | 09:07 |
|
| you can then do git diff --stat=999 01146e6757..2460146bdb | 09:07 |
|
nelgin
| Yup, shows me the same thing pretty much. | 09:08 |
| ← txtsd left | 09:08 |
|
pa
| nvm, gotcha | 09:08 |
|
nelgin
| I think it might be because the author added a new tag. | 09:09 |
|
| Looks like these are just updates since the it changed. | 09:09 |
| ← tiin57 left | 09:11 |
| → imp joined | 09:12 |
| → chele joined | 09:12 |
| ← hineios left | 09:12 |
|
nelgin
| No, that didn't work, still get truncated files. | 09:12 |
|
osse
| what did not | 09:12 |
|
nelgin
| Using the width thing | 09:13 |
|
osse
| it diff --stat=999 ? | 09:13 |
|
| the config won't work | 09:13 |
|
nelgin
| Ah yes, let me try that | 09:13 |
| → tiin57 joined | 09:14 |
| → karab44 joined | 09:14 |
|
nelgin
| Ah yes, that looks better. | 09:14 |
| → txtsd joined | 09:15 |
| → jaziz joined | 09:17 |
|
alesan
| osse, OK thanks | 09:19 |
| → Lucas_Gray joined | 09:20 |
| ← OnkelBlade left | 09:22 |
| ← cosimone left | 09:22 |
| → OnkelBlade joined | 09:24 |
| → wolfshappen joined | 09:24 |
| ← tonyj left | 09:26 |
| → cosimone joined | 09:27 |
| → clime joined | 09:33 |
| → dionysus69 joined | 09:35 |
| → T_UNIX joined | 09:39 |
| ← Betal left | 09:40 |
| ← tiin57 left | 09:41 |
| → tiin57 joined | 09:44 |
| → NeoCron joined | 09:47 |
| ← karab44 left | 09:49 |
| ← RandomGuy90 left | 09:50 |
| → RandomGuy90 joined | 09:51 |
| ← macrover left | 09:52 |
| → hussam joined | 09:54 |
| ← Shentino left | 09:54 |
| ← Lucas_Gray left | 09:56 |
| ← alesan left | 09:59 |
| → Shentino joined | 10:00 |
| → tonyj joined | 10:03 |
| ← maxzor left | 10:03 |
| ← crose left | 10:09 |
| ← tiin57 left | 10:11 |
| → sudoforge joined | 10:12 |
| ← tafa2 left | 10:13 |
| → tiin57 joined | 10:14 |
| ← sudoforge left | 10:20 |
| → walidvb joined | 10:21 |
|
walidvb
| hey all! After years of dev, i'm finally collaborating with someone! | 10:22 |
|
| I'm wondering how to handle the flow, specifically around pull requests. When I review it, should i rebase it on master? | 10:23 |
|
| if i do so, i'll need to push -f to github before merging the branch(or do it locally) | 10:23 |
| → vngx joined | 10:23 |
|
walidvb
| should the author of the PR do this himself? in which case, it sounds like an endless loop if master is committed to frequently 🤔 | 10:23 |
|
| and if i merge master, i'm adding an unnecessary commit | 10:24 |
| Dreadnaught → Kulrak | 10:28 |
| → init joined | 10:28 |
| → va5c0 joined | 10:28 |
| ← OnkelBlade left | 10:30 |
| ← va5c0 left | 10:31 |
| → va5c0 joined | 10:33 |
|
Jookia
| walidvb: congrats! are you the project maintainer? | 10:33 |
|
walidvb
| i am :) | 10:33 |
| ← va5c0 left | 10:34 |
| → va5c0 joined | 10:34 |
|
Jookia
| generally the easiest and least complicated way is to merge PRs in to your main branch. rebases are more for the PR makers to do if needed | 10:34 |
|
walidvb
| although it's a private repo | 10:35 |
| ← va5c0 left | 10:35 |
|
Jookia
| rebases are good for patch sets, merges are good when you have git repos | 10:36 |
|
walidvb
| but then, when i check the work of that PR, it's not on par, no? | 10:36 |
|
Jookia
| what do you mean not on par? do you mean the work is bad, or it's not based on the latest code? | 10:38 |
|
| merging will bring in all the changes in the PR on to the latest code | 10:38 |
|
walidvb
| i mean not based | 10:39 |
|
| but i will bring code to master that hasn't been tested with master | 10:39 |
|
| so either way it feels like master should be on the branch i'm checking (it could even be that merging the PR brings a regression) | 10:40 |
|
Jookia
| well, master is a moving target | 10:40 |
|
| and a lot of changes don't affect other code | 10:40 |
|
walidvb
| in terms of conflicts, it sounds to me that i would want to merge master to the PR before testing and merging it | 10:40 |
|
Jookia
| the master branch is generally considered a development branch, where things may be broken | 10:41 |
| ← tiin57 left | 10:41 |
|
walidvb
| in terms of history, i'd rebase, but that breaks the ability to merge etc | 10:41 |
|
Jookia
| rebasing PRs shouldn't break ability to merge | 10:42 |
| ← txtsd left | 10:42 |
| → fossegrim joined | 10:43 |
| → Muimi_ joined | 10:43 |
|
Jookia
| never rebase a branch people are using (like master) | 10:43 |
|
walidvb
| that's what i meant | 10:43 |
|
Jookia
| your concerns are very real, but usually this is solved without git, but by CI | 10:44 |
|
| where the bot will grab the branch, merge it, then test to see if it works | 10:44 |
|
walidvb
| fair | 10:44 |
| → tiin57 joined | 10:44 |
| ← init left | 10:45 |
|
osse
| but master might move ahead while the CI is working.... It will never be perfect | 10:45 |
| → txtsd joined | 10:46 |
| ← Trieste left | 10:46 |
| ← Muimi left | 10:46 |
| Muimi_ → Muimi | 10:46 |
|
walidvb
| i'm not sure i agree with the statement that master is considered dev | 10:46 |
| → stats4647 joined | 10:46 |
| → sQVe joined | 10:46 |
|
Jookia
| walidvb: well, you can create a develop/stable/etc branch. master is kind of a vague term | 10:47 |
|
walidvb
| fir | 10:47 |
|
| fair* | 10:47 |
|
| and true, the CI would not deploy if the test fails | 10:47 |
|
Jookia
| generally projects have layers of branches depending on how tested a feature is | 10:48 |
| ← a-l-e--- left | 10:48 |
|
Jookia
| which the top layer being tagged release that gets shipped to users | 10:48 |
|
| and the bottom being a feature in development | 10:48 |
| → Trieste joined | 10:48 |
|
osse
| One goal of the Git git repo is that master is at any point better than the latest release :p | 10:50 |
| → Muimi_ joined | 10:50 |
|
walidvb
| brb sry | 10:51 |
| ← stats4647 left | 10:51 |
| ← DiffieHellman left | 10:52 |
| ← Muimi left | 10:52 |
| Muimi_ → Muimi | 10:53 |
| → DiffieHellman joined | 10:53 |
| ← DiffieHellman left | 10:56 |
|
walidvb
| we're 2 ppl, i'm trying to keep it to a minimum | 10:56 |
|
osse
| If this is new to you then I wouldn't overthink it | 10:57 |
|
| if the PR looks good, merge it | 10:57 |
|
walidvb
| used to use git-flow, but was.a bit tricky to push rc to my team, especially because one feature could prevent another to make it to prod | 10:58 |
| ← Fusl left | 10:58 |
|
walidvb
| so switched to feature br only, which seems more convenient | 10:58 |
|
Jookia
| walidvb: this is just a classic concurrency issue :D | 10:58 |
|
walidvb
| also, at first i had little to no automated testing on my frontend, so it was quite risky to push without manual testing | 10:59 |
| → Fusl joined | 10:59 |
|
walidvb
| that's changed now though, so indeed i'm more confident in the changes brought in | 10:59 |
|
Jookia
| my small team working is 'have your own branch with what you're working on so we can check out and try it', cherry-pick stuff you like from the branch, then make them PRs for review that get merged to unstable | 10:59 |
| → haymawk joined | 11:00 |
|
walidvb
| Jookia: thx | 11:00 |
|
| osse: that sounds reasonable, too :) | 11:00 |
| ← clara97 left | 11:00 |
|
walidvb
| still need to set up my cli. setup is a bit complex, as it's a rails rspec running against an expo frontnd (which is currently not served by rails, but standalone – hosted on firebase for ease) | 11:02 |
| → jomo_ joined | 11:02 |
|
walidvb
| i'm thinking a githubaction that pushes my front to test.reveel.id, and Capybara that loads that url(which in turns hits my localhost:7357 test api) | 11:03 |
|
| but i had some issues, and had to move on. will take another look at some point soon i hope! | 11:04 |
|
| bit of a bummer not to see the test state in the PR (for me, i run my tests before submitting a PR ) | 11:04 |
| ← opal left | 11:09 |
| → opal joined | 11:10 |
| → crose joined | 11:10 |
| ← tiin57 left | 11:11 |
| → calcul0n_ joined | 11:13 |
| ← calcul0n left | 11:13 |
| ← ch left | 11:15 |
| → tiin57 joined | 11:15 |
| ← mat001_ left | 11:15 |
| → mat001 joined | 11:15 |
| → init joined | 11:19 |
| ← init left | 11:24 |
| → kdlv joined | 11:25 |
| ← tarkus left | 11:27 |
| → OnkelBlade joined | 11:30 |
| → TomyWork joined | 11:36 |
| → DiffieHellman joined | 11:36 |
| → tafa2 joined | 11:40 |
| → cdown_ joined | 11:40 |
| ← tiin57 left | 11:41 |
| ← cdown left | 11:42 |
| cdown_ → cdown | 11:43 |
| → Mattiaslndstrm joined | 11:43 |
| → tiin57 joined | 11:44 |
| ← tafa2 left | 11:46 |
| ← shabius left | 11:50 |
| → Muimi_ joined | 11:51 |
| ← Muimi left | 11:53 |
| Muimi_ → Muimi | 11:53 |
| ← nikivi left | 11:54 |
| → vdamewood joined | 11:54 |
| → nikivi joined | 11:54 |
| → maxzor joined | 11:55 |
| ← g00s left | 11:56 |
| ← nikivi left | 11:57 |
| ← acetakwas left | 11:57 |
| ← mirrorbird left | 11:57 |
| → nikivi joined | 11:57 |
| → acetakwas joined | 11:57 |
| → stats4647 joined | 11:59 |
| → shabius joined | 12:00 |
| → Muimi_ joined | 12:02 |
| ← Muimi left | 12:03 |
| Muimi_ → Muimi | 12:03 |
| ← stats4647 left | 12:04 |
| → canadev joined | 12:07 |
| ← jaziz left | 12:09 |
| ← tiin57 left | 12:11 |
| ← Guest20 left | 12:12 |
| → tiin57 joined | 12:14 |
| → denel joined | 12:15 |
| ← Trieste left | 12:17 |
| → Trieste joined | 12:21 |
| ← feriman left | 12:21 |
| → CodeSlingerPaul joined | 12:32 |
| → macrover joined | 12:38 |
| ← tiin57 left | 12:41 |
| ← benfelin left | 12:41 |
| → mirrorbird joined | 12:43 |
| → tiin57 joined | 12:44 |
| ← Jookia left | 12:47 |
| ← ekh left | 12:48 |
| → Jookia joined | 12:48 |
| ← fling left | 12:54 |
| ← Xenguy left | 12:55 |
| → fling joined | 12:56 |
| → Maxattax joined | 12:56 |
| → dohzer joined | 13:00 |
| → Anticom joined | 13:00 |
| → stats4647 joined | 13:04 |
| → a-l-e joined | 13:06 |
| ← stats4647 left | 13:09 |
| ← tiin57 left | 13:11 |
| → tiin57 joined | 13:14 |
| ← mirrorbird left | 13:17 |
| → Guest20 joined | 13:18 |
|
walidvb
| one other thing i'm not too sure how to handle, is the fact that i smtimes do work on a branch, PR it, and then switch to another feature, that potentially requires some changes from that previous branch(but don't necessarily rely on the feature itself. eg. a bugfix/refactor). I'm guessing the best answer is to either switch to master, bugfix, and commit, or to be careful to commit only the bugfix and cherry-pick it? | 13:19 |
| ← Gurkenglas left | 13:19 |
| ← howdoi left | 13:20 |
| ← POQDavid left | 13:20 |
| → init joined | 13:20 |
| ← pikapika left | 13:21 |
| → pikapika joined | 13:21 |
| → POQDavid joined | 13:21 |
| ← init left | 13:25 |
| → benfelin joined | 13:27 |
| → gast0n joined | 13:29 |
| ← denel left | 13:32 |
| → denel joined | 13:33 |
| → clara97 joined | 13:36 |
| ← Guest20 left | 13:36 |
|
cdunklau
| walidvb: cherry picking is a slippery slope | 13:37 |
|
Jookia
| walidvb: yeah that's why i have a general branch then focus on making PRs once the work is done | 13:38 |
|
walidvb
| but the PR takes some time to be merged, right? what if you want to jump right in the next feature, but therefore can't take advantage of some new code that your wrote(a new module, some perf optim, a bugfix)? | 13:39 |
|
cdunklau
| walidvb: then you're screwed | 13:40 |
|
Jookia
| that's ideally why you have a personal integration branch | 13:41 |
|
cdunklau
| walidvb: or you branch from the PR | 13:41 |
| ← tiin57 left | 13:41 |
|
leah2
| i noticed a weird thing, maybe someone can explain. i use pull.ff=only and sometimes "git pull" says "fatal: Not possible to fast-forward, aborting." When I then run "git pull --rebase" it says "Successfully rebased and updated refs/heads/master." | 13:41 |
|
| but the commit hash is exactly the remote hash, so what did it rebase, and why didnt ff work? | 13:41 |
|
cdunklau
| leah2: what's reflog say | 13:42 |
|
leah2
| cbb02bde (HEAD -> master, origin/master, origin/HEAD) HEAD@{0}: pull --rebase (finish): returning to refs/heads/master | 13:44 |
| → tiin57 joined | 13:44 |
|
leah2
| cbb02bde (HEAD -> master, origin/master, origin/HEAD) HEAD@{1}: pull --rebase (start): checkout cbb02bdec98f37e3f7f9863dab7f88ec3471714d | 13:44 |
|
| so it didnt do anything, right? | 13:44 |
|
cdunklau
| leah2: huh | 13:45 |
|
leah2
| hmm, maybe it did | 13:45 |
|
| my previous HEAD was actually a patch i merged | 13:45 |
|
| s maybe this was legit :p | 13:46 |
| → Xiti` joined | 13:46 |
|
Jookia
| maybe the rebase was a no-op if your HEAD was identical to the origin's HEAD but diferent hashes | 13:46 |
| → init joined | 13:47 |
| ← Xiti left | 13:47 |
|
cdunklau
| leah2: what's rev-parse say for master and origin/master | 13:48 |
| → mirrorbird joined | 13:48 |
| ← bamdad left | 13:48 |
| → bamdad joined | 13:49 |
| ← bamdad left | 13:49 |
| → bamdad joined | 13:49 |
|
leah2
| well after the rebase they are the same ofc? | 13:50 |
| → Aki-lucky joined | 13:51 |
| ← Aki-lucky left | 13:51 |
| → Aki-lucky joined | 13:52 |
| → ch joined | 13:52 |
| → irc_user joined | 13:57 |
| ← Kaivo left | 13:58 |
| ← nikivi left | 13:58 |
| → nikivi joined | 13:59 |
| ← POQDavid left | 13:59 |
| → POQDavid joined | 13:59 |
| ← nikivi left | 14:00 |
| → nikivi joined | 14:00 |
| ← Xiti` left | 14:00 |
| → Kaivo joined | 14:00 |
| ← foul_owl left | 14:01 |
| → Muimi_ joined | 14:01 |
| → foul_owl joined | 14:02 |
| ← Muimi left | 14:05 |
| Muimi_ → Muimi | 14:05 |
| → rafasc joined | 14:07 |
| → howdoi joined | 14:10 |
| ← tiin57 left | 14:11 |
| ← Mattiaslndstrm left | 14:11 |
| ← sgn left | 14:14 |
| → tiin57 joined | 14:14 |
| → malmalmal joined | 14:19 |
| → [twisti] joined | 14:21 |
|
[twisti]
| can i configure the diff used by git add -p ? or in any way have to tell me what whitespace changes its asking me to stage or not ? | 14:21 |
| → oatmealraisin joined | 14:22 |
| ← reprazent left | 14:29 |
|
walidvb
| cdunklau: yeah... i'll see when/how that comes up. thanks! | 14:30 |
| → Xiti joined | 14:30 |
|
Jookia
| leah2: rebasing should apply your cahnges on top so the only thing i can think of is that for some reason rebasing was a no-op, leaving just the origin/master instead of adding a commit on top | 14:31 |
| → binarymutt joined | 14:31 |
| → stats4647 joined | 14:31 |
|
leah2
| yes, it was | 14:32 |
|
rafasc
| [twisti]: not really, but there's a contrib script: https://github.com/git/git/tree/master/contrib/git-jump | 14:32 |
|
| [twisti]: that allows you to jump to places where there are whitespace errors with: git jump ws | 14:33 |
|
| Or you could run diff --check; and over it manually. | 14:33 |
| → reprazent joined | 14:36 |
| ← tiin57 left | 14:41 |
| ← Fusl left | 14:43 |
| → Lucas_Gray joined | 14:44 |
| → Fusl joined | 14:44 |
| → tiin57 joined | 14:44 |
| ← stats4647 left | 14:45 |
| → stats4647 joined | 14:46 |
| → thiago joined | 14:46 |
| → relipse joined | 14:48 |
| → s2013 joined | 14:49 |
| ← sQVe left | 14:52 |
| ← sweatsuit left | 14:54 |
| ← mozgalom left | 14:54 |
| → sweatsuit joined | 14:57 |
| → sgn joined | 14:59 |
| → cdown_ joined | 15:07 |
| ← cdown left | 15:10 |
| cdown_ → cdown | 15:10 |
| ← tiin57 left | 15:11 |
| ← Lucas_Gray left | 15:11 |
| → Lucas_Gray joined | 15:12 |
| → tiin57 joined | 15:14 |
| → theoceaniscool joined | 15:16 |
| → tarkus joined | 15:20 |
| → AnAverageHuman joined | 15:24 |
| → mowcat joined | 15:26 |
| ← oxymoron93 left | 15:26 |
| ← mowcat left | 15:27 |
| ← kdlv left | 15:27 |
| → Papillon joined | 15:28 |
| → mir100 joined | 15:30 |
| → jmejias joined | 15:30 |
| → timvisher joined | 15:31 |
|
timvisher
| Is there a better way to check that a branch contains a commit from a script than `git branch <branch> --contains <sha>`? I'm seeing a warning that my terminal isn't fully functional when running from automation and I'm thinking that I'm smelling non-porcelain. | 15:32 |
| ← KnoP left | 15:33 |
|
timvisher
| I can always `>/dev/null 2>&1` obviously but I usually don't have to when using the right tool. | 15:33 |
|
ikke
| timvisher: git merge-base --is-ancestor | 15:33 |
|
| You are probably getting that message from the pager, although, that should not be invoked in non-interactive usage | 15:34 |
| ← malmalmal left | 15:35 |
| ← chele left | 15:36 |
| ← maxzor left | 15:36 |
| ← rfuentess left | 15:40 |
| ← tiin57 left | 15:41 |
|
timvisher
| ikke: Thank you! Just so I'm clear if I'm reading the docs correctly it would be `git merge-base --is-ancestor <sha> <branch>` which would test that <sha> is an ancestor (or not) of <branch>. Rather than where I started which was `…or <branch> <sha>` which would assert that <branch> is an ancestor of <sha>. | 15:42 |
|
| In my testing that looks correct. | 15:42 |
| → tiin57 joined | 15:44 |
| ← clara97 left | 15:45 |
| → masber2 joined | 15:46 |
|
masber2
| hi, I made the mistake of making changes in a branch different than master which should have been make into a different branch. Is there a way I can change my current branch to master, pull and then move to changes to this new branch? | 15:48 |
|
Jookia
| masber2: so you have 3 branches: A, B, and master, and you accidentally committed to A instead of B? and now you want to update master then bring changes from master in to A or B? | 15:50 |
| ← timvisher left | 15:50 |
| → timvisher joined | 15:52 |
| ← walidvb left | 15:53 |
|
timvisher
| ikke: Sorry I got kicked off if you said anything. If you did would you mind resending it? Otherwise sorry for the noise. :) | 15:54 |
|
ikke
| Didn't reply yet | 15:54 |
| ← pa left | 15:55 |
|
timvisher
| No worries. | 15:55 |
|
ikke
| But what you said appears correct | 15:56 |
|
timvisher
| Thanks. :) | 15:56 |
| → pa joined | 15:58 |
| ← tgunr left | 16:02 |
| ← noonien left | 16:02 |
|
masber2
| Jookia, I have 2 branches masber and A, I made changes in A but those changes should go to a new branch B from master. I am still in A with the changes and I have not commited yet | 16:03 |
|
| hope that clarifies... | 16:04 |
|
Jookia
| masber2: Ah. They're not comitted yet? Stash, check out master, branch from it, then stash pop | 16:04 |
| → Betal joined | 16:04 |
|
masber2
| thanks! | 16:05 |
| ← shtrb left | 16:06 |
| → scoobertron joined | 16:07 |
| → arcatech joined | 16:07 |
| ← tarkus left | 16:09 |
| → Wetmelon joined | 16:09 |
| ← timvisher left | 16:09 |
| ← AnAverageHuman left | 16:10 |
| ← tiin57 left | 16:11 |
| ← Muimi left | 16:13 |
| → mat001_ joined | 16:13 |
| ← Lucas_Gray left | 16:14 |
| → tiin57 joined | 16:14 |
| ← mat001 left | 16:16 |
| → sudoforge joined | 16:17 |
| ← squirrel left | 16:18 |
| → justanotheruser joined | 16:20 |
| ← Papillon left | 16:20 |
| → squirrel joined | 16:20 |
| → prominentpotato joined | 16:20 |
| ← prominentpotato left | 16:21 |
| → yamashitatan joined | 16:21 |
| ← dohzer left | 16:25 |
| ← tiin57 left | 16:41 |
| ← pikapika left | 16:41 |
| ← acetakwas left | 16:41 |
| → cdown_ joined | 16:41 |
| → pikapika joined | 16:41 |
| ← pikapika left | 16:42 |
| → pikapika joined | 16:42 |
| → acetakwas joined | 16:43 |
| ← cdown left | 16:44 |
| cdown_ → cdown | 16:44 |
| → tiin57 joined | 16:44 |
| ← scoobertron left | 16:45 |
| → Lucas_Gray joined | 16:46 |
|
dermoth
| Is there a way to have current screen go up in the scrollback buffer when we either clear the terminal or | 16:48 |
| → raymond joined | 16:48 |
| → aliss joined | 16:48 |
|
dermoth
| ... or start an app using a screen (vim, less, etc...) | 16:49 |
| → thomasross joined | 16:50 |
| ← arcatech left | 16:50 |
| ← opal left | 16:51 |
|
Jookia
| dermoth: did you try the scroll wheel | 16:51 |
|
dermoth
| actually, it works here...not at work | 16:52 |
|
| maybe diff version, or something different in the libraries (Debian vs RHEL7) | 16:52 |
| → mat001 joined | 16:53 |
| ← mat001_ left | 16:54 |
| ← Lucas_Gray left | 16:56 |
|
dermoth
| Ha nm, I had "URxvt.SecondaryScreen" instead of "URxvt.secondaryScreen" - and I thought that was case-insensitive anyway.... | 16:59 |
|
| clear still erases the screen but that is less of an issue, the secondary screen was really annoying though (I set it to false) | 17:00 |
| ← mir100 left | 17:00 |
| → arcatech joined | 17:01 |
| → BackupBackupNick joined | 17:01 |
|
dermoth
| I have another odd problem but having a hard time isolating it.... sometimes using ipmiconsole long lines end up in netherland, they're truncated on edge with only the last char of them (resizing doesn't help). Reset fixes it but it also clears scroll, whhich is a bit annoying. I tried tset too but it doesn't fixes it | 17:03 |
| ← Aki-lucky left | 17:03 |
| ← canadev left | 17:04 |
| ← arcatech left | 17:05 |
| → arcatech joined | 17:08 |
| ← cosimone left | 17:09 |
| ← tiin57 left | 17:11 |
| ← PJBoy left | 17:13 |
| → Human_G33k joined | 17:14 |
| → tiin57 joined | 17:14 |
| → impermanence joined | 17:15 |
| ← HumanGeek left | 17:17 |
| ← masber2 left | 17:18 |
| ← cdown left | 17:19 |
| → leeN joined | 17:20 |
| → sunova joined | 17:27 |
| → cosimone joined | 17:31 |
| ← binarymutt left | 17:31 |
| → feriman joined | 17:32 |
| ← tiin57 left | 17:41 |
| → tiin57 joined | 17:44 |
| ← aliss left | 17:50 |
| ← TomyWork left | 17:56 |
| ← macrover left | 17:58 |
| → macrover joined | 18:05 |
| → snatcher joined | 18:05 |
|
snatcher
| is there a sort of unique id for master? at least need unique id for master on github, saw some unique id (checksum?) for some releases on gihub | 18:05 |
| ← macrover left | 18:07 |
| → cd joined | 18:07 |
| → zumba_addict joined | 18:08 |
| ← T_UNIX left | 18:08 |
| ← Jookia left | 18:09 |
| → Jookia joined | 18:10 |
| ← tiin57 left | 18:11 |
| → opal joined | 18:11 |
| ← Lunatrius left | 18:14 |
| → mat001_ joined | 18:14 |
| → tiin57 joined | 18:14 |
| → Lunatrius joined | 18:15 |
|
nedbat
| snatcher: unique id in what sense? "master" is a unique id | 18:15 |
|
snatcher
| nedbat: in sens of repository/branch content | 18:16 |
| ← mat001 left | 18:16 |
| → cuppajoeman joined | 18:16 |
| → jstein joined | 18:17 |
|
nedbat
| snatcher: do you want an id that always means "current master"? and where do you want to use this id? for what? | 18:17 |
|
| snatcher: can you say more about the problem you are solving? | 18:18 |
|
j416
| snatcher: are you referring to a commit hash? | 18:18 |
| → davispuh joined | 18:18 |
| → alesan joined | 18:18 |
| ← Anticom left | 18:20 |
|
snatcher
| need to build binary pkg from master branch with version identifier represented state of branch | 18:22 |
|
osse
| snatcher: git rev-parse master | 18:23 |
| ← bocaneri left | 18:23 |
|
osse
| if you want to build something and you know the hash: git checkout hash' | 18:24 |
| → cahoots joined | 18:29 |
|
cahoots
| hi, i'd like to use "--shallow-since=" to just clone with that commit. like i can do "--shallow-since='1 day'", but that might include more commits than just the very most recent one. any ideas? | 18:30 |
| ← nelgin left | 18:31 |
| ← opal left | 18:32 |
|
j416
| cahoots: --depth | 18:33 |
|
cahoots
| j416, for various complicated reasons, i can only use shallow-since | 18:34 |
| → Mattiaslndstrm joined | 18:36 |
|
j416
| then go through the necessary hoops to arrive at a date | 18:36 |
| ← corelax left | 18:36 |
| → opal joined | 18:37 |
| ← tiin57 left | 18:41 |
| ← BackupBackupNick left | 18:42 |
| ← Betal left | 18:43 |
| ← a-l-e left | 18:44 |
| ← pikapika left | 18:44 |
| ← nikivi left | 18:44 |
| ← acetakwas left | 18:44 |
| → tiin57 joined | 18:45 |
| → acetakwas joined | 18:45 |
| → pikapika joined | 18:45 |
| → nikivi joined | 18:45 |
| ← nikivi left | 18:46 |
| → nikivi joined | 18:46 |
|
shailangsa
| does anybody know the command to git clone https://android.googlesource.com/platform/prebuilts/misc/+/refs/tags/android-7.1.2_r29/linux-x86/flex/ , im running this command https://pastebin.com/8xHgjvf4 why isnt it cloning it? | 18:47 |
|
stats4647
| shailangsa: doesn't look like the repo exists? | 18:51 |
| ← Mattiaslndstrm left | 18:51 |
|
j416
| shailangsa: git clone https://android.googlesource.com/platform/prebuilts/misc | 18:52 |
|
| shailangsa: your attempt fails because you're trying to clone something that isn't a repo | 18:52 |
|
shailangsa
| do i need to clone the whole repo if i just want this tree https://android.googlesource.com/platform/prebuilts/misc/+/refs/tags/android-7.1.2_r29/linux-x86/flex/ ? | 18:53 |
| ← feriman left | 18:53 |
| → feriman joined | 18:56 |
|
j416
| shailangsa: if the remote supports it, you can use git-archive | 18:59 |
|
| shailangsa: there is also a handy link to download that, on the site you linked to. | 19:00 |
|
| that remote does not appear to support archive. | 19:01 |
| → PJBoy joined | 19:01 |
| ch1astre → chiastre | 19:04 |
| → macrover joined | 19:06 |
| ← zumba_addict left | 19:06 |
|
shailangsa
| im tried to git clone the mentioned repo with the branch https://pastebin.com/Lqq4kwcL but it clones the whole repo again (2GB) instead of just the android-7.1.2_r29 branch , why is that? | 19:07 |
| ← pikapika left | 19:07 |
| → ekh joined | 19:07 |
| ← acetakwas left | 19:08 |
| → pikapika joined | 19:08 |
| → acetakwas joined | 19:08 |
| ← nikivi left | 19:08 |
| → nikivi joined | 19:09 |
| ← pikapika left | 19:09 |
|
cdunklau
| shailangsa: because it's a clone | 19:10 |
| → pikapika joined | 19:10 |
|
j416
| shailangsa: I don't think -b limits what gets cloned; you'll get a full clone still. | 19:10 |
|
cdunklau
| shailangsa: -b just changes what branch gets checked out | 19:10 |
|
| you probably want --single-branch | 19:10 |
| ← tiin57 left | 19:11 |
|
cdunklau
| shailangsa: or probably even `--depth 1` | 19:11 |
| → corelax joined | 19:11 |
|
j416
| shailangsa: what are you trying to achieve? | 19:11 |
|
cdunklau
| shailangsa: note that this won't help you if you want to actually work on the code | 19:11 |
| → Narrat joined | 19:12 |
|
cdunklau
| a shallow clone is for all intents and purposes read-only | 19:12 |
|
| at least, not-useful-for-contributing-upstream | 19:12 |
|
j416
| shailangsa: curl -O https://android.googlesource.com/platform/prebuilts/misc/+archive/refs/tags/android-7.1.2_r29/linux-x86/flex.tar.gz | 19:12 |
| → tiin57 joined | 19:15 |
| → mat001 joined | 19:23 |
| ← macrover left | 19:25 |
| → zumba_addict joined | 19:26 |
| ← snatcher left | 19:26 |
| ← mat001_ left | 19:27 |
| → Darcidride joined | 19:28 |
| ← PJBoy left | 19:40 |
| ← tiin57 left | 19:41 |
| ← yamashitatan left | 19:41 |
| → nurdie joined | 19:44 |
| → tiin57 joined | 19:44 |
| ← mud left | 19:45 |
| ← irc_user left | 19:46 |
| → bamdad_ joined | 19:47 |
| ← bamdad left | 19:47 |
| ← theoceaniscool left | 19:48 |
| ← pikapika left | 19:50 |
| ← acetakwas left | 19:50 |
| → pikapika joined | 19:51 |
| → acetakwas joined | 19:52 |
| ← jmejias left | 19:54 |
|
cahoots
| j416, got it, ty | 19:55 |
| → cdown joined | 19:56 |
|
shailangsa
| how did you find the https://android.googlesource.com/platform/prebuilts/misc/+archive/refs/tags/android-7.1.2_r29/linux-x86/flex.tar.gz link? | 19:57 |
| → irc_user joined | 19:57 |
|
cahoots
| j416, another q, forgetting the --shallow-since restriction, how can i shallow-clone to a specific commit (as opposed to a branch or tag)? i've run `git config --global uploadpack.allowReachableSHA1InWant true` but still not sure what to do | 19:58 |
|
j416
| shailangsa: with my eyes | 19:59 |
| → Noldorin joined | 19:59 |
| → inkbottle joined | 20:00 |
| → matelot joined | 20:00 |
| ← zebrag left | 20:00 |
| ← Maxattax left | 20:02 |
| ← zumba_addict left | 20:03 |
|
dermoth
| Jookia, wait, I was in #git all along? sorry for the spam! | 20:04 |
|
| it was meant got the urxvt channel :/ | 20:04 |
|
j416
| dermoth: :D | 20:05 |
|
| we try our best. | 20:06 |
| ← ekh left | 20:10 |
| → Betal joined | 20:10 |
| ← tiin57 left | 20:12 |
| → tiin57 joined | 20:16 |
| → Lucas_Gray joined | 20:24 |
| ← sunova left | 20:26 |
| ← alesan left | 20:27 |
| ← F0rTex left | 20:27 |
| ← cahoots left | 20:28 |
| → zumba_addict joined | 20:29 |
| → m0viefreak joined | 20:30 |
| → mir100 joined | 20:33 |
| ← mirrorbird left | 20:36 |
| → mirrorbird joined | 20:36 |
| ← cosimone left | 20:39 |
| ← gxt left | 20:39 |
| ← stormsz left | 20:40 |
| → cosimone joined | 20:41 |
| → smitop joined | 20:43 |
| → gxt joined | 20:46 |
| → Cb-Mc joined | 20:47 |
| ← crose left | 20:47 |
| → crose joined | 20:49 |
| ← arcatech left | 20:49 |
| ← zumba_addict left | 20:49 |
| ← Technodrome left | 20:51 |
| ← Cb-Mc left | 20:53 |
| ← crose left | 20:53 |
| ← jim left | 20:54 |
| ← feriman left | 20:55 |
| → tafa2 joined | 20:56 |
| → zumba_addict joined | 20:57 |
| ← zumba_addict left | 21:03 |
| → jim joined | 21:05 |
| ← dupondje left | 21:06 |
| ← gpanders left | 21:12 |
| → alesan joined | 21:13 |
| → jaziz joined | 21:14 |
| ← tiin57 left | 21:15 |
| → arcatech joined | 21:15 |
| ← ninjin_ left | 21:17 |
| → mud joined | 21:17 |
| → ninjin_ joined | 21:17 |
| → g00s joined | 21:17 |
| → F0rTex joined | 21:18 |
| ← jim left | 21:21 |
| → virmaha joined | 21:24 |
| → jim joined | 21:32 |
| ← cdown left | 21:34 |
| ← Kaivo left | 21:34 |
| → Kaivo joined | 21:37 |
| ← Darcidride left | 21:39 |
| ← imp left | 21:42 |
| → dupondje joined | 21:44 |
| ← alesan left | 21:45 |
| → alesan joined | 21:45 |
| → mat001_ joined | 21:53 |
| ← Narrat left | 21:56 |
| → zumba_addict joined | 21:57 |
| ← rafasc left | 21:57 |
| ← mat001 left | 21:57 |
| ← tpaper left | 21:59 |
| ← nikivi left | 21:59 |
| → tpaper joined | 22:00 |
| → nikivi joined | 22:00 |
| → Mattiaslndstrm joined | 22:00 |
| ← zumba_addict left | 22:01 |
| ← Mattiaslndstrm left | 22:03 |
| ← CodeSlingerPaul left | 22:03 |
| ← POQDavid left | 22:03 |
| ← pikapika left | 22:04 |
| → POQDavid joined | 22:04 |
| ← acetakwas left | 22:04 |
| → pikapika joined | 22:05 |
| ← mud left | 22:05 |
| ← jstein left | 22:05 |
| → acetakwas joined | 22:05 |
| ← dionysus69 left | 22:06 |
| → sdwrage joined | 22:07 |
| ← m0viefreak left | 22:08 |
| ← nikivi left | 22:09 |
| ← acetakwas left | 22:09 |
| ← pikapika left | 22:09 |
| → nikivi joined | 22:10 |
| → pikapika joined | 22:10 |
| → acetakwas joined | 22:11 |
| ← pikapika left | 22:12 |
| ← acetakwas left | 22:12 |
| ← nikivi left | 22:12 |
| → pikapika joined | 22:13 |
| → acetakwas joined | 22:13 |
| → nikivi joined | 22:13 |
| → Muimi joined | 22:16 |
| ← Muimi left | 22:16 |
| ← calcul0n_ left | 22:16 |
| ← irc_user left | 22:16 |
| ← alesan left | 22:17 |
| → zumba_addict joined | 22:17 |
| → ash_worksi joined | 22:18 |
|
ash_worksi
| I started a new project that looks a lot like an old project; I just want to commit it to the same repo; is there a way I can just get the .git folder for that repo and then just have it remove/add everything and call version2 ? | 22:20 |
|
| it* | 22:20 |
|
| or is that a bad idea? | 22:20 |
| ← zumba_addict left | 22:22 |
| → austin987 joined | 22:25 |
| gitinfo set mode: +v | 22:26 |
| ← virmaha left | 22:27 |
| → meLon joined | 22:28 |
|
austin987
| hi there; I'm on git-2.28.0; is there a way to use the -U feature of git diff (lines of unified diff to show) with git commit -p (partial commit)? I.e., I want to run `git commit -p`, but I need more diff context lines to see what I'm doing | 22:30 |
|
| git commit doesn't accept -U, and I don't see anything similar in the help | 22:30 |
| → yonder joined | 22:31 |
| ← leeN left | 22:32 |
| → mat001 joined | 22:32 |
| ← sdwrage left | 22:33 |
| → mowcat joined | 22:34 |
| ← mat001_ left | 22:36 |
| → zumba_addict joined | 22:38 |
| → mckendricks joined | 22:40 |
| ← zumba_addict left | 22:43 |
| → budonyc joined | 22:52 |
| → zumba_addict joined | 22:54 |
| ← justanotheruser left | 22:55 |
| → justanotheruser joined | 22:55 |
| ← zumba_addict left | 22:59 |
| → Xenguy joined | 23:03 |
| ← cosimone left | 23:04 |
| ← vdamewood left | 23:06 |
| → Beta joined | 23:12 |
| ← Betal left | 23:12 |
| → cosimone joined | 23:17 |
| ← gast0n left | 23:22 |
| → maxzor joined | 23:23 |
| ← opal left | 23:24 |
|
mackerman
| ash_worksi: If you are going to re-add everything, don't bother deleting. Edit the changelog and metadata to call it version 2, and git tag it as such. | 23:34 |
| ← matelot left | 23:36 |
| → opal joined | 23:37 |
| → alesan joined | 23:38 |
| ← vngx left | 23:42 |
| → AnAverageHuman joined | 23:45 |
| ← mckendricks left | 23:45 |
| ← acetakwas left | 23:46 |
| → acetakwas joined | 23:47 |
| ← ash_worksi left | 23:47 |
| ← nikivi left | 23:47 |
| → nikivi joined | 23:48 |
| ← AnAverageHuman left | 23:53 |