| 2019-08-30 |
| ← surfist left | 00:00 |
| → surfist joined | 00:00 |
| qpdb → Guest15341 | 00:05 |
| ← Guest15341 left | 00:05 |
| → omnireq joined | 00:05 |
| → qpdb joined | 00:05 |
| → durham joined | 00:09 |
| ← fphilipe_ left | 00:10 |
| → nerosnm joined | 00:12 |
| ← Fernando-Basso left | 00:13 |
| ← z1haze left | 00:13 |
| ← durham left | 00:14 |
| def_jam → eblip | 00:16 |
| ← nerosnm left | 00:18 |
| ← libertyprime left | 00:20 |
| → doug16k joined | 00:22 |
| ← learningc left | 00:25 |
| → fatalhalt joined | 00:30 |
| → learningc joined | 00:36 |
| ← doug16k left | 00:40 |
| → fphilipe_ joined | 00:46 |
| → g00s joined | 00:50 |
| → liberiga joined | 00:54 |
| ← davidfetter_work left | 00:56 |
| → rafalcpp_ joined | 00:56 |
| ← rafalcpp left | 00:57 |
| ← Oatmeal left | 01:02 |
| → doug16k joined | 01:05 |
| → magic_ninja_work joined | 01:08 |
| ← F0rTex left | 01:12 |
| → F0rTex joined | 01:14 |
| ← liberiga left | 01:16 |
| → welovfree joined | 01:16 |
| ← welovfree left | 01:16 |
| → nerosnm joined | 01:20 |
| ← fphilipe_ left | 01:21 |
| ← nerosnm left | 01:24 |
| ← AtumT left | 01:29 |
| → supernovah joined | 01:30 |
|
supernovah
| this channel consistently drops me more than others, it's really weird | 01:30 |
|
rafasc
| the algorithm doesn't like you | 01:32 |
| → Oatmeal joined | 01:42 |
| → nerosnm joined | 01:42 |
| ← nerosnm left | 01:47 |
| → fphilipe_ joined | 01:49 |
| → LearnAllTheTime joined | 01:52 |
| ← ferdna left | 01:54 |
| → ybyourmom joined | 01:57 |
|
ybyourmom
| Hey, when I submit a patchset to this particular project, they squash all my commits down before merging it | 01:57 |
|
| How do I rebase on top of their squashed commit inside of my local working branch? | 01:58 |
|
| I'd like to know if there's a clean way to rebase on top of master after they squashed a bunch of my commits down | 01:58 |
|
rafasc
| ybyourmom: you mean your branch have some more commits, after you gave them the patch? | 02:01 |
| ← Sasazuka left | 02:01 |
|
rafasc
| and you want to rebase said commits onto their branch? | 02:02 |
|
ybyourmom
| No, I have say, 5 commits in addition to master -- I submitted a pull request, and they accepted it, and then they merged my 5 commits into master | 02:02 |
|
| But when they merged my 5 commits, they squashed them down into 1 single commit | 02:02 |
|
| Now I want to merge/rebase the new master into my dev branch | 02:03 |
|
| But git can't automatically deduce that my 5 commits are now incorprorated into master | 02:03 |
|
| Because the upstream developers went and squashed the 5 commits into 1 | 02:03 |
|
rafasc
| why do you say git can't deduce that? | 02:04 |
|
ybyourmom
| Because in practice when I try to `git pull --rebase upstream master`, git detects the content conflicts as merge conflicts | 02:05 |
|
| Is there a way to do things such that git will deduce it? | 02:05 |
|
rafasc
| git doesn't deduce anything, that's the problem. | 02:06 |
|
ybyourmom
| git will filter out commits in the master branch that match those in your dev branch | 02:06 |
|
| If you *don't* squash the commits down in the master branch | 02:06 |
| → atrigent joined | 02:07 |
|
ybyourmom
| the problem is that because these people squash the commits down, git can't detect that that 1 squashed commit is actually those 5 commits in my dev branch, which it would usually have just filtered out | 02:07 |
|
| I'm asking | 02:07 |
|
rafasc
| ybyourmom: I think you have the wrong mental model for git. | 02:07 |
|
ybyourmom
| I'm fairly confident that you're right | 02:08 |
|
| Thank god I'm in the #git channel with you though -- I guess that's why I came in here asking | 02:08 |
|
rafasc
| I didn't mean that as an offence. Sorry if it sounded like that. | 02:09 |
|
ybyourmom
| It's np | 02:09 |
|
| I guess the question is, do you think you understand the scenario I'm describing? | 02:09 |
|
| Normally, for the 3 years I've been working with git, it's been filtering out the commits that overlap between my dev branch and the upstream master | 02:09 |
|
| Now I'm dealing with a new project where they squash, and it's hampering me | 02:10 |
|
rafasc
| can you post your !situation? | 02:10 |
|
gitinfo
| Please post the url returned by `git log -n 20 --all --graph --format="%h %p %d %s" | curl -F text=@- https://upaste.de/` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain) | 02:10 |
|
vishal
| ybyourmom: did you read the 'recovering from upstream rebase' section in the man page? | 02:10 |
|
ybyourmom
| vishal: no | 02:11 |
|
| Is that what I should be reading? | 02:11 |
|
vishal
| that should be a good starting point | 02:11 |
|
ybyourmom
| Thanks | 02:11 |
|
rafasc
| the problem would be easier to explain if you provided the actual example you're at. | 02:11 |
|
| ybyourmom nods, secd | 02:12 |
|
ybyourmom
| https://upaste.de/Zo4 | 02:13 |
|
rafasc
| ok, so they squash merged your "exasock-packetdrill-tests" into master. | 02:14 |
|
ybyourmom
| yes | 02:15 |
|
| And my attempts to `git pull --rebase` fail | 02:15 |
|
rafasc
| on master? | 02:15 |
|
ybyourmom
| No, my current branch in my local git here is my own dev branch | 02:16 |
|
| I'd like to know if the only way to recover here is to `git reset --hard` and then `git cherry-pick` | 02:16 |
|
| Or, maybe I should squash my commits on my own branch to match their squash | 02:16 |
| ← kerframil left | 02:17 |
|
ybyourmom
| (And then execute the `git pull --rebase`) | 02:18 |
|
vishal
| did you try the --onto option to rebase described in that section? that /should/ be able to recover from this, barring any conflicts from any changes they may have made during the ssquash | 02:18 |
|
rafasc
| vishal: what I am trying to understand, (and failing), is where the --onto should be. | 02:19 |
|
ybyourmom
| vishal: no, I haven't finished reading it yet | 02:19 |
|
| I'm still trying to see if there's a canned answer somebody can give m | 02:19 |
|
rafasc
| unfortunately, the dev branch isn't in the paste. | 02:19 |
|
ybyourmom
| I'm perfectly fine with giving you more information in the paste; if you tell me how, I'll do it | 02:20 |
|
vishal
| --onto master-with-squashed-changes dev~n where n is the number of commits you're transplanting | 02:21 |
|
rafasc
| vishal: but that may replay commits that were already squashed. | 02:22 |
| → libertyprime joined | 02:22 |
|
vishal
| is there not a clean 'break' point on your dev branch for the stuff that was merged in vs that's pending? | 02:23 |
|
rafasc
| I mean, depending on how you choose ~n | 02:23 |
|
vishal
| I'd imagine not choose the things that went in :) | 02:23 |
|
ybyourmom
| vishal: I can manage my workflow to make sure that there is always a clear dividing point | 02:24 |
|
rafasc
| git log --graph --online --bounday dev...origin/master | 02:24 |
|
vishal
| even if tehre is not a clean dividing point, just rebasse -i your branch to drop the merged commits selectively.. but that becomes a bit more manual than is ideal.. | 02:25 |
|
ybyourmom
| Pretty much | 02:25 |
| ← fphilipe_ left | 02:25 |
|
ybyourmom
| I'm feeling partial to just manually rebasing my dev branch to manually squash the exact same commits they did, and then just doing to normal `git pull --rebase` after that | 02:26 |
|
| It'll give me the smooth behaviour I want with less work | 02:26 |
|
| I'll read vishal 's recommendations and decide if his thing is better | 02:26 |
|
vishal
| you won't have the same hashes as upstream, so you'll probably still run into the same problem | 02:26 |
|
rafasc
| ybyourmom: would you mind pasting the second command I gave you? | 02:29 |
|
ybyourmom
| Sure, sorry | 02:29 |
| ← boombatower left | 02:29 |
|
rafasc
| no problem. I am just curious if your situation is easily solvable with a rebase --onto | 02:29 |
|
ybyourmom
| rafasc: fatal: unrecognized argument: --online | 02:30 |
|
rafasc
| --oneline | 02:30 |
|
| sorry | 02:30 |
|
ybyourmom
| Ah | 02:30 |
|
rafasc
| I keep making that mistake. | 02:31 |
|
ybyourmom
| https://upaste.de/hBx | 02:31 |
|
| Happens to the biggest dicked among us | 02:31 |
| ← bdonnahue left | 02:32 |
| → bdonnahue joined | 02:34 |
| → malina joined | 02:35 |
| ← jab416171 left | 02:36 |
|
rafasc
| ybyourmom: so, the divergence is pretty small... was 5d200c4, was the squash of two commits right? 4d63b41 and e4b5327 | 02:36 |
|
| and you have 91df33f still on your branch, that wasn't included. (going from origin/kofi/exasock-packetdrill-tests) | 02:38 |
|
| if that's the case, git rebase --onto origin/master exasock-packetdrill-tests~1 exasock-packetdrill-tests | 02:39 |
|
| since it's a simple divergence, there are multiple ways you could achieve the same thing. git reset --hard origin/master; git cherry-pick 91df33f; would be another way. | 02:40 |
|
craftyguy
| what might cause fetch to hang on rev-list (seen by setting GIT_TRACE) when fetching a remote over ssh? it happens on any remote/repo I try to fetch over ssh. fetching over http works.. | 02:41 |
|
vishal
| rev-list is probably jsut the last thing it does, but isn't hanging on it - I'd look harder on the ssh vs http side of things | 02:42 |
|
rafasc
| ybyourmom: the problem with pull --rebase, is that it will try to apply 4d63b41,e4b5327,91df33f individually. But since you know the first two are already squashed you can skip those. | 02:42 |
|
vishal
| e.g. open ports, correct paths/creds etc | 02:42 |
|
craftyguy
| vishal: oh, maybe trying to ssh manually to the remote or something? | 02:42 |
|
rafasc
| craftyguy: also try GIT_TRACE2=1 | 02:43 |
|
vishal
| sure! | 02:43 |
|
craftyguy
| GIT_TRACE2 shows a bit more info: https://bpaste.net/show/eBOQ | 02:44 |
|
| I can ssh to [email@hidden.address] (the remote in this case). I have other repos with different remotes (e.g. sr.ht, a private git I run, etc) that all show the same issue though.. ssh to them works, but git indefinitely fails to fetch over ssh | 02:45 |
| ← rafalcpp_ left | 02:45 |
| → rafalcpp_ joined | 02:46 |
|
craftyguy
| the failure mode is that it hangs indefinitely, is what I should say | 02:46 |
|
rafasc
| but did that hang? | 02:47 |
|
craftyguy
| setting GIT_TRACE2=1 and calling 'git fetch' hung. is that what you are asking? | 02:48 |
|
rafasc
| yes, there's also GIT_TRACE_PACKET=1 | 02:48 |
|
craftyguy
| (it's still hung, 5 minutes later) | 02:48 |
|
rafasc
| but not sure how that would help | 02:49 |
| → nerosnm joined | 02:50 |
|
craftyguy
| definitely a lot more stuff printed to terminal, but it still hangs | 02:51 |
|
| I see refs in the remote printed to terminal, that is | 02:51 |
|
| before it hangs | 02:52 |
| ← PityDaFool left | 02:52 |
|
rafasc
| I think what is missing is the pkt-line.c:80 packet: fetch> 0000 | 02:52 |
|
| that's the server telling it finished sending. | 02:52 |
| → AfroThundr|main joined | 02:53 |
|
craftyguy
| oh, I actually do see that with GIT_TRACE_PACKET, but it stops immediately after that and hangs: 19:49:40.110484 pkt-line.c:80 packet: fetch> 0000 | 02:54 |
| → causa_sui joined | 02:54 |
| lagothrix → Guest95757 | 02:54 |
| ← Guest95757 left | 02:54 |
| → lagothrix joined | 02:54 |
| ← nerosnm left | 02:54 |
|
craftyguy
| the last bit of the output: https://bpaste.net/show/yfES | 02:55 |
|
rafasc
| after that, I think it's kicks the garbage collector. | 02:55 |
| ← jinsun left | 02:55 |
| ← Cabanossi left | 02:57 |
| ← AfroThundr|main left | 02:58 |
|
rafasc
| craftyguy: right after that, I get child_exit[0] pid:16309 code:0 elapsed:6.038865 Which is the ssh process. | 02:58 |
|
| So for some reason, your ssh command is not finishing.. | 02:58 |
|
craftyguy
| rafasc: thanks for helping, I appreciate it | 02:59 |
|
| ssh works when connecting to other systems, so I have no clue why it would not work when git is using it :( | 02:59 |
|
rafasc
| I think I cannot help you much more than that. | 02:59 |
|
craftyguy
| no problem, I might be a bit closer to the issue in any case :P | 03:00 |
|
rafasc
| If you said you are seeing the refs, it means it is working.. | 03:00 |
| ← MACscr left | 03:00 |
| → AfroThundr|main joined | 03:00 |
|
rafasc
| it's just not working as it should, I guess. | 03:00 |
| → fphilipe_ joined | 03:01 |
|
craftyguy
| yea, I guess that's what I meant.. it's not behaving | 03:01 |
|
rafasc
| anyway, if you find the problem let us know. | 03:01 |
|
craftyguy
| yea, definitely. I know this channel is logged :) | 03:01 |
| ← _ADN_ left | 03:03 |
| ← cbreak left | 03:03 |
| → _ADN_ joined | 03:03 |
| → cbreak joined | 03:03 |
|
craftyguy
| seems like the issue is caused by ssh ControlMaster/Path | 03:06 |
|
| if those are set, git gets stuck. if they are not set, git over ssh works | 03:06 |
|
| I set that up a loooooong time ago, so I'm not yet sure why this is suddenly a problem | 03:06 |
|
vishal
| interesting - you dont' really need ssh multiplexing for gitlab, do you? or have you just set it globally? | 03:07 |
|
craftyguy
| vishal: I have it set globally | 03:07 |
|
| the problem wasn't just gitlab, it was any remote I tried to fetch from over ssh | 03:07 |
| → Cabanossi joined | 03:07 |
|
craftyguy
| including one on my local network | 03:08 |
|
vishal
| seems like gi, for some reason, waits for the connection to terminate | 03:10 |
|
ybyourmom
| rafasc: thanks, I'm looking into it | 03:10 |
|
craftyguy
| vishal: yea that was my conclusion as well. I rolled back to git 2.22 and can reproduce it. ssh on my system is 8.0p1 which is almost a month old, and I've definitely fetched over ssh since then. so I have no idea what changed | 03:12 |
| → nerosnm joined | 03:12 |
|
craftyguy
| actually that openssh version is a lot older than a month, my distro just updating packaging a month ago | 03:13 |
|
vishal
| just to confirm, can you try running it with GIT_SSH_COMMAND set to ssh 2>/dev/null | 03:15 |
| → welovfree joined | 03:16 |
| ← nerosnm left | 03:17 |
| → zefferno joined | 03:17 |
| ← bket left | 03:23 |
|
craftyguy
| vishal: still hangs when the multiplex stuff is enabled | 03:23 |
|
vishal
| craftyguy: what if you drop ControlPersist down to say 10s | 03:27 |
|
| i expect that'll fix it but doesn't really get us any closer to root causing it :) | 03:27 |
| Hoffman → Jesus_Christ | 03:28 |
| → Goplat joined | 03:28 |
| ← welovfree left | 03:28 |
|
craftyguy
| vishal: surprisingly, it doesn't fix it. it still hangs | 03:29 |
|
vishal
| for over 10s? :) | 03:30 |
|
craftyguy
| even tried 'ControlPersist 1' just to be sure | 03:30 |
|
vishal
| try 0 just to be really really sure :) | 03:30 |
|
| vishal running out of ideas though | 03:30 |
|
craftyguy
| 'ControlPersist no' works, but it causes it to terminate immediately :P | 03:31 |
|
| so multiplexing wouldn't work elsewhere | 03:31 |
|
vishal
| right.. making it pointless :) | 03:31 |
|
craftyguy
| no worries, I've been out of ideas for ~30 minutes, so I really appreciate the help | 03:32 |
| ← iam730 left | 03:35 |
| ← fphilipe_ left | 03:36 |
| → bket joined | 03:36 |
| → iam730 joined | 03:37 |
| → nic-hartley joined | 03:38 |
| → finn0 joined | 03:39 |
| ← libertyprime left | 03:49 |
| ← apetresc left | 03:50 |
| → apetresc joined | 03:51 |
| → rchavik joined | 03:52 |
| ← pie_ left | 03:52 |
| → SkarmoutsosV joined | 03:55 |
| → libertyprime joined | 03:56 |
| ← xelxebar left | 04:01 |
| → xelxebar joined | 04:02 |
|
finn0
| Can I adjust the length of a hunk when adding hunk of modified contents in working tree using command `git add -p a.txt`? because one of the hunk covers two different change which I want to commit in seperate commits. I learnt this method of separating changes in different commits in git-stash(1) "#Testing partial commits" example. | 04:04 |
| → patrick042 joined | 04:07 |
| → fphilipe_ joined | 04:09 |
| ← paddy left | 04:10 |
| ← bn_work left | 04:11 |
| → fjellfras joined | 04:16 |
| ← malina left | 04:18 |
|
rafasc
| finn0: you can split (s), and if that isn't enough, you can edit(e) the patch itself. | 04:22 |
|
ybyourmom
| later alligators | 04:23 |
| ← ybyourmom left | 04:23 |
| → dartmouthed joined | 04:27 |
| → veegee joined | 04:32 |
| ← m0viefreak left | 04:33 |
| ← fatalhalt left | 04:38 |
| → nerosnm joined | 04:43 |
| ← fphilipe_ left | 04:46 |
| → kapilp_ joined | 04:47 |
| ← nerosnm left | 04:47 |
| → tsdh joined | 04:47 |
| ← magic_ninja left | 04:49 |
|
finn0
| rafasc: How? I'm new to git. Could you point me to the documentation or any article related to this? | 04:49 |
| ← magic_ninja_work left | 04:50 |
|
rafasc
| I don't know of any articles on this. | 04:51 |
|
| finn0: but for git add -p, it should be simple. | 04:51 |
|
| when the hunk shows, just press s. | 04:51 |
|
| it will split it into smaller chunks you can accept. | 04:52 |
| ← SkarmoutsosV left | 04:52 |
|
rafasc
| with e) you have to follow the "rules" that are described on the comment. | 04:52 |
|
| basically, if you want to ignore a + line, you delete it. | 04:53 |
|
| if you want to ignore a - line, you delete the -, and put a space in its place. | 04:53 |
|
| (in vim , r<space>) is a good way to do it. | 04:53 |
| ← AfroThundr|main left | 04:54 |
|
rafasc
| then those changes get added to the index, you can commit them, and do another add -p pass. | 04:54 |
|
| rinse and repeat as much as needed. | 04:54 |
| → AfroThundr|main joined | 04:54 |
| → magic_ninja_work joined | 04:58 |
|
finn0
| don't need any article. git-add(1) man page covers it in detail. Thanks for detailed explaination :) | 05:01 |
| → pks_ joined | 05:02 |
| ← pks left | 05:03 |
| pks_ → pks | 05:03 |
|
rafasc
| finn0: also, note that reset/restore/checkout/stash/add all have -p, but the way you edit patches are slightly different. | 05:05 |
|
| but there's always a note in the comments explaining. | 05:06 |
| → fphilipe_ joined | 05:15 |
| → rainmanjam joined | 05:20 |
| ← MoziM left | 05:23 |
| ← rafasc left | 05:27 |
| → nerosnm joined | 05:28 |
| ← rainmanjam left | 05:28 |
| ← fructose left | 05:30 |
| Milos_ → Milos | 05:31 |
| ← nerosnm left | 05:32 |
| → fructose joined | 05:33 |
| → Silenced joined | 05:33 |
| ← Silenced left | 05:38 |
| ← atrigent left | 05:39 |
| ← stutter left | 05:43 |
| → abbiya joined | 05:43 |
| ← rchavik left | 05:47 |
| ← foul_owl left | 05:52 |
| ← magic_ninja_work left | 05:53 |
| → MoziM joined | 05:57 |
| → tufteddeer joined | 05:57 |
| → magic_ninja_work joined | 05:59 |
| → atrigent joined | 06:00 |
| → chele joined | 06:00 |
| ← tufteddeer left | 06:02 |
| → lalitmee joined | 06:05 |
| → tufteddeer joined | 06:08 |
| → pionen joined | 06:09 |
| → foul_owl joined | 06:09 |
| ← pionen left | 06:09 |
| ← Anthaas left | 06:11 |
| → Anthaas joined | 06:13 |
| → sQVe joined | 06:13 |
| ← nic-hartley left | 06:15 |
| → Noti joined | 06:20 |
| ← fjellfras left | 06:24 |
| ← Raimondi left | 06:26 |
| → fjellfras joined | 06:27 |
| ← g2anj left | 06:29 |
| → SteffanW joined | 06:30 |
| → Raimondi joined | 06:30 |
| ← Noti left | 06:31 |
| ← iNs left | 06:35 |
| ← zefferno left | 06:35 |
| → iNs joined | 06:35 |
| ← finn0 left | 06:35 |
| → rafalcpp joined | 06:35 |
| ← rafalcpp_ left | 06:36 |
| ← rafalcpp left | 06:36 |
| ← Raimondi left | 06:37 |
| → Mattiaslndstrm joined | 06:39 |
| ← g00s left | 06:40 |
| → Raimondi joined | 06:40 |
| ← Mattiaslndstrm left | 06:42 |
| ← Oatmeal left | 06:43 |
| → MACscr joined | 06:43 |
| → Mattiaslndstrm joined | 06:43 |
| ← lalitmee left | 06:45 |
| → Noti joined | 06:46 |
| ← SteffanW left | 06:47 |
| ← magic_ninja_work left | 06:47 |
| ← khisanth_ left | 06:55 |
| ← lankanmon left | 06:57 |
| → lmln joined | 06:58 |
| → oxymoron93 joined | 06:59 |
| → nerosnm joined | 07:00 |
| ← mrCyborg left | 07:02 |
| → finn0 joined | 07:02 |
| → mrCyborg joined | 07:03 |
| ← nerosnm left | 07:04 |
| → Jackneill joined | 07:05 |
| → ppang joined | 07:06 |
| → Phylock joined | 07:08 |
| ← z|bandito left | 07:12 |
| → khisanth_ joined | 07:13 |
| → SteffanW joined | 07:15 |
| ← Noti left | 07:15 |
| ← yonder left | 07:19 |
| → Silenced joined | 07:21 |
| ← Silenced left | 07:24 |
| → fphilipe joined | 07:25 |
| → T_UNIX joined | 07:28 |
| ← fphilipe_ left | 07:28 |
| → pyfgcr joined | 07:31 |
| → g2anj joined | 07:31 |
| ← igemnace left | 07:32 |
| ← mooasaurus left | 07:35 |
| → mooasaurus joined | 07:36 |
| → TomyWork joined | 07:36 |
| → Noti joined | 07:38 |
| ← SteffanW left | 07:38 |
| → lalitmee joined | 07:41 |
| ← fphilipe left | 07:49 |
| ← MoziM left | 07:49 |
| → clime joined | 07:50 |
| ← lalitmee left | 07:50 |
| → MoziM joined | 07:51 |
| → lalitmee joined | 07:54 |
| → feriman joined | 07:55 |
| → cd joined | 07:55 |
| ← cd left | 07:56 |
| ← feriman left | 07:57 |
| → feriman joined | 07:57 |
| → dege joined | 08:01 |
| → fphilipe joined | 08:02 |
| ← hussam left | 08:04 |
| ← lalitmee left | 08:05 |
| → lalitmee joined | 08:05 |
| → rople joined | 08:05 |
| ← rople left | 08:07 |
| ← alystair left | 08:11 |
| → hussam joined | 08:13 |
| ← lalitmee left | 08:14 |
| ← pyfgcr left | 08:15 |
| → lalitmee joined | 08:16 |
| ← xcm left | 08:16 |
| → xcm joined | 08:16 |
| ← Joel left | 08:19 |
| → floppydh joined | 08:20 |
| ← sinhue left | 08:20 |
| → sinhue joined | 08:20 |
| → Viking667 joined | 08:21 |
|
Viking667
| really quick question. Has anyone tried installing and running git under wine? | 08:22 |
|
| I've had a not quite so good response. | 08:22 |
|
avu
| why would anyone want to do that though? :) | 08:23 |
|
Viking667
| I have a program that runs under Windows, that calls git for one of the things it does. The program doesn't have a Linux equivalent. | 08:24 |
|
| (as in, Dolphin Smalltalk doesn't run natively on Linux) | 08:24 |
| → Joel joined | 08:27 |
| → mimajof joined | 08:28 |
| → nerosnm joined | 08:28 |
| ← jakobvarmose left | 08:30 |
| → cd joined | 08:31 |
| → jakobvarmose joined | 08:32 |
| ← nerosnm left | 08:33 |
| → agowa338 joined | 08:35 |
| → figuinhas joined | 08:37 |
| ← Anthaas left | 08:40 |
| → Anthaas joined | 08:41 |
| ← mika left | 08:41 |
| ← finn0 left | 08:46 |
| → pks_ joined | 08:51 |
| ← pks left | 08:53 |
| pks_ → pks | 08:53 |
| ← ephemer0l_ left | 08:59 |
| ← pks left | 09:04 |
| → pks joined | 09:06 |
| → mika joined | 09:13 |
| ← Goplat left | 09:23 |
| → ave_milia joined | 09:25 |
| → [twisti] joined | 09:26 |
|
[twisti]
| can i somehow make a .gitattributes rule that covers files with specifically NO file ending ? i dont want the rule to just cover all files, just files with no ending | 09:26 |
| ← pks left | 09:28 |
| ← zamba left | 09:34 |
| ← tombusby left | 09:34 |
| → pyfgcr joined | 09:35 |
| → tombusby joined | 09:35 |
| → howdoi joined | 09:36 |
| → ephemer0l_ joined | 09:36 |
|
_ikke_
| [twisti]: no, that does not exist | 09:38 |
| ← learningc left | 09:39 |
|
[twisti]
| bleh. thank you. at least i can stop searching then | 09:40 |
| patrick042 → paddy | 09:41 |
| ← mika left | 09:42 |
| → zamba joined | 09:42 |
| ← [twisti] left | 09:47 |
| → igemnace joined | 09:57 |
| → nerosnm joined | 09:58 |
| ← nerosnm left | 10:03 |
| ← pyfgcr left | 10:07 |
| ← thijso left | 10:08 |
|
f8e3
| is it Docs.md or DOCS.md like readme too? | 10:10 |
|
GyrosGeier
| that's just a convention | 10:12 |
|
| the README being written uppercase is a convention from the eighties | 10:13 |
|
| because back then, ls sorted files by ASCII value, and you'd use lowercase characters for all other files, so README sorted first | 10:13 |
|
| also, it stands out a bit | 10:14 |
| → nerosnm joined | 10:14 |
| → paws_ joined | 10:16 |
|
f8e3
| aye ok | 10:16 |
| ← fjellfras left | 10:18 |
| → learningc joined | 10:19 |
| ← Phylock left | 10:19 |
| → ilogger2 joined | 10:24 |
| → redrabbit joined | 10:24 |
| → uidzer0 joined | 10:24 |
| → karoshii joined | 10:24 |
| → bin_bash joined | 10:24 |
| → PacKetSlayer joined | 10:24 |
| → timthowtdi joined | 10:25 |
| → SirFunk joined | 10:25 |
| → kegster joined | 10:25 |
| → d^sh joined | 10:25 |
| → uplime^ joined | 10:25 |
| → waveclaw joined | 10:26 |
| → qgTG joined | 10:26 |
| → Lunatrius joined | 10:26 |
| → raatiniemi joined | 10:26 |
| → MACscr joined | 10:26 |
| → squirrel joined | 10:26 |
| → scivola joined | 10:26 |
| → Defcronyke joined | 10:27 |
| → yuljk joined | 10:27 |
| → Mattiaslndstrm joined | 10:27 |
| → mowcat joined | 10:27 |
| → sborza joined | 10:27 |
| → bleb joined | 10:27 |
| → tkazi joined | 10:27 |
| → NightMonkey joined | 10:27 |
| → rigid joined | 10:27 |
| → dansan joined | 10:27 |
| → mescalinum joined | 10:27 |
| → zerogue joined | 10:27 |
| → alip joined | 10:27 |
| → yourfate joined | 10:27 |
| → Milos joined | 10:27 |
| → donofrio joined | 10:27 |
| → WSDMatty joined | 10:27 |
| → flying_sausages joined | 10:27 |
| → Ram-Z joined | 10:27 |
| → mu joined | 10:27 |
| → wolfshappen joined | 10:27 |
| → Karyon joined | 10:27 |
| → raven-au joined | 10:28 |
| → dgw joined | 10:28 |
| → cdown joined | 10:28 |
| → ldh joined | 10:28 |
| → ChrisLane joined | 10:28 |
| → webstrand joined | 10:28 |
| → Noti joined | 10:28 |
| ← donofrio left | 10:28 |
| → donofrio joined | 10:28 |
| → immae joined | 10:28 |
| → n000g joined | 10:29 |
| → nkuttler joined | 10:29 |
| → j7k6 joined | 10:29 |
| → remedan joined | 10:29 |
| → afoo joined | 10:29 |
| → ikonia joined | 10:29 |
| → sunri5e joined | 10:29 |
| → wyoung joined | 10:29 |
| → deltab joined | 10:29 |
| → Rhonda joined | 10:29 |
| → lavalike joined | 10:29 |
| → justanotheruser joined | 10:29 |
| → nasamuffin joined | 10:29 |
| → brethil joined | 10:29 |
| → blaisebool joined | 10:29 |
| → mooasaurus joined | 10:29 |
| → g2anj joined | 10:30 |
| → royal_screwup21 joined | 10:30 |
| → unreal joined | 10:31 |
| → rkta joined | 10:31 |
| → SCHAPiE joined | 10:31 |
| ← Mattiaslndstrm left | 10:32 |
| → kjartan joined | 10:32 |
| → Mattiaslndstrm joined | 10:33 |
| → Phylock joined | 10:33 |
| → chele joined | 10:33 |
| → Swant joined | 10:33 |
| → kini joined | 10:33 |
| → kgz joined | 10:34 |
| → bipolar joined | 10:34 |
| → cim209 joined | 10:34 |
| → finn0 joined | 10:35 |
| → SteffanW joined | 10:36 |
| → Ekho joined | 10:36 |
| ← Noti left | 10:37 |
| → pinux joined | 10:39 |
| → apetresc joined | 10:40 |
| → jabular joined | 10:40 |
| → tribly joined | 10:40 |
| → doug16k joined | 10:41 |
| → Chaser joined | 10:41 |
| → foul_owl joined | 10:41 |
| → learningc joined | 10:41 |
| ← pinux left | 10:42 |
| → Tobbi_ joined | 10:45 |
| → mika joined | 10:48 |
| → bolovanos joined | 10:48 |
| → jaeckel joined | 10:49 |
| ← bolovanos left | 10:49 |
| → bolovanos joined | 10:50 |
| → pks joined | 10:52 |
| → nerosnm joined | 10:53 |
|
f8e3
| git remote add foo <can use hostname istead of ip here?> | 10:55 |
| → crose joined | 10:55 |
|
f8e3
| its desktop on the local wifi | 10:56 |
|
| but dynamic adresses change thats why i ask | 10:56 |
|
GyrosGeier
| absolutely | 10:57 |
| ← nerosnm left | 10:57 |
|
f8e3
| i have two computers with same hostname 'debian' on the local lan? | 10:59 |
|
| can i use MAC, (i dont want static ip in route rmenue although possible) | 10:59 |
|
GyrosGeier
| no, MAC addresses are not visible to git | 11:01 |
|
| your zeroconf setup should try to give you stable hostnames | 11:01 |
|
| also, I'd rename at least one of the machines | 11:02 |
|
f8e3
| changed static hostname with hostnamectl, new add to repo: ssh: Could not resolve hostname debian-mbox: Name or service not known | 11:04 |
|
| hostA cant push since hostB (whose name changed not hostname-findable) | 11:05 |
|
GyrosGeier
| do you have a zeroconf/mdns setup where you can resolve names like "debian.local"? | 11:05 |
|
| the .local might be mandatory unless it's in your search path | 11:06 |
|
Viking667
| f8e3: how the heck did you manage that little trick? | 11:06 |
|
| Normally if two hosts have the same name, there's trouble in the DNS server. | 11:06 |
| → emsjessec joined | 11:07 |
|
GyrosGeier
| well, the DNS server needs to be told first | 11:08 |
|
Viking667
| f8e3: First, can you ping its ip? Then, can you ping it by hostname? | 11:08 |
|
GyrosGeier
| there are so many historic ways to get hostname lookup on a LAN | 11:08 |
|
Viking667
| Agreed. Those are the two I use to begin with, they have the advantage of working on any OS. | 11:09 |
| → parsnip joined | 11:10 |
|
f8e3
| no trick just install deb hostname=debian; i told the router to chagne hostname of the pingable ip, now it is ok | 11:10 |
|
Viking667
| And doesn't hostnamectl only change /etc/hostname ? | 11:11 |
|
| f8e3: cool. | 11:11 |
|
| Anyhow, I'm out of here. | 11:11 |
|
| bye all | 11:11 |
|
f8e3
| thank yall | 11:11 |
| → lalitmee joined | 11:11 |
| ← g2anj left | 11:12 |
| ← mowcat left | 11:12 |
| → luis joined | 11:16 |
| → nerosnm joined | 11:17 |
| gitinfo set mode: +v | 11:17 |
| → g2anj joined | 11:21 |
| ← crose left | 11:22 |
|
f8e3
| On Permission denied (publickey). do i need to generete new ssh keys and copy the pubkey to the target push host? | 11:22 |
|
| or can i use whats in ~/.ssh *.pub ? | 11:22 |
| ← SteffanW left | 11:22 |
| → SteffanW joined | 11:23 |
| → jimender2 joined | 11:24 |
| ← nerosnm left | 11:25 |
| → jottr_ joined | 11:26 |
| → rafasc joined | 11:28 |
| ← learningc left | 11:31 |
| → mischief joined | 11:33 |
| → mns joined | 11:34 |
| ← lalitmee left | 11:36 |
| ← Mattiaslndstrm left | 11:37 |
| → tens0r joined | 11:37 |
| → Silenced joined | 11:38 |
|
GyrosGeier
| f8e3, you can use what's there | 11:40 |
|
| ssh-copy-id(1) is useful too | 11:40 |
| → lalitmee joined | 11:45 |
| ← tens0r left | 11:46 |
| → Noti joined | 11:47 |
| ← SteffanW left | 11:47 |
| → nerosnm joined | 11:53 |
| → tens0r joined | 11:57 |
| ← tens0r left | 11:57 |
| ← finn0 left | 12:01 |
| → tens0r joined | 12:02 |
| → freeman42x[NixOS joined | 12:04 |
| ← royal_screwup21 left | 12:06 |
| tens0r → ts0r | 12:07 |
| → SkarmoutsosV joined | 12:08 |
| ts0r → tens0r_ | 12:09 |
| tens0r_ → tens0r | 12:10 |
| ← tens0r left | 12:10 |
| → tens0r joined | 12:11 |
| ← lalitmee left | 12:16 |
| → AtumT joined | 12:16 |
| → lalitmee joined | 12:16 |
| → m0viefreak joined | 12:17 |
| ← lalitmee left | 12:18 |
| → lalitmee joined | 12:18 |
| → SteffanW joined | 12:19 |
| ← Noti left | 12:20 |
| → ExeciN joined | 12:21 |
| tens0r → tx0r | 12:22 |
| → malina joined | 12:26 |
| → Noti joined | 12:28 |
| ← SteffanW left | 12:28 |
| ← freeman42x[NixOS left | 12:32 |
| → qotta joined | 12:33 |
| → thijso joined | 12:35 |
| → fahadash joined | 12:38 |
| → Peng joined | 12:38 |
| → jomo_ joined | 12:40 |
| → st-gourichon-fid joined | 12:40 |
| ← tx0r left | 12:41 |
| → freeman42x[NixOS joined | 12:44 |
| → tens0r joined | 12:45 |
| ← tens0r left | 12:46 |
| ← nerosnm left | 12:48 |
| → Eryn_1983_FL joined | 12:49 |
| → crose joined | 12:51 |
| ← jottr_ left | 12:56 |
| ← lalitmee left | 13:03 |
| ← thijso left | 13:03 |
| → octav1a joined | 13:04 |
| → thijso joined | 13:06 |
| → CodeSlingerPaul joined | 13:07 |
| → cdown_ joined | 13:09 |
| ← cdown left | 13:11 |
| cdown_ → cdown | 13:12 |
| → RhineDevil joined | 13:13 |
| → barteks2x joined | 13:13 |
|
RhineDevil
| How can I check from a script if a http/https repo wants a password or ssh repo key wants a password? | 13:15 |
|
| (obviously git repos) | 13:16 |
|
Habbie
| git <something> --dry-run? | 13:16 |
|
rafasc
| RhineDevil: what's the context for this? | 13:17 |
|
| dummy credential helper? | 13:17 |
|
RhineDevil
| rafasc, a git wrapper that should download automatically lots of repos | 13:17 |
| → Mattiaslndstrm joined | 13:18 |
|
RhineDevil
| It would be better if the ones needing a password would be prompted first | 13:18 |
|
rafasc
| what should happen if the repo requires a password? | 13:18 |
|
RhineDevil
| rafasc, the repo requiring a password will be prompted first, for the others the user just have to wait | 13:18 |
|
| Habbie, tried git clone <repo> --dry-run and git clone --dry-run <repo>, no result | 13:20 |
|
| It says it doesn't know an option called dry-run | 13:21 |
|
Habbie
| i do suppose --dry-run does not make sense for clone | 13:21 |
| → storrgie joined | 13:21 |
|
rafasc
| I'd say: for https, configure a credential helper, and use something like git ls-remote on all of then. | 13:21 |
| → Inline joined | 13:22 |
|
rafasc
| this should be quick, and allow you to populate the credential-helper with valid credentials. Then run your clone in a loop. | 13:22 |
|
| and it should use the credentials from before. | 13:22 |
|
| still doesn't cover for ssh with passphrases. | 13:23 |
|
RhineDevil
| rafasc, how much is the default credential timeout? | 13:23 |
|
rafasc
| RhineDevil: you can configure it. I think 300s | 13:24 |
| ← thijso left | 13:24 |
|
rafasc
| actually 900. | 13:24 |
|
| but that's just the '-cache', you can use the '-store' to save it permanently. | 13:25 |
| → thijso joined | 13:25 |
|
bremner
| +- | 13:25 |
|
RhineDevil
| rafasc, by changing the user's settings or by passing arguments? | 13:25 |
|
rafasc
| if it fails to authenticate, it gets removed from the store. | 13:25 |
|
| I guess that's why bremner said +- | 13:26 |
| → nerosnm joined | 13:26 |
|
rafasc
| RhineDevil: I think it can be done both ways. git -c credential.helper 'cache --timeout 200' clone url. | 13:27 |
| → omnireq joined | 13:27 |
|
RhineDevil
| rafasc, so I will cache password instead of git? | 13:28 |
|
rafasc
| it is still git caching the password. | 13:29 |
|
RhineDevil
| Why I set the credential helper then? | 13:29 |
| → jottr_ joined | 13:30 |
|
rafasc
| Because the idea would be to authenticate first on a fast command like ls-remote, and make git use the cached credentials when cloning. | 13:30 |
|
| for url in list_of_repos: do git ls-remote url; done; ... then another loop for clone. | 13:32 |
|
| just an idea. | 13:32 |
| ← nerosnm left | 13:32 |
|
rafasc
| the -cache helper also has a '--socket <path>', if you want to store the cache on a different place. | 13:33 |
| → monr0e joined | 13:33 |
|
rafasc
| the cache will be stored in memory, with that I mean if you want to use a different endpoint. | 13:34 |
| → macroprep_ joined | 13:34 |
|
RhineDevil
| Thanks a lot | 13:37 |
|
rafasc
| For ssh, I don't know how to solve it without using an ssh-agent | 13:40 |
| → DWestCoast joined | 13:45 |
| → tufteddeer joined | 13:46 |
| ← RhineDevil left | 13:48 |
| ← freeman42x[NixOS left | 13:49 |
| → freeman42x[NixOS joined | 13:51 |
| ← tufteddeer left | 13:51 |
| → tryte joined | 13:51 |
| → tufteddeer joined | 13:52 |
| → john2496 joined | 13:52 |
| → nerosnm joined | 13:52 |
| ← malina left | 13:54 |
| → moldybits` joined | 13:54 |
| → malina joined | 13:55 |
| ← tufteddeer left | 13:56 |
| ← nerosnm left | 13:56 |
| ← thijso left | 13:57 |
| → boombatower joined | 13:57 |
| → feriman joined | 13:58 |
| → nerosnm joined | 13:59 |
| → pycer joined | 13:59 |
| → thijso joined | 13:59 |
| → czart joined | 14:01 |
| ← pycer left | 14:01 |
| → Es0teric joined | 14:01 |
| moldybits` → moldybits | 14:07 |
| → silverballz joined | 14:09 |
| ← silverballz left | 14:09 |
| → silverballz joined | 14:09 |
| ← silverballz left | 14:09 |
| → silverballz joined | 14:09 |
| ← silverballz left | 14:13 |
| → silverballz joined | 14:13 |
| → astronavt joined | 14:16 |
| ← omnireq left | 14:17 |
| → gareppa joined | 14:19 |
| → macroprep__ joined | 14:19 |
| → luckman212 joined | 14:20 |
| ← macroprep_ left | 14:23 |
| ← freeman42x[NixOS left | 14:23 |
| → NL3limin4t0r joined | 14:23 |
| ← NL3limin4t0r left | 14:24 |
| → hendry joined | 14:24 |
| ← DWestCoast left | 14:26 |
| ← SkarmoutsosV left | 14:27 |
| ← jottr_ left | 14:31 |
| → jottr_ joined | 14:32 |
| ← chele left | 14:34 |
| → SkarmoutsosV joined | 14:35 |
| ← silverballz left | 14:40 |
| → silverballz joined | 14:41 |
| ← silverballz left | 14:41 |
| → silverballz joined | 14:41 |
| ← mooasaurus left | 14:42 |
| → mooasaurus joined | 14:42 |
| ← thijso left | 14:45 |
| → greggerz joined | 14:45 |
| → royal_screwup21 joined | 14:46 |
| ← monr0e left | 14:46 |
| ← Mattiaslndstrm left | 14:50 |
| ← WSDMatty left | 14:51 |
| → WSDMatty joined | 14:52 |
|
webstrand
| I need to commit the contents of a git repository to a subversion repository. | 14:53 |
|
| Is there some way I can flatten the .git folder to a single file that just contains refs and remotes? | 14:53 |
| → fraya joined | 14:53 |
|
rafasc
| webstrand: that sounds... wrong. | 14:54 |
|
webstrand
| Basically, I'd like to keep track of where the files came from, but I don't want to store the full repository history in subversion | 14:55 |
|
| kinda like a worktree, just referencing a remote rather than a local file | 14:56 |
|
rafasc
| git bundles can turn a repository into a file.. But I think it doesn't make sense tracking it in a svn repo. | 14:56 |
| → fflam joined | 14:56 |
|
rafasc
| just add the files, and document it in the commit message? | 14:57 |
|
webstrand
| That's what I'll do, if there's no better solution. | 15:00 |
| ← jottr_ left | 15:00 |
|
rafasc
| webstrand: is this being used with github? | 15:01 |
|
webstrand
| Yep, it's a clone of a repository from github | 15:02 |
| → averell joined | 15:02 |
|
rafasc
| I think github still serves its repos as svn as well. So you could probably add it as an external. | 15:02 |
|
| but I have very little experience with that. | 15:02 |
|
webstrand
| I have very little experience with that too, I recall it being very fragile | 15:02 |
|
| Didn't know github ever served svn repos | 15:03 |
| → paddy joined | 15:03 |
| ← Noti left | 15:04 |
| → tufteddeer joined | 15:04 |
| → pyfgcr joined | 15:07 |
|
webstrand
| Maybe I can do something with git unpack-objects and a shallow clone? | 15:07 |
|
rafasc
| for getting the files? check !deploy | 15:08 |
|
gitinfo
| Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html | 15:08 |
|
webstrand
| My idea was to unpack the pack files, set .git/shallow to a single commit, and then use `git gc` to repack only that commit. | 15:11 |
|
| it seems to have worked | 15:11 |
|
| Not as much size reduction as I'd hoped, though | 15:12 |
| → binarysamsa joined | 15:12 |
| ← malina left | 15:13 |
| → malina joined | 15:14 |
| → bluesmonk joined | 15:14 |
|
rafasc
| tracking a shallow repo inside a svn repo seems like an insane idea. | 15:14 |
|
malina
| well 550 | 15:14 |
|
| and now wiht hexchat 570 | 15:14 |
|
| so I had some browsers open but say ob is hitting 650 base then | 15:15 |
|
rafasc
| malina: wrong chat? | 15:15 |
|
malina
| still high but fair enough | 15:15 |
|
| ah yes, sorry :D | 15:15 |
| ← binarysamsa left | 15:16 |
| ← WSDMatty left | 15:16 |
| ← malina left | 15:16 |
| → WSDMatty joined | 15:17 |
| → malina joined | 15:17 |
| → omnireq joined | 15:18 |
| ← malina left | 15:18 |
| → karstensrage joined | 15:19 |
| → binarysamsa joined | 15:21 |
| ← WSDMatty left | 15:23 |
| → WSDMatty joined | 15:25 |
| ← nerosnm left | 15:30 |
| → kamog joined | 15:33 |
| → ToBeFree joined | 15:34 |
| gitinfo set mode: +v | 15:34 |
| ← WSDMatty left | 15:34 |
| → nerosnm joined | 15:35 |
| → bdonnahue joined | 15:36 |
| ← binarysamsa left | 15:37 |
| → freeman42x[NixOS joined | 15:38 |
|
bluesmonk
| hello guys, I think I've messed up my repo. I've created a summary of events here https://bpaste.net/show/eY-M | 15:39 |
|
| halp please | 15:40 |
| ← john2496 left | 15:40 |
|
bluesmonk
| it's in markdown, but I don't know of any bpaste site for sharing formatted markdown | 15:41 |
|
Habbie
| gist.github.com can render markdown - it does require a github account | 15:41 |
|
| i cannot immediately help with your problem but i have to say you did very well in documenting it! | 15:41 |
| ← bdonnahue left | 15:42 |
|
bluesmonk
| thanks! | 15:43 |
|
rafasc
| Habbie: was not aware github deprecated anonymous gists. | 15:45 |
|
Habbie
| rafasc, i.. checking | 15:45 |
|
| rafasc, i don't see how to make one :) | 15:45 |
|
rafasc
| Habbie: https://github.blog/2018-02-18-deprecation-notice-removing-anonymous-gist-creation/ | 15:46 |
|
| it was possible before.. | 15:46 |
|
bluesmonk
| https://gist.github.com/diegoquintanav/d130ee3ac88d748f5991d99d8f82c2bd | 15:47 |
|
Habbie
| rafasc, ah | 15:47 |
|
bluesmonk
| yeah that's why I wanted to avoid it :D | 15:47 |
|
| but anyway | 15:47 |
| → binarysamsa joined | 15:48 |
|
bluesmonk
| it has a tl;dr | 15:49 |
|
| :shiny: | 15:49 |
|
rafasc
| bluesmonk: you were at the develop branch> | 15:50 |
|
| ? | 15:50 |
|
bluesmonk
| yes | 15:50 |
|
rafasc
| do this: git log --graph --oneline develop@{1}; | 15:51 |
|
| increase the number, until you see what you want to see. | 15:51 |
|
bluesmonk
| I've updated the gist with some data I forgot to add. | 15:52 |
|
rafasc
| I think it is 8b5f239, | 15:53 |
|
bluesmonk
| rafasc: I'll do that | 15:53 |
|
rafasc
| the pre-rebase state. | 15:53 |
|
bluesmonk
| I want to move HEAD of develop to that commit | 15:53 |
|
| or I think I want to do that | 15:53 |
|
rafasc
| git checkout develop; git reset 8b5f239 | 15:54 |
|
| (possibly --hard) | 15:54 |
|
bluesmonk
| by reverting my interactive rebase should be perfect | 15:54 |
| ← nerosnm left | 15:54 |
|
bluesmonk
| let's see | 15:54 |
|
| only stuff I lose with --hard is: changes not staged, not commited, not stashed, right? | 15:54 |
|
astronavt
| is there a difference between reset --soft and branch -f | 15:54 |
|
| i use the latter when i need to move branch heads around because i can never rememeber all the different reset incantations and im afraid to mess up | 15:55 |
|
rafasc
| astronavt: I don't think so. | 15:55 |
| → vavkamil joined | 15:56 |
|
rafasc
| the main difference is that reset operates on the current checked out branch. | 15:56 |
|
| while branch -f, allows you to do : git branch -f master 123123; git branch -f develop 456456; | 15:56 |
|
| without having to checkout master or develop | 15:56 |
| → nerosnm joined | 15:57 |
|
bluesmonk
| rafasc: question | 15:57 |
|
rafasc
| git reset --soft X == git branch -f HEAD X; | 15:57 |
|
| bluesmonk: answer | 15:57 |
| ← tufteddeer left | 15:57 |
|
bluesmonk
| git log --graph --oneline develop@{1} > do you suggest increasing the index until I reach commit 8b5f239? | 15:58 |
|
| what for? | 15:58 |
| → tufteddeer joined | 15:58 |
| ← SkarmoutsosV left | 15:58 |
|
rafasc
| No, if you know that 8b5f239 looks correct, you can reset to it. | 15:58 |
|
bluesmonk
| ah okay | 15:58 |
| → Sasazuka joined | 15:59 |
|
bluesmonk
| what would be the right way to revert the interactive rebasing based on the reflog index? | 15:59 |
|
rafasc
| you can use git reset --hard develop@{1} | 15:59 |
|
bluesmonk
| that would reset the last operation | 15:59 |
|
rafasc
| if developt@{1} resolves to that commit. | 16:00 |
|
bluesmonk
| I see | 16:00 |
|
| ok brb | 16:00 |
|
| bluesmonk pats himself on the back | 16:00 |
| → macroprep_ joined | 16:01 |
| → impermanence joined | 16:02 |
|
rafasc
| you could do: git reflog develop; search for the desired commit, etc. | 16:02 |
| → scheming_around joined | 16:02 |
| → Sasazuka__ joined | 16:02 |
|
rafasc
| it can be hard to guess the correct number, especially since you performed multiple rebases.. | 16:02 |
| → davidfetter_work joined | 16:02 |
| ← macroprep__ left | 16:02 |
|
scheming_around
| Why do tag refs point to "tag objects", which point to the actual commit the tag refers to? | 16:03 |
|
| I.e., why do tag objects exist? | 16:03 |
|
rafasc
| instead of using reflog which defaults to reflog HEAD, reflog develop can sometimes give you less entries. Easier to find the correct commit. | 16:03 |
| ← feriman left | 16:04 |
|
bluesmonk
| another question: each time I raise the index on `git log develop@{1}` I get different commits for the same commit logs, until I get to develop@{3}, which shows commit 8b5f239 | 16:04 |
|
rafasc
| scheming_around: tag objects exist because sometimes you want to store information about who tagged, when it was tagged, etc. | 16:04 |
| ← Sasazuka left | 16:05 |
|
bluesmonk
| rafasc: so should it be safe to do git reset --hard develop@{3}? | 16:05 |
|
rafasc
| bluesmonk: those are your previous rebase results. The ones you quit, but still ran. | 16:05 |
| ← binarysamsa left | 16:05 |
| → oatmealraisin joined | 16:05 |
|
bluesmonk
| rebase changes my commits then? | 16:06 |
| → john2496 joined | 16:06 |
|
rafasc
| bluesmonk: next time, if you want to abort, either delete everything, or in vim use :cq | 16:06 |
|
| bluesmonk: that will "crash" the editor, and nothing will be done. | 16:06 |
| → malina joined | 16:06 |
|
bluesmonk
| cool | 16:06 |
| ← malina left | 16:06 |
| → malina joined | 16:06 |
|
rafasc
| bluesmonk: use git log --graph --oneline develop@{3}; if it looks good, reset --hard dev@{3} | 16:07 |
|
webstrand
| rafasc: Looks like if I delete all of the objects except for the HEAD tree object, the repo still appears to function, but fetch and pull no longer work | 16:08 |
|
rafasc
| scheming_around: and the tag always refers to the object id, the hash. | 16:09 |
|
bluesmonk
| yasss | 16:09 |
|
| rafasc: thank you sir | 16:09 |
|
| it worked | 16:09 |
|
| or lady, dunno | 16:09 |
|
| person | 16:09 |
|
rafasc
| scheming_around: so you can have tags point to blobs, other tags, commits, trees etc... | 16:09 |
|
| I identify as a bilogical automaton. | 16:10 |
|
bluesmonk
| I will default to sentient being from now on | 16:10 |
|
rafasc
| you're welcome, glad I could help. | 16:10 |
|
bluesmonk
| on the internet no one know you are a dog | 16:10 |
|
| thanks again! | 16:11 |
|
rafasc
| bluesmonk: and btw, ignore that SO post. It's outdated. You should be using --rebase-merges instead. | 16:11 |
|
bluesmonk
| what are the drawbacks of rebasing merge commits? | 16:11 |
|
| if any | 16:12 |
|
rafasc
| None, really... Some people don't like merge commits. | 16:12 |
|
bluesmonk
| ah I like them :) | 16:13 |
|
rafasc
| Mostly because people misusing merges gave it a bad rep. | 16:13 |
| → seaef joined | 16:13 |
|
bluesmonk
| how's that? | 16:13 |
|
davidfetter_work
| o/` merges don't give a damn about a bad reputation o/` | 16:13 |
| → fission6 joined | 16:14 |
| → thijso joined | 16:15 |
| ← tufteddeer left | 16:17 |
| ← seaef left | 16:17 |
|
bluesmonk
| rafasc: last thing, and for the sake of understanding how develop@{} works... what part of the reflog index would be equivalent to doing develop@{3}? | 16:18 |
|
| or is there no equivalence? | 16:18 |
|
scheming_around
| rafasc I see, ty | 16:19 |
|
rafasc
| scheming_around: I said object id, as a vague term. tags can point to any object really. blobs/trees/commits/other tags/ | 16:19 |
|
| and the tag-object is the difference between git 'lightweight' and 'annotated' tags | 16:20 |
| ← storrgie left | 16:21 |
|
rafasc
| @{3} means the third entry on the reflog. master@{3} = 3rd entry of git reflog master; | 16:21 |
| → tufteddeer joined | 16:22 |
| → xcm joined | 16:23 |
| → storrgie joined | 16:24 |
| ← ExeciN left | 16:24 |
|
bluesmonk
| I see, I've never used reflog before with an argument | 16:24 |
|
| what's the default argument? --all? | 16:25 |
|
| sorry I should be googling that | 16:25 |
|
| git reflog == git reflog show HEAD | 16:26 |
| → thiago joined | 16:26 |
| ← Silenced left | 16:29 |
| ← gareppa left | 16:30 |
| ← fraya left | 16:36 |
| ← thijso left | 16:36 |
| → paraxial joined | 16:38 |
| ← freeman42x[NixOS left | 16:38 |
| ← Es0teric left | 16:38 |
| ← fission6 left | 16:39 |
| → m1rror joined | 16:41 |
| ← paraxial left | 16:43 |
| → paraxial joined | 16:46 |
| → bdonnahue joined | 16:46 |
| ← malina left | 16:47 |
| → thijso joined | 16:48 |
| ← royal_screwup21 left | 16:48 |
| → magic_ninja_work joined | 16:53 |
| ← thijso left | 16:54 |
| → nic-hartley joined | 16:55 |
| → ara joined | 16:56 |
| ← paddy left | 16:58 |
| → durham joined | 16:58 |
| → thijso joined | 17:00 |
| ← xcm left | 17:02 |
| → xcm joined | 17:03 |
| ← durham left | 17:03 |
| ← pyfgcr left | 17:06 |
| ← thijso left | 17:12 |
| → Kaivo joined | 17:12 |
| → binarysamsa joined | 17:13 |
| → liberiga joined | 17:20 |
| → thijso joined | 17:20 |
| → malina joined | 17:21 |
| ← m0viefreak left | 17:24 |
| ← binarysamsa left | 17:27 |
| ← ara left | 17:30 |
| ← nerosnm left | 17:30 |
| → orbyt_ joined | 17:31 |
| → ExeciN joined | 17:37 |
| ← oatmealraisin left | 17:37 |
| → dijitol joined | 17:43 |
| ← macroprep_ left | 17:47 |
| → lucasb joined | 17:50 |
| ← kjartan left | 17:51 |
| → kjartan joined | 17:54 |
| ← nic-hartley left | 17:55 |
|
f8e3
| how to .gitignore folder foo/ but not file foo/bar.jar ? | 17:57 |
| uplime^ → also_uplime | 18:01 |
| → cixx joined | 18:02 |
|
cixx
| hi. | 18:02 |
|
| is there a working tool to convert TFS history to Git ? | 18:02 |
|
f8e3
| cixx hi cixx | 18:03 |
| → nic-hartley joined | 18:04 |
|
cixx
| hi f8e3 hi | 18:08 |
| → jab416171 joined | 18:10 |
| → WSDMatty joined | 18:13 |
| → belgin joined | 18:13 |
| ← WSDMatty left | 18:13 |
|
belgin
| hello | 18:13 |
| → m1dnight1 joined | 18:14 |
|
belgin
| i have a patch and it has To: specified but send-email still asks me where to send it. why? | 18:14 |
| ← m1dnight1 left | 18:14 |
| → WSDMatty joined | 18:14 |
| ← magic_ninja_work left | 18:15 |
| → fission6 joined | 18:29 |
| ← WSDMatty left | 18:29 |
| → JanC joined | 18:33 |
|
bluesmonk
| f8e3: add foo, in the next line add !foo/bar.jar | 18:33 |
| ← belgin left | 18:34 |
|
bluesmonk
| sorry, first line should be foo/* | 18:34 |
|
| don't know if foo alone does it :P | 18:35 |
|
| it should though | 18:35 |
| → alystair joined | 18:38 |
|
f8e3
| true | 18:38 |
| → hsiktas joined | 18:39 |
| ← fission6 left | 18:40 |
| ← bluesmonk left | 18:40 |
| → justache joined | 18:41 |
| ← xcm left | 18:42 |
| → oatmealraisin joined | 18:42 |
| → xcm joined | 18:44 |
| → fraya joined | 18:44 |
| → leeN joined | 18:45 |
|
Kaivo
| I have documentation committed that we also push on a CMS. The documentation may be edited in the CMS, and in the git repo. I need to reconcile the changes between the last tag in the repo, the current CMS versin and the current file in repo (maybe not stagged yet). I have the 3 distinct versions of the doc already. How would I go about creating a not commited merge of those 3 versions, maybe causing a conflict | 18:51 |
|
| just like when doing a git merge or git stash pop. | 18:51 |
| → binarysamsa joined | 18:54 |
| ← malina left | 18:55 |
| → m1dnight_ joined | 19:02 |
| ← binarysamsa left | 19:03 |
| ← Kaivo left | 19:11 |
| → Kaivo joined | 19:12 |
|
Kaivo
| Ok, I figured it out. `git merge-file -p file.remote file.tagged file.current` | 19:13 |
| → m1dnight1 joined | 19:15 |
| ← m1dnight_ left | 19:17 |
| → jottr_ joined | 19:21 |
| → SkarmoutsosV joined | 19:21 |
| → assemblyman joined | 19:22 |
| ← dijitol left | 19:23 |
| ← john2496 left | 19:23 |
| → sbeyer joined | 19:24 |
| ← fraya left | 19:24 |
| → mowcat joined | 19:24 |
| ← mowcat left | 19:25 |
| → cagomez joined | 19:25 |
| → dijitol joined | 19:25 |
| → mowcat joined | 19:25 |
|
cixx
| why it is not possible to convert tfs history to git completely? | 19:28 |
|
| it gets only part of history on some solutions but not all of them | 19:28 |
| ← czart left | 19:29 |
| → theoceaniscool joined | 19:35 |
| ← m1dnight1 left | 19:36 |
| ← orbyt_ left | 19:37 |
| → m1dnight1 joined | 19:37 |
| ← Milos left | 19:42 |
| ← assemblyman left | 19:42 |
| → Milos joined | 19:43 |
| → czart joined | 19:46 |
| ← czart left | 19:47 |
| ← nic-hartley left | 19:47 |
| → freeman42x[NixOS joined | 19:50 |
| → assemblyman joined | 19:59 |
| ← emsjessec left | 20:01 |
| → realies joined | 20:01 |
| ← thiago left | 20:01 |
| ← realies left | 20:02 |
| → paddy joined | 20:02 |
| → orbyt_ joined | 20:03 |
| → level3 joined | 20:03 |
| → ericfreese joined | 20:05 |
| → nerosnm joined | 20:06 |
| → thiago joined | 20:06 |
| ← nerosnm left | 20:10 |
| → shicks2525 joined | 20:10 |
| → arecaceae joined | 20:12 |
| → SwiftMatt joined | 20:27 |
| ← jottr_ left | 20:32 |
| ← shicks2525 left | 20:33 |
| → jcbitter joined | 20:34 |
| → feriman joined | 20:36 |
| → shicks2525 joined | 20:36 |
|
ericfreese
| Hi all, I'm wanting to exclude symbolic refs from a `git for-each-ref` command. I was kind of looking for a `--no-symbolic` (or similar) flag but it doesn't seem to exist. I've gotten something working by using `%(symref)` in the format string and piping through grep filter the sym refs out, but I'm wondering if there is a better way? | 20:40 |
|
| And as a follow-up question if there's not a better way, would it make sense to try to submit a patch that adds `--symbolic` and `--no-symbolic` flags? | 20:41 |
| → Stoot joined | 20:46 |
| → realies joined | 20:48 |
| ← assemblyman left | 20:49 |
| → greatgatsby joined | 20:49 |
| ← kamog left | 20:49 |
| → wootehfoot joined | 20:51 |
| ← liberiga left | 20:53 |
| → lmln joined | 20:54 |
| → polman joined | 21:02 |
| ← m1dnight1 left | 21:06 |
| → m1dnight1 joined | 21:07 |
| ← SkarmoutsosV left | 21:09 |
| → azwieg103 joined | 21:10 |
| ← omnireq left | 21:17 |
| ← sbeyer left | 21:17 |
| ← orbyt_ left | 21:18 |
| ← azwieg103 left | 21:20 |
| → azwieg103 joined | 21:21 |
| → |Fitz| joined | 21:23 |
| → orbyt_ joined | 21:28 |
| ← bolovanos left | 21:28 |
| → Guest15733 joined | 21:28 |
| → kerframil joined | 21:30 |
| → Cabanoss- joined | 21:33 |
| → random_yanek joined | 21:33 |
| → sgn_ joined | 21:36 |
| → Atlenohen joined | 21:39 |
| ← bdonnahue left | 21:39 |
| → karoshi joined | 21:40 |
|
karoshi
| See if you have amendments to some strangers code on Git. Switch branch and push? Do they get notified? Can't see it listed anywhere | 21:41 |
| ← octav1a left | 21:42 |
| → octav1a joined | 21:42 |
| ← kerframil left | 21:43 |
| → kerframil joined | 21:43 |
| ← impermanence left | 21:45 |
| ← vavkamil left | 21:46 |
| → bdonnahue joined | 21:48 |
| ← bdonnahue left | 21:53 |
| ← oatmealraisin left | 21:54 |
| ← feriman left | 21:55 |
| → diogenese joined | 21:58 |
| → jrnieder joined | 22:00 |
| ← cagomez left | 22:00 |
| ← wootehfoot left | 22:01 |
| → cagomez joined | 22:02 |
| ← greggerz left | 22:03 |
| → infinisil joined | 22:05 |
| ← tufteddeer left | 22:06 |
| → tufteddeer joined | 22:06 |
| ← silverballz left | 22:07 |
| ← kerframil left | 22:08 |
| ← freeman42x[NixOS left | 22:08 |
| ← Kaivo left | 22:10 |
| ← tufteddeer left | 22:11 |
| → kerframil joined | 22:11 |
| ← orbyt_ left | 22:11 |
| → tufteddeer joined | 22:13 |
|
infinisil
| Hey, while trying to use git to produce deterministic results, I came across a problem | 22:13 |
|
| Namely that the .git/objects/info/packs file doesn't have a deterministic order of .pack files | 22:13 |
| ← random_yanek left | 22:14 |
| → random_yanek joined | 22:14 |
|
infinisil
| This probably happens during a `git repack` operation that I'm running | 22:15 |
| → nic-hartley joined | 22:15 |
|
infinisil
| I tried finding the place in git's source where this happens, but I couldn't find it | 22:15 |
|
| Can anybody tell me where in git's source this file gets written to? | 22:16 |
|
| It contains lines of the form "P pack-f01fe51bef092064a1808d5a5e3da9419fbfcfab.pack" for me | 22:16 |
|
| Ah it might be here https://github.com/git/git/blob/master/server-info.c#L339 | 22:19 |
|
| The name of the file initially made me not consider it | 22:19 |
| ← Phylock left | 22:21 |
| → gxt joined | 22:24 |
| ← ericfreese left | 22:25 |
| ← azwieg103 left | 22:27 |
| → omnireq joined | 22:27 |
| ← xcm left | 22:31 |
| → xcm joined | 22:31 |
| → freeman42x[NixOS joined | 22:31 |
|
infinisil
| Well I have no idea how to make it deterministic :( | 22:33 |
|
| The source of non-determinism is most likely file listing order | 22:34 |
| → meLon joined | 22:34 |
| ← thiago left | 22:34 |
| ← theoceaniscool left | 22:36 |
| ← cagomez left | 22:39 |
| ← kerframil left | 22:42 |
| ← lucasb left | 22:46 |
| → orbyt_ joined | 22:54 |
| ← dijitol left | 22:57 |
| → yonder joined | 23:00 |
| ← xcm left | 23:03 |
| → xcm joined | 23:04 |
|
infinisil
| Okay so I think I found a way of preventing this determinism | 23:04 |
|
| git gc --keep-largest-pack | 23:04 |
|
| "All packs except the largest pack and those marked with a .keep files are consolidated into a single pack. When this option is used, gc.bigPackThreshold is ignored." | 23:04 |
|
| This seems like it would always make it a single pack instead of multiple | 23:05 |
| ← Atlenohen left | 23:05 |
| ← CodeSlingerPaul left | 23:07 |
| → magic_ninja joined | 23:12 |
|
jrnieder
| infinisil: do you mean you want byte-for-byte reproducibility? | 23:15 |
| → Sleepy63 joined | 23:15 |
|
infinisil
| Pretty much yeah | 23:15 |
| ← tufteddeer left | 23:15 |
| → tufteddeer joined | 23:16 |
| → Wizek joined | 23:16 |
| → cagomez joined | 23:17 |
| ← tufteddeer left | 23:20 |
| ← leeN left | 23:25 |
| ← m1dnight1 left | 23:26 |
| → m1dnight1 joined | 23:27 |
|
jrnieder
| any more context? why? :) | 23:27 |
|
| (something like !xy, but not quite) | 23:28 |
|
gitinfo
| You are asking about a solution, but we can help you a lot better if you could describe the actual problem you are trying to solve. | 23:28 |
|
infinisil
| I'm packaging software for Nix, which only allows network access for deterministic processes (by forcing you to provide a sha256 hash upfront) | 23:29 |
|
jrnieder
| oh man | 23:29 |
|
| thanks, that's interesting. You can use "git fast-export" output as the deterministic thing | 23:29 |
|
| instead of the git repo itself | 23:30 |
|
dzho
| yeah git is probably a thing very much not to use in something that's meant to go into nix | 23:30 |
|
infinisil
| In most cases this isn't a problem, because we can just get rid of the whole .git directory | 23:30 |
|
| But sometimes packages do fancy things with .git to build | 23:30 |
| ← moldybits left | 23:30 |
|
jrnieder
| I'm not sure fast-export's output order is deterministic, but it would be reasonable to make it so | 23:30 |
|
infinisil
| Huh interesting, never seen fast-export before | 23:31 |
| → moldybits joined | 23:33 |
| → LearnAllTheTime joined | 23:34 |
|
infinisil
| Well for now we use this procedure to make it as deterministic as possible: https://github.com/NixOS/nixpkgs/blob/00762b57545dba3b3e21e3a649b574db3db36c65/pkgs/build-support/fetchgit/nix-prefetch-git#L235-L270 | 23:34 |
|
| And while this isn't truly deterministic, it's worked well enough | 23:35 |
| → tufteddeer joined | 23:35 |
|
| jrnieder is very afraid | 23:35 |
|
infinisil
| Except that I just came accross this problem of pack file ordering not being the same | 23:35 |
|
| Yeah it doesn't look that good eh hehe | 23:35 |
| ← m1dnight1 left | 23:36 |
|
infinisil
| jrnieder: What makes you think that fast-export would be good for that? | 23:36 |
|
jrnieder
| it's a standardized format, better for archival than the .git dir itself. There's no threading-induced nondeterminism | 23:37 |
| → m1dnight1 joined | 23:37 |
|
infinisil
| I see | 23:37 |
| ← Guest15733 left | 23:37 |
| → thiago joined | 23:38 |
|
infinisil
| I'll maybe look into switching nixpkgs to use something like this instead | 23:38 |
|
| For now this --keep-largest-pack fix seems to be the easiest workaround | 23:39 |
|
jrnieder
| if you're just worried about .git/objects/info/packs, you can "rm" it | 23:39 |
|
infinisil
| Good point, isn't that needed for anything though? | 23:39 |
|
jrnieder
| not unless you're serving over raw ("dumb") HTTP | 23:40 |
|
infinisil
| I see, that might be better then | 23:40 |
| → m0viefreak joined | 23:44 |
|
infinisil
| Although, with --keep-largest-pack, this won't influence packages which only have a single pack file already | 23:48 |
| ← freeman42x[NixOS left | 23:48 |
|
infinisil
| So I guess I'll go with that after all | 23:48 |
|
| Means less work updating sha256's | 23:48 |
| ← crose left | 23:52 |
| → freeman42x[NixOS joined | 23:52 |
| ← greatgatsby left | 23:56 |