IRCloggy #git 2020-05-16

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2020-05-16

← thebope left00:02
→ thebope joined00:03
→ gschanuel joined00:03
← gschanuel left00:04
→ gschanuel joined00:06
← gschanuel left00:07
→ gschanuel joined00:08
← orbyt_v7 left00:08
← thebope left00:08
← tgunr left00:11
← davispuh left00:11
← dedowsdi left00:13
← haasn left00:14
← gschanuel left00:18
← fflam left00:20
→ gschanuel joined00:20
→ fflam joined00:21
← tiin57 left00:23
← flex14 left00:24
→ flex14 joined00:25
→ rsrx joined00:25
← flex14 left00:26
→ tiin57 joined00:27
→ sdw_three joined00:28
← bambanx left00:28
→ haasn joined00:30
→ bambanx joined00:30
← rsrx left00:31
← CodeSlingerPaul left00:31
← bambanx left00:32
→ rsrx joined00:32
→ bambanx joined00:33
← sdw_three left00:33
← mns left00:35
→ khlieng joined00:36
← Hello71 left00:39
→ jellycode joined00:39
jellycode Can anyone point to a dockerfile which downloads and builds latest git client from source?00:39
← rafasc left00:42
nedbat jellycode: why do you need docker for that?00:42
→ dedowsdi joined00:46
jellycode I'm lookin for the most concise and cleanest example of building GIT from source in a dockerfile00:46
→ thebope joined00:46
jellycode usually there's a bunch of other people who have done something like this, and there's a super-elegant example to be found00:46
nedbat jellycode: i'm just curious why involve docker?00:47
→ Hello71 joined00:48
→ vicfred joined00:48
jellycode here's a pretty clean one: https://github.com/flapjack/omnibus-centos/blob/master/6/Dockerfile#L2600:49
← pinpox left00:51
→ pinpox- joined00:51
→ muelleme joined00:51
← jstein left00:51
← rsrx left00:52
← tiin57 left00:54
pinpox- → pinpox00:54
→ tgunr joined00:54
← muelleme left00:56
→ tiin57 joined00:57
← royal_screwup21 left00:58
← clime left00:59
← doug16k left01:04
→ doug16k joined01:06
← shush left01:08
← Brainium left01:09
← ixian left01:11
→ ixian joined01:12
← gschanuel left01:12
← rustyshackleford left01:12
← bambanx left01:13
→ bambanx joined01:14
← LionsMane left01:15
← SpeakerToMeat left01:19
→ freeman42x joined01:20
← freeman42x left01:20
→ SpeakerToMeat joined01:20
← robink left01:22
→ robink joined01:22
→ freeman42x joined01:22
← tiin57 left01:24
→ ia9371 joined01:25
→ tiin57 joined01:27
→ gschanuel joined01:29
→ Goplat joined01:30
→ lukd joined01:31
← thebope left01:32
→ royal_screwup21 joined01:35
→ SwiftMatt joined01:35
→ bearheathen joined01:49
← hbautista left01:50
→ PaddyF joined01:51
→ muelleme joined01:52
← bambanx left01:52
← tiin57 left01:53
← azwieg103 left01:55
← muelleme left01:56
→ tiin57 joined01:57
← royal_screwup21 left01:58
→ thebope joined01:58
← SwiftMatt left02:00
← bearheathen left02:01
← bitnoize left02:03
→ royal_screwup21 joined02:03
← ska left02:04
→ SwiftMatt joined02:05
← MJ94 left02:06
PaddyF → paddy02:15
← ia9371 left02:20
← Shentino_ left02:21
→ ferdna joined02:23
← tiin57 left02:23
→ tiin57 joined02:27
← SwiftMatt left02:27
← DolphinDream left02:29
→ DolphinDream joined02:29
← to1ne left02:29
→ sdw_three joined02:30
→ ia9371 joined02:31
← paddy left02:31
→ paddy joined02:32
→ to1ne joined02:34
lagothrix → Guest817702:34
← Guest8177 left02:34
→ lagothrix joined02:34
← sdw_three left02:35
← royal_screwup21 left02:35
← DolphinDream left02:36
← tgunr left02:37
ia9371 hello02:38
Everybody02:38
→ DolphinDream joined02:39
→ SwiftMatt joined02:40
← Cabanossi left02:44
← barteks2x left02:50
← fitzgerald1337 left02:50
← DolphinDream left02:51
→ DolphinDream joined02:52
→ muelleme joined02:52
← kegster left02:53
← tiin57 left02:53
→ Cabanoss- joined02:53
→ kegster joined02:53
ia9371 hello02:54
someone please help02:54
I have a folder on my desktop and on github02:54
I wanto to update how do i do that02:54
→ tiin57 joined02:57
← muelleme left02:57
← thebope left02:59
← millerti left02:59
→ crose joined03:01
← cliluw left03:02
← jellycode left03:04
← Metalsutton left03:08
eggbean How do you stash specific files? `git stash push -- FILE` results in weird behaviour, where the file is stashed while also still remaining in the working directory as well it being added to staging03:09
← Onionnion left03:09
← lenarhoyt left03:10
eggbean I'm using git v2.2003:10
→ sdw_three joined03:10
→ skme9 joined03:12
→ Shentino joined03:12
← sdw_three left03:16
→ Metalsutton joined03:23
→ jellycode joined03:23
← tiin57 left03:24
→ tiin57 joined03:27
← coco left03:29
→ skme9_ joined03:29
→ eggbean joined03:29
← eggbean left03:30
← Pixi__ left03:30
→ eggbean joined03:31
← skme9 left03:31
→ jaziz joined03:32
← ia9371 left03:37
→ Xiti joined03:38
← jetchisel left03:40
← DolphinDream left03:42
→ DolphinDream joined03:42
← DolphinDream left03:43
← Aelius left03:43
→ jetchisel joined03:44
→ Aelius joined03:47
← Sasazuka left03:50
→ DolphinDream joined03:51
← SwiftMatt left03:51
← sidetrack left03:51
→ sidetrack joined03:52
← DolphinDream left03:52
→ muelleme joined03:53
← tiin57 left03:53
→ tiin57 joined03:57
← xcm left03:57
→ xcm joined03:57
← muelleme left03:58
← g4570n left03:59
← jwest left04:02
← orbyt_ left04:04
→ Shentino_ joined04:08
← Shentino left04:09
← Shentino_ left04:12
→ Shentino__ joined04:12
← sidetrack left04:12
→ Shentino_ joined04:14
← Shentino__ left04:15
← inkbottle left04:20
← Shentino_ left04:21
→ Shentino joined04:21
→ zebrag joined04:23
← tiin57 left04:23
← Caspan left04:27
→ tiin57 joined04:27
→ rustyshackleford joined04:27
← cd left04:30
→ SwiftMatt joined04:30
← radu242 left04:40
→ Caspan joined04:41
→ sidetrack joined04:42
→ jwest joined04:42
→ jsatk joined04:42
→ fitzgerald1337 joined04:43
← delvian left04:45
← sidetrack left04:46
→ sidetrack joined04:47
← jellycode left04:50
← tiin57 left04:53
→ muelleme joined04:54
→ jaeckel joined04:56
→ tiin57 joined04:57
← Caspan left04:58
← muelleme left04:59
← Betal left05:00
← bolovanos__ left05:01
← dedowsdi left05:02
← zebrag left05:06
→ zebrag joined05:08
→ calcul0n joined05:09
→ Caspan joined05:12
→ sdw_three joined05:12
← bettencb left05:14
← sidetrack left05:15
← Goplat left05:19
← crose left05:20
→ crose joined05:21
→ RicketyRick joined05:22
← tiin57 left05:23
→ tiin57 joined05:27
→ dedowsdi joined05:28
← Caspan left05:29
← jwest left05:30
← crisfm left05:31
→ sauvin joined05:34
→ Caspan joined05:35
← bket left05:40
← Metalsutton left05:40
← Caspan left05:41
← vdamewood left05:43
→ bket joined05:44
← sdw_three left05:47
← F1nny left05:49
→ F1nny joined05:50
← SwiftMatt left05:53
← tiin57 left05:54
→ rsarky joined05:55
→ muelleme joined05:55
→ Caspan joined05:55
→ tiin57 joined05:57
→ sidetrack joined05:59
← muelleme left05:59
← sidetrack left06:02
← snosk8r left06:09
→ snosk8r joined06:10
← Caspan left06:12
→ bettencb joined06:16
← donofrio left06:17
→ Caspan joined06:22
→ feriman joined06:23
← tiin57 left06:23
→ tiin57 joined06:26
← khlieng left06:29
→ khlieng joined06:30
← thiago left06:35
← Caspan left06:39
← bettencb left06:43
← RicketyRick left06:47
→ bettencb joined06:50
← tiin57 left06:54
→ Hilbert joined06:55
→ muelleme joined06:55
→ tiin57 joined06:57
→ sdw_three joined07:00
← kjartan left07:00
← muelleme left07:00
→ kjartan joined07:01
← blackandblue left07:02
→ Caspan joined07:09
← tiin57 left07:24
← Caspan left07:26
→ tiin57 joined07:27
← feriman left07:34
← ferdna left07:38
→ ferdna joined07:45
→ royal_screwup21 joined07:50
← tiin57 left07:53
→ Caspan joined07:55
→ muelleme joined07:56
→ tiin57 joined07:57
← mat001 left07:57
← muelleme left08:01
→ skme9__ joined08:01
← dedowsdi left08:02
← skme9__ left08:03
→ skme9__ joined08:03
← skme9__ left08:04
→ skme9__ joined08:05
← skme9_ left08:05
← DocMAX left08:10
→ onizu joined08:11
← Caspan left08:12
← sdw_three left08:15
← ferdna left08:16
→ NeoCron joined08:19
← opal left08:22
← gumdrops left08:23
→ opal joined08:23
← skme9__ left08:24
← tiin57 left08:24
→ skme9__ joined08:25
← skme9__ left08:25
→ tiin57 joined08:27
→ dedowsdi joined08:27
← xcm left08:41
→ xcm joined08:42
← umask077 left08:44
→ R2robot joined08:44
→ umask077 joined08:46
→ sdw_three joined08:47
← royal_screwup21 left08:49
← sdw_three left08:53
→ Caspan joined08:53
← tiin57 left08:53
→ tiin57 joined08:56
→ muelleme joined08:57
→ Bcadren joined09:00
Bcadren I want to grep for the specific phrase "orcish idol" in old commit logs to search for a specific hash. I'm not that great with this, help?09:01
← muelleme left09:02
← bettencb left09:03
→ Lucas_Gray joined09:04
← Caspan left09:10
← Lucas_Gray left09:12
j416 Bcadren: git log --grep 'your text'09:12
→ FFY00 joined09:15
→ beepbeep joined09:18
→ Lucas_Gray joined09:18
beepbeep Hi everyone. I accidently used git stash pop in the wrong branch resulting in a merge conflict. I don't want to merge the stash into this branch. I'd love to undo the merge and pop the stash onto the correct branch. Is there any way to do this?09:19
← g00s left09:21
← tiin57 left09:24
j416 beepbeep: reset and go to the right branch, redo09:24
beepbeep: assuming you have no uncommitted changes you want to keep; git reset --hard.09:25
→ tiin57 joined09:27
→ g00s joined09:29
beepbeep j416, I'll lose the changes that came from the stash that way won't I?09:31
j416 beepbeep: the stash should have been left as-is if there was a conflict. Double check with git stash list.09:32
→ bjoe2k4 joined09:40
beepbeep Thanks a lot j416, I thought the stash is gone the minute you pop it. Today I learned about stash apply, stash list, and stash show, thx! :)09:41
j416 o/09:41
→ bitnoize joined09:42
← yonder left09:45
← R2robot left09:45
← causasui left09:47
→ delvian joined09:48
← Cabanoss- left09:53
← tiin57 left09:53
← Hilbert left09:56
→ Caspan joined09:56
→ tiin57 joined09:57
→ muelleme joined09:58
→ sidetrack joined10:00
← nuala left10:02
← muelleme left10:02
→ Ploppz joined10:03
← sidetrack left10:05
→ aristotle joined10:09
← snosk8r left10:10
← Lucas_Gray left10:10
→ sdw_three joined10:12
aristotle quick question. I want to formulate a `git filter-branch ... -- --all ...` that will apply only to history since 2019-07-01; if I do `git rev-list --after=2019-06-31 --all`, those are commits I want10:13
however, `git filter-branch ... -- --all --after=2019-06-31` fails:10:13
fatal: options not supported in --stdin mode10:13
← Caspan left10:13
← nowhere_man left10:14
→ cliluw joined10:19
← cliluw left10:22
→ cliluw joined10:23
← tiin57 left10:23
→ finnb joined10:25
← cliluw left10:25
→ cliluw joined10:26
finnb What are some people's favoured ways to store large blobs with git? I've come across git-lfs but I'm interested if anyone has any alternatives.10:26
← freeman42x left10:26
→ tiin57 joined10:27
→ Hilbert joined10:30
bremner finnb: I have used git-annex since before git-lfs existed10:35
← cliluw left10:35
bremner I have the feeling the git-annex is easier to self-host, but not supported by most commercial hosters10:36
→ rossome joined10:36
→ cliluw joined10:36
finnb I ask my friends if they've used git-lfs and I get a lot of negative feedback without much substance on why it's disliked.10:36
bremner maybe they just don't like the extra complication?10:37
→ rafasc joined10:38
finnb One piece of feedback I had was precisely that, they don't want to extend their git.10:39
I'd just wondered if there were any obvious cons to git-lfs before I started looking into it properly.10:39
It seems well supported by a number of platforms.10:41
← cdown left10:41
rafasc also, the new partial clones makes dealing with large blobs a tiny bit easier. As you can just ask git to not transfer the large blobs.10:41
finnb That's certainly one way of looking at the issue though I want to track changes to large files. The easiest way I can see to achieving that is with git-lfs.10:43
rafasc and they get fetched on the fly as you need them. git-lfs/annex still has its place, but clone --filter=blob:limit= can work in a pinch.10:43
→ cdown joined10:44
rafasc But support for filtering is quite recent.. So you have to take that into consideration as well.10:44
finnb Though with partial checkouts, I'd have to partially checkout everything in order to monitor large blob changes, right?10:45
Also, I have the problem of storage. I want to say, hey store these large blobs in <insert large blob store server>10:45
← sdw_three left10:47
rafasc the partial clone makes it quite transparent, if you issue a command, let's say diff, that needs the blob to do its thing, git will fetch it on the fly from the promisor remote.10:47
So you can point it to fetch from a particular remote, but it still needs to be a remote. And not just some regular file server.10:48
finnb So that will be a problem for my usecase10:49
← tiin57 left10:53
← Hilbert left10:56
→ tiin57 joined10:56
→ muelleme joined10:58
← aristotle left11:00
← muelleme left11:03
← zlogan left11:08
→ zlogan joined11:08
→ royal_screwup21 joined11:13
→ R2robot joined11:15
→ cdown_ joined11:17
← cdown left11:20
cdown_ → cdown11:20
→ clara97 joined11:22
← tiin57 left11:23
→ AtumT joined11:25
→ tiin57 joined11:27
← R2robot left11:30
→ Cabanossi joined11:30
wyre this is not maybe a git question itself ... but I'm curious, could I have README.md inside /doc folder?11:32
should I do a symlink to / to get the README.md renderized in platforms like github?11:32
bremner I don't think "platforms like github" is well defined.11:33
Also I don't know the answer.11:33
nedbat wyre: if i clone a repo, i expect to find the readme in the top directory.11:34
← sudoforge left11:41
→ cd joined11:43
→ jas4711 joined11:44
← Lunatrius left11:44
→ dostoyevsky joined11:46
dostoyevsky This command takes a long time on my machine: `find archived -type f | xargs git add -f' -- as there are like 100k files in there -- is there a way to just add all the untracked files for a subdirectory?11:47
bremner git add archived ?11:48
does "git add -f archived" not work?11:49
dostoyevsky oh yeah, you are right...11:49
so simple11:49
also, if I had .gitignore setup correctly I could also do something like "git add another_dir" # everything except *.pdf ...11:51
→ nowhere_man joined11:52
← jetchisel left11:53
← tiin57 left11:54
→ tiin57 joined11:57
→ muelleme joined11:59
← muelleme left12:04
bremner yes, that should work12:10
← jaziz left12:18
← jim left12:21
← tiin57 left12:23
→ sdw_three joined12:26
→ tiin57 joined12:27
→ stdedos joined12:32
→ jimm joined12:34
← rustyshackleford left12:37
→ nowhereman joined12:38
← nowhere_man left12:38
→ barteks2x joined12:39
→ yonder joined12:39
→ toresbe joined12:40
toresbe Hey folks! I had to rewrite my repo history because I had accidentally checked in a database backup. Now I have a bunch of files in my repo in the .git-rewrite directory. What are these? Should I check them in, should I delete them? I've been trying to Google but it's hard to find relevant results.12:41
git's manpage says it's the "temporary folder used for rewriting".12:43
rafasc where are you seeing that?12:44
man git12:44
gitinfo the git manpage is available at https://gitirc.eu/git.html12:44
rafasc what did you use to rewrite history?12:44
toresbe git --filter-branch12:49
rafasc: I think it's just a working directory that accidentally wasn't cleaned up for some reason. So I've just moved it out of the repo. :)12:49
rafasc toresbe: Don't remember seeing the directory, but it is explained in the page from man git filter-branch.12:51
gitinfo toresbe: the git-filter-branch manpage is available at https://gitirc.eu/git-filter-branch.html12:51
toresbe Well, it's mentioned - not quite explained :)12:51
→ m0viefreak joined12:52
rafasc it's the directory filter-branch uses to checkout the files.12:52
toresbe But I take from context that it truly is temporary and can be safely removed.12:52
rafasc Should be safe to remove after it is complete.12:52
toresbe Thanks. Just being overly cautious, but don't want to screw up the repo for everyone else you know :)12:52
→ ShapeShifter499 joined12:53
← tiin57 left12:53
rafasc understandable. Make sure you also prune the backup refs, (refs/original/...) after you are sure the rewrite is correct.12:54
also: the project is recommending other tools like !filter-repo instead of filter-branch.12:55
gitinfo A new git add-on that greatly improves on git-filter-branch: https://github.com/newren/git-filter-repo12:55
→ tiin57 joined12:57
← Eryn_1983_FL left12:58
→ SleePy joined12:58
→ Eryn_1983_FL joined12:58
→ muelleme joined13:00
→ fuzzface joined13:00
← muelleme left13:05
← igemnace left13:07
toresbe rafasc: thanks!13:10
rafasc yw :)13:10
→ mat001 joined13:11
← nowhereman left13:12
← cliluw left13:12
→ cliluw joined13:12
← cixx_ left13:14
→ nowhereman joined13:14
← tiin57 left13:23
→ tiin57 joined13:27
← cliluw left13:27
→ cliluw joined13:27
← cliluw left13:33
→ cliluw joined13:33
← cliluw left13:36
→ cliluw joined13:37
← NeoCron left13:39
→ CodeSlingerPaul joined13:39
OMGOMG is there some sort of git submodule guide for idiots that lets you avoid situations like this? https://pbot.rmdir.de/9SRVUynSd67as8yInPpGKA13:39
← cliluw left13:41
rafasc OMGOMG: there's nothing there that indicate submodule problems. Can you elaborate?13:41
→ cliluw joined13:41
→ cdown_ joined13:47
→ thebope joined13:48
← cdown left13:50
cdown_ → cdown13:50
← jas4711 left13:51
→ ferdna joined13:52
← tiin57 left13:53
→ jas4711 joined13:56
→ m0nk3y| joined13:56
→ tiin57 joined13:57
← delvian left14:00
→ muelleme joined14:01
→ tonythomas joined14:02
← muelleme left14:05
← nowhereman left14:09
← theorangeone left14:10
→ R2robot joined14:11
→ theorangeone joined14:11
← theorangeone left14:11
← stdedos left14:13
→ nowhereman joined14:14
← miklcct left14:15
→ miklcct joined14:16
→ Hilbert joined14:20
← tiin57 left14:23
← miklcct left14:23
→ miklcct joined14:24
← miklcct left14:24
→ miklcct joined14:24
→ tiin57 joined14:27
← nowhereman left14:28
→ Aquazi joined14:28
← zlogan left14:29
→ theorangeone joined14:37
← bitnoize left14:39
← cliluw left14:40
→ cliluw joined14:41
→ mydog2 joined14:45
mydog2 morn14:45
← paddy left14:47
→ Goplat joined14:48
← cliluw left14:52
→ cliluw joined14:52
→ thiago joined14:52
← tiin57 left14:54
→ Caspan joined14:55
→ tiin57 joined14:57
→ feriman joined14:58
← Caspan left15:00
→ g4570n joined15:00
← fuzzface left15:01
← dedowsdi left15:01
→ muelleme joined15:01
→ sozuba joined15:02
← CodeSlingerPaul left15:02
→ sweatsuit joined15:03
← sweatsuit left15:05
→ aliss joined15:05
← muelleme left15:06
→ sweatsuit joined15:09
→ HumanGeek joined15:10
← cliluw left15:12
→ cliluw joined15:13
← Human_G33k left15:14
← thebope left15:20
→ thebope joined15:21
→ jbeaudoin joined15:22
← treehug88 left15:23
← tiin57 left15:23
← johnny56 left15:24
← cliluw left15:24
→ cliluw joined15:25
← thebope left15:27
→ tiin57 joined15:27
← styler2go left15:28
→ paddy joined15:28
← beepbeep left15:30
→ johnny56 joined15:31
← tiin57 left15:53
→ thebope joined15:53
→ fannagoganna joined15:55
← cliluw left15:55
→ cliluw joined15:55
← thebope left15:56
→ Sleepy63 joined15:57
→ tiin57 joined15:57
→ delvian joined15:58
← Hilbert left16:02
→ muelleme joined16:02
← paddy left16:04
→ paddy joined16:04
→ rustyshackleford joined16:06
← Sleepy63 left16:06
→ orbyt_ joined16:06
← muelleme left16:07
→ Sleepy63 joined16:07
→ cdown_ joined16:13
← paddy left16:15
← feriman left16:15
← cdown left16:16
cdown_ → cdown16:16
← cliluw left16:18
→ paddy joined16:21
→ strk joined16:21
strk with apache, I keep getting [cgi:error] .. AH01215: fatal: The remote end hung up unexpectedly: /usr/lib/git-core/git-http-backend16:22
do you have an idea of the cause, and how to fix ?16:22
requests form the same IP have a user-agent of "git/2.20.1"16:23
← paddy left16:23
← tiin57 left16:23
→ tiin57 joined16:27
← jas4711 left16:28
← xcm left16:34
→ xcm joined16:35
gitinfo set mode: +v16:41
strk with apache, I keep getting [cgi:error] .. AH01215: fatal: The remote end hung up unexpectedly: /usr/lib/git-core/git-http-backend16:41
do you have an idea of the cause, and how to fix ?16:41
requests form the same IP have a user-agent of "git/2.20.1"16:41
← delvian left16:42
→ Xiti` joined16:45
← Xiti left16:47
→ bear38 joined16:52
→ darkstardev13 joined16:52
← tiin57 left16:53
bear38 Hello everyone, I am new to git. Is there some way to update the repo data, but *not* change to the latest version? For example, if I am on version 1.3 of a project, when version 1.4 comes out, "git checkout 1.4" will not work, since my local repo has no idea that version 1.4 exists yet. Is there some way to update the .git data, without changing me the local repo off of version 1.3 until I specifically execute "git checkout 1.4"?16:55
→ Betal joined16:56
→ tiin57 joined16:57
bear38 Actually, I think "git fetch" does exactly this.16:58
← mydog2 left16:58
ikke yes16:58
git fetch indeed16:58
bear38 ikke: Thanks.16:58
← mikecmpbll left17:00
→ delvian joined17:02
→ muelleme joined17:03
→ mydog2 joined17:06
← Aquazi left17:06
→ Phylock joined17:07
← sdw_three left17:07
← muelleme left17:08
← clara97 left17:12
jimm → jim17:12
→ dviola joined17:17
→ sdw_three joined17:18
← theorangeone left17:20
→ theorangeone joined17:21
← sdw_three left17:22
→ sdw_three joined17:22
← tiin57 left17:23
← sdw_three left17:25
→ sdw_three joined17:25
→ tiin57 joined17:26
← tgamblin left17:30
→ coco joined17:47
← akem left17:48
← orbyt_ left17:50
→ causasui joined17:51
← tiin57 left17:53
← aliss left17:54
→ Pixi__ joined17:56
→ tiin57 joined17:57
waterkip is there a hook that does somethin after a rebase?17:58
i've seen post-rewrite, but a rebase doesn't seem to hit it, amend does17:59
← Xiti` left17:59
← coco left18:00
→ clara97 joined18:01
rafasc waterkip: if rebase does not rewrite the commit, it doesn't trigger it. If you want to force it, you can pass --no-ff to rebase.18:03
→ muelleme joined18:04
waterkip hmm, lemme check18:04
that works18:04
rafasc waterkip: did you understand why?18:04
waterkip no, was going to have a look in the manpage rn18:05
it creates new commits18:05
which is why18:05
and than the hook is hit18:06
or triggered18:06
rafasc I don't think it is mentioned there. But usually you can run rebase without performing a rewrite. For example, it is useful to run tests: git rebase -i origin/master -exec './test'.18:06
waterkip ahh, that might even be nicer18:07
rafasc --no-ff, forces the rewrite even if it would result in could be fast-forwarded.18:07
even if the result could be fast-forwarded18:07
← muelleme left18:08
← SpeakerToMeat left18:09
waterkip would be nice if there was a post-rebase, just like there is a pre-rebase18:09
regardless of the outcome, do X18:10
→ SpeakerToMeat joined18:10
strk no ideas about my apache logged errors from git 2.20 (AH01215: fatal: The remote end hung up unexpectedly: /usr/lib/git-core/git-http-backend) ?18:11
→ AtumT_ joined18:12
waterkip hmm, --exec seems to work on all the rebase commits18:12
← AtumT left18:12
rafasc waterkip: yes, it schedules the execution of that command after each 'pick'18:14
waterkip I don't need that18:14
rafasc something you can do is fake an editor that appends an exec line right at the end.18:14
waterkip hmmm18:15
to much work for now18:15
it's for a branch I need to maintain because upstream doesn't merge the patches18:15
→ c0c0 joined18:15
rafasc the --exec example I mentioned was just to show that not everytime you run rebase you mean rewrite the commits.18:15
waterkip yeah I know18:16
nice feature18:16
i need to change rebase-merge/git-rebase-todo to have the exec18:17
perhaps via the git-prerebase hook?18:17
rafasc the safest would be to intercept it via sequence.editor.18:18
waterkip is there an example I can steal something from?18:19
← opal left18:19
waterkip i'll go with n-ff for now18:21
→ sidetrack joined18:21
waterkip easier and for my case, no downsides18:21
→ AtumT joined18:23
← tiin57 left18:23
← AtumT_ left18:24
rafasc #!/bin/bash18:26
sed -i '/^$/a exec echo ayy' $118:26
vim $118:26
then configure sequence.editor to that.18:26
→ bambanx joined18:26
← crose left18:26
→ tiin57 joined18:27
waterkip thnx18:28
rafasc ah, keep in mind that will only work for interactive rebase.18:29
→ Lucas_Gray joined18:30
waterkip non-interactive doesn't have a todo?18:30
rafasc --exec is a feature from the interactive backend.18:30
waterkip so the exec in the todo is ignored otherwise?18:31
rafasc I feel there's probably a better way to solve your problem.18:31
waterkip yes, upstream merging PR's18:31
rafasc waterkip: it will error if you try it.18:31
← shabius left18:31
→ opal joined18:32
rafasc why do you need to run a command?18:32
→ fission6 joined18:32
→ mikecmpbll joined18:32
waterkip because I'm making changes to src files which are build in dist/18:33
to use the product I need the dists file in the docker image18:33
i try to keep up to date with upstream, but they change the dist as awell, so I need to regerenate the18:36
→ DelPhyinf joined18:37
waterkip would be nicer if they just did the whole build artifact creation in the dockerfile18:38
→ Newami joined18:40
waterkip thanks for the elp18:41
i got what I needed :)18:41
← sidetrack left18:45
→ sudoforge joined18:47
← harv left18:48
→ harv joined18:51
→ Brainium joined18:53
← tiin57 left18:53
→ cliluw joined18:54
→ tiin57 joined18:57
← strk left18:57
→ Wryhder joined18:59
→ strk joined18:59
← Lucas_Gray left19:00
Wryhder → Lucas_Gray19:00
← Newami left19:02
→ alfredb joined19:03
← g4570n left19:03
→ muelleme joined19:04
← Ploppz left19:06
← m0nk3y| left19:06
← Lucas_Gray left19:07
← muelleme left19:09
→ jetchisel joined19:11
← jetchisel left19:11
→ jetchisel joined19:12
← onizu left19:13
→ SuperL4g joined19:13
→ BPL joined19:14
← Pixi__ left19:14
← SuperLag left19:16
← POQDavid left19:19
← pikapika left19:19
← nikivi left19:19
← acetakwas left19:19
→ POQDavid joined19:20
← R2robot left19:21
→ pikapika joined19:21
→ nikivi joined19:21
→ acetakwas joined19:22
← sdw_three left19:23
← tiin57 left19:23
→ orbyt_ joined19:25
→ SuperLag joined19:26
→ tiin57 joined19:27
← SuperL4g left19:29
← Muzer left19:32
← devster31 left19:33
→ sdw_three joined19:33
→ devster31 joined19:35
← rsarky left19:38
← sdw_three left19:38
← alfredb left19:40
→ shabius joined19:48
→ Muzer joined19:49
→ Lucas_Gray joined19:49
← shabius left19:51
← strk left19:52
← tiin57 left19:53
→ shabius joined19:53
← Lucas_Gray left19:54
→ Xiti joined19:55
→ tiin57 joined19:57
→ Ploppz joined19:58
→ Lucas_Gray joined20:00
→ muelleme joined20:05
← justanotheruser left20:06
→ sdw_three joined20:08
← Lucas_Gray left20:09
← muelleme left20:10
→ R2robot joined20:11
→ Lucas_Gray joined20:14
→ akem joined20:15
← roboirc left20:16
→ justanotheruser joined20:16
← acetakwas left20:17
← POQDavid left20:17
← sdw_three left20:17
→ PyDon joined20:21
PyDon hi20:21
can anyone help me? i am trying to figure out with which technique github and gitlab can support html and git through the same port20:21
is there a way to embedd a git daemon in an existing webservice?20:21
I am not exactly sure where to start my research20:22
→ acetakwas joined20:22
→ POQDavid joined20:22
ikke man git http-backend20:23
gitinfo the git-http-backend manpage is available at https://gitirc.eu/git-http-backend.html20:23
← tiin57 left20:23
ikke it's just specific paths that are handled by a special cgi back-end20:23
but services like github / gitlab most likely have their own implementations20:24
→ roboirc joined20:24
PyDon ikke: I see, thanks!20:26
→ tiin57 joined20:27
← Lucas_Gray left20:37
← mikecmpbll left20:37
← Phylock left20:38
← tanuki left20:38
→ Xiti` joined20:42
← Xiti left20:42
← Xiti` left20:42
→ muelleme joined20:43
← dviola left20:51
← tiin57 left20:53
→ feriman joined20:55
→ tiin57 joined20:57
→ virmaha joined20:59
→ g4570n joined20:59
→ leeN joined21:00
virmaha Hello git experts. I am running command git.exe archive --format=tar --remote=ssh://git@<myrepo.git> refs/heads/mybranch:myfolder --verbose but i always get fatal: The remote end hung up unexpectedly21:00
ssh -T [email@hidden.address] works fine21:01
git_Trace, git_curl_verbose, git_packet_Trace all have been set to 1 but nothing meaningful21:01
any idea what's going wrong21:01
→ treehug88 joined21:02
→ dviola joined21:03
← muelleme left21:05
← SpeakerToMeat left21:09
← sozuba left21:09
← ferdna left21:10
← leeN left21:13
← clara97 left21:21
→ Lucas_Gray joined21:21
→ SpeakerToMeat joined21:21
← tiin57 left21:23
→ puff joined21:23
→ tiin57 joined21:27
puff I just found out about git extras, curious as to what regard it's held in: https://github.com/tj/git-extras21:27
→ Caspan joined21:32
← feriman left21:35
rafasc I don't see much of a point for most of those commands.21:38
← fattredd left21:39
← virmaha left21:40
→ fstd_ joined21:40
← calcul0n left21:41
← DelPhyinf left21:42
← PyDon left21:44
← Lucas_Gray left21:44
← fstd left21:44
fstd_ → fstd21:44
→ sdw_three joined21:45
→ j9 joined21:47
j9 can someone help me with git, github and trying to access files from multiple computers?21:48
← j9 left21:48
→ j9 joined21:48
← Caspan left21:49
j9 Is it common that someone could access files from multiple systems/computers?21:51
rafasc j9: sure.21:52
← tiin57 left21:53
j9 rafasc I have a repo set up on github, visual studio code, etc. all using my laptop21:54
rafasc there are multiple ways to achieve it. For example, you could clone the repo into each machine and use github as a central repo.21:54
j9 but when i go to a desktop system i am lost at how to access it21:55
→ Caspan joined21:55
j9 okay i did try to clone on my desktop but warned me about not being an empty folder21:55
rafasc j9: that means you already have a directory with the same name.21:57
→ tiin57 joined21:57
j9 that is interesting as I did not create the directory on the second machine21:57
and rafasc forgive me i am somewhat, okay very new at this but trying to learn21:58
rafasc j9: don't worry about that.21:59
j9 thanks.22:00
rafasc when you run: git clone https://github.com/j9/blabla; git will make a clone of the repo in the directory blabla22:00
if the directory already exists, the clone fails.22:00
j9 makes sense up to that point22:01
rafasc Then ask another question.22:02
← aib left22:02
j9 was working on it - LOL - so if i create https://github.com/j9/"new directory" the clone will pass22:02
so i can work on my project make updates from the new system/computer22:03
when i go to the other location or computer i will be able to work on project and see updates made from the other system22:03
→ aib joined22:04
j9 one repo different clones22:04
rafasc j9: Not automatically. You need to ask git to transfer the objects.22:05
For example, imagine you have a project on: http://github.com/j9/myproj;22:06
← fission6 left22:06
rafasc you can clone it in both of your machines, then do some work on the laptop and push the changes to github.22:07
Then on the desktop, you can fetch the changes from github and continue working.22:07
→ Xiti joined22:07
j9 thank you makes sense...22:07
...have a great weekend.22:07
rafasc j9: in this setup you have github as a central server. But git itself doesn't need that.22:08
You could fetch and push changes directly between machines, but that may be a little bit harder to setup.22:08
j9: If you are new to git, !book is recommended.22:09
gitinfo j9: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable22:09
j9 than you22:09
rafasc and just a heads up, don't try to be smart and put the repository on something like "dropbox" or "google drive". It's a recipe for getting your repo corrupt.22:10
j9 I can only imagine thank you for that tip22:11
← j9 left22:12
→ j9 joined22:12
← Caspan left22:12
kevr is there a way to include travis-ci's build passing/failed widget for the _current_ branch being viewed in github?22:16
← j9 left22:17
kevr so, if i view it on master, it only shows me passing/failed state of master, etc22:17
oprypin kevr, 1) #github 2) no i dont think so, it's a plain image url, there's no way to pass that info. however, of course, you could hardcode that branch's name on the branch itself22:19
mackerman kevr: That would be more on topic over at #github22:20
kevr gotcha.22:22
apologies22:22
← tiin57 left22:23
← xcm left22:26
kevr neat, the zoom client on linux doesn't look too bad at first glance22:27
w/c.22:27
→ tiin57 joined22:27
→ xcm joined22:27
← Eryn_1983_FL left22:37
→ nabil joined22:42
← Ploppz left22:46
oprypin ಠ_ಠ22:49
← SpeakerToMeat left22:49
→ Caspan joined22:52
← tiin57 left22:53
← SuperLag left22:56
→ tiin57 joined22:57
→ SuperLag joined22:58
← Cabanossi left23:02
← BPL left23:04
→ Cabanossi joined23:07
→ skered joined23:09
→ cdown_ joined23:09
skered Is there a shorthand for hash^..hash? ex: git diff hash^..hash See the diff for a given commit?23:10
← SuperLag left23:11
← cdown left23:12
cdown_ → cdown23:12
→ Tawonga_ joined23:12
→ SuperLag joined23:12
← Tawonga left23:15
→ ferdna joined23:15
← ferdna left23:16
← Tawonga_ left23:16
→ Tawonga_ joined23:18
← Caspan left23:19
rafasc skered: git show hash23:23
git diff-tree hash23:23
← tiin57 left23:23
skered Thanks. In the mean time I found 'hash^!' too. Like git show though.23:24
rafasc I always forget you can use that with diff.23:26
→ tiin57 joined23:27
← caterfxo left23:27
← uebera|| left23:27
rafasc with log I sometimes use log A^! B instead of A..B; because it includes A itself.23:27
→ SwiftMatt joined23:29
← SwiftMatt left23:34
← Shentino left23:40
→ Shentino joined23:41
← g00s left23:42
→ SuperL4g joined23:49
← sz0 left23:50
← SuperLag left23:53
← tiin57 left23:53
→ Caspan joined23:54
→ SuperLag joined23:55
← SuperL4g left23:55
→ tiin57 joined23:57
→ Shentino_ joined23:58
← Shentino left23:58
→ sidetrack joined23:59

Logs Search ←Prev date Next date→ Channels Documentation