IRCloggy #git 2020-05-17

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-17

→ SuperL4g joined00:00
← barteks2x left00:01
waterkip hmmm00:01
git switch -c test -t origin/master --recurse-submodule, this should be done in all of the submodules irght?00:01
← SuperLag left00:02
→ ferdna joined00:03
← ShapeShifter499 left00:04
→ SuperLag joined00:05
← SuperL4g left00:05
→ ShapeShifter499 joined00:06
→ SuperL4g joined00:10
Hello71 uh... why?00:10
and why would you need both --recurse and "in all of the submodules"00:10
waterkip because of --recurse-submodule00:10
the action should happen in all of the submodules00:10
← Caspan left00:11
← SuperLag left00:11
thiago if you're asking whether Git will do that action in all the submodules, yes, it will00:12
if you're easking whether you ought to run that in each submodule, no, you don't have to00:12
waterkip it doesn't :(00:12
no, I'm asking the former, not the latter00:13
thiago diferent readings of "should be done"00:13
waterkip 2.26.x doesn't seem to do what I want it to do00:16
← sdw_three left00:17
→ SpeakerToMeat joined00:20
waterkip switch was introduced in 2.21 right?00:21
2.2300:22
← AtumT left00:22
→ Metalsutton joined00:23
← tiin57 left00:23
→ Shentino__ joined00:24
waterkip on a sidenote, been playing with submodules a bit, I like it00:25
← Shentino_ left00:25
→ tiin57 joined00:26
← tonythomas left00:28
→ sdw_three joined00:29
Hello71 enjoy it while it lasts00:31
waterkip why?00:31
the liking it bit?00:31
← sdw_three left00:33
→ SuperLag joined00:34
← moo left00:36
← wootehfoot left00:36
oprypin i just love when i mistype `git commit --amen` and it works00:37
← SuperL4g left00:38
← SuperLag left00:39
→ SuperLag joined00:40
← sidetrack left00:40
→ sidetrack joined00:40
← sidetrack left00:41
→ sidetrack joined00:41
→ CodeB joined00:42
← sidetrack left00:44
← bambanx left00:46
→ pinpox- joined00:50
→ inkbottle joined00:50
oprypin waterkip, yeah :D didnt last long for me00:50
← zebrag left00:51
→ Caspan joined00:51
oprypin better copy paste the whole thing than suffer submodules00:51
← pinpox left00:51
waterkip what where the difficulties you were having with it?00:52
pinpox- → pinpox00:53
← tiin57 left00:53
→ tiin57 joined00:57
← Shentino__ left01:01
← TomyWork left01:01
→ Shentino joined01:04
rafasc waterkip: most of the difficulties come from expecting things that submodules were not designed for. Submodules does one thing and does it well. Ensure that commit abc of my repo X runs with the contents of the commit xyz from repo Y in a subdirectory.01:06
Then there's all the particularities that comes with it. E.g. git does not store the submodule in the parent repo. The parent repo only stores a path, a commit ID, and a url.01:07
→ sdw_three joined01:08
← Caspan left01:08
rafasc If the url becomes unreachable, your submodule becomes unusable. If the submodule does weird rewrites and makes a commit that is used by your submodule unreachable, your submodule becomes unusable.01:09
Do you want to commit a modification to that directory, but keep that change as part of the parent project? Can't be done.01:10
this promises to alleviate some of the issues: https://github.com/apenwarr/git-subtrac01:13
waterkip click01:14
← sdw_three left01:14
rafasc Submodules aren't easy for other users either. They don't get initialized on clone...01:14
so you force everyone to learn submodules when they don't want.01:15
a simple change required in the submodule requires at least two commits. One in the submodule, and another in the parent registering the change.01:16
If you consider that some people struggle with pull, imagine having to pull in the inner repo, pull in the outer, then register the submodule changed yada yada.01:17
It may be easy if you know what you're doing, but it will be hell for the person that uses git using just pull push add commit.01:18
(not to mention potential conflicts)01:19
That being said, submodules are waaay better than they used to be. And they do what they were designed to do well.01:19
which is mostly "vendor lock" a dependency.01:20
waterkip and designed for being?01:20
→ dedowsdi joined01:20
rafasc designed to make sure your specific commit gets the specific commit from the other repo.01:21
waterkip re "it may be easy if you", most people don't fully grasp git in my experience, and stay with the basics, which is a shame really01:21
rafasc Imagine it as if you added 'repox = v1.0.2' but instead of version, it's even finer than that. It's the specific commit.01:22
it's a lot less flexible than lets say a dependecy manager that lets you do repox ~> 2.001:23
waterkip ha01:23
← tiin57 left01:23
rafasc what you say it is true, and some of the bad reputation that submodules get comes from people not understanding it fully, trying to make it do things that it wasn't designed to, failing, then blaming that it sucks.01:24
waterkip <wants to say something about the npm crowd in regard to versioning>01:24
seems I want o use it for what is was designed for01:24
make sure a super project works with commit X01:25
rafasc my ~> example was from ruby. :P01:25
waterkip i see in a lot of package.json files version pinning because htye are scared of dependencies going up01:26
→ tiin57 joined01:27
rafasc waterkip: A classic example that was mentioned here recently.. e.g. git archive doesn't work with submodules.01:29
← lukd left01:30
rafasc neither does git bundle...01:30
waterkip so a submodule is a second class citizen01:30
→ lukd joined01:31
waterkip you could fgo for git submodule foreach 'git bundle'?01:31
never used bundle or archive btw01:33
rafasc yea, you could, but that creates N bundles, you need to deal separately.01:33
same thing with git archive.01:33
waterkip isn't that do one thing and do it wel?01:34
having those to do all of that creates other mess?01:34
rafasc well, git archive is supposed to create a file archive of my repo. Ignoring submodules isn't 'do it well'01:35
→ vdamewood joined01:35
thiago you can concactenate tarballs01:36
rafasc There's an entry in my repository tree (the commit is recorded in the tree itself) that is completely skipped over.01:36
← shicks2525 left01:37
rafasc I re-implemented an idea I saw on github: https://upaste.de/NUU that kinda of works.01:39
→ akula joined01:39
rafasc But gave up, because tarball concatenation is the way to go. Because export-subst, and export-subst are no honored.01:40
→ sdw_three joined01:42
rafasc and while tarball concatenation works if you have a local clone, it doesn't for git archive --remote=x ...01:42
→ shicks2525 joined01:42
← dedowsdi left01:46
← xcm left01:50
→ xcm joined01:50
← vicfred left01:51
← m0viefreak left01:51
← tiin57 left01:53
→ Caspan joined01:54
→ tiin57 joined01:57
→ dedowsdi joined02:03
← dviola left02:04
← Caspan left02:12
← SuperLag left02:15
← rafasc left02:16
← sdw_three left02:16
→ SuperLag joined02:16
← SuperLag left02:22
← tiin57 left02:23
→ SuperLag joined02:23
→ dviola joined02:24
← royal_screwup21 left02:24
→ tiin57 joined02:26
→ sdw_three joined02:27
← dedowsdi left02:27
← sdw_three left02:32
← lagothrix left02:34
→ lagothrix joined02:34
← SuperLag left02:34
→ vicfred joined02:35
→ SuperLag joined02:36
← vicfred left02:38
← Cabanossi left02:42
← dviola left02:45
→ Cabanossi joined02:47
→ Caspan joined02:51
→ sidetrack joined02:52
← tiin57 left02:53
← SuperLag left02:53
→ braj joined02:54
→ SuperLag joined02:56
→ tiin57 joined02:57
→ tgamblin joined02:59
← SuperLag left03:00
→ SuperLag joined03:01
→ barteks2x joined03:02
← braj left03:06
← SuperLag left03:07
← Brainium left03:07
← kjartan left03:07
→ crisfm joined03:07
→ SuperLag joined03:07
← Caspan left03:08
→ kjartan joined03:08
← sidetrack left03:08
vdamewood → vinleod03:09
vinleod → vdamewood03:11
→ SuperL4g joined03:12
← SuperLag left03:12
← Shentino left03:16
→ rsarky joined03:17
← SuperL4g left03:17
→ jaggz joined03:19
jaggz how do I see a single file's changes that are in the last commit?03:21
like git diff file.c HEAD^^03:21
→ Shentino joined03:21
← tiin57 left03:23
→ SuperLag joined03:23
← bear38 left03:25
→ tiin57 joined03:27
thiago git show -- file.c03:30
waterkip git log -p -n1 file?03:30
thiago git diff @^! file.c03:31
you may need to escape either the ^ or the ! or both03:31
my answers and waterkip are slightly different if the file was not modified in the last commit03:32
← Metalsutton left03:36
← filcab left03:48
← cd left03:48
← tiin57 left03:53
→ tiin57 joined03:56
→ Caspan joined03:59
→ wymillerlinux joined04:11
← Caspan left04:16
→ sidetrack joined04:16
← fannagoganna left04:20
← sidetrack left04:21
jaggz I think I messed something up. when I do git diff current_branch_name^ I see the + lines show the changes I actually want04:23
← tiin57 left04:23
jaggz that's doing diff current previous right?04:23
I was trying to rebase to master04:26
now I think I made a mess04:26
:/04:26
:(04:26
→ tiin57 joined04:27
→ crose joined04:28
→ sdw_three joined04:28
jaggz oh no, I'm ok. diff br^^ br shows things fine04:29
→ Eryn_1983_FL joined04:34
← ghost43 left04:34
→ sidetrack joined04:34
→ ghost43 joined04:35
← sidetrack left04:39
← crose left04:43
→ crose joined04:43
→ calcul0n joined04:46
→ pspace joined04:47
← tiin57 left04:53
→ Caspan joined04:54
→ tiin57 joined04:57
← fitzgerald1337 left05:01
← sdw_three left05:03
← g4570n left05:05
← jbeaudoin left05:05
→ Newami joined05:11
← Caspan left05:11
← Newami left05:12
← thiago left05:12
← delvian left05:13
→ sdw_three joined05:14
← wymillerlinux left05:14
← xcm left05:16
→ xcm joined05:16
← sdw_three left05:19
← tiin57 left05:23
← Betal left05:24
← d4rkHelmet left05:26
→ tiin57 joined05:27
→ bettencb joined05:30
← vdamewood left05:38
→ Wulf joined05:39
Wulf Hello. How can I change the meta data (author, date, etc.) of a git commit? it's not pushed anywhere yet.05:39
→ FH_thecat joined05:42
→ fannagoganna joined05:44
← orbyt_ left05:44
← skered left05:44
→ Caspan joined05:48
← tiin57 left05:53
→ tiin57 joined05:57
← Caspan left06:05
→ uebera|| joined06:06
← dreinull2255 left06:08
→ yashi joined06:10
→ lucianp joined06:12
lucianp When git stash pop encounters a merge conflict, there is a message that a preimage is recorded as part of the rerere feature. Is there a way to record the resolution with git stash?06:14
← tiin57 left06:23
→ tiin57 joined06:27
← FH_thecat left06:29
→ astronavt joined06:31
← astronavt left06:32
→ astronavt joined06:34
← astronavt left06:36
→ astronavt joined06:38
← astronavt left06:39
→ astronavt joined06:40
← astronavt left06:42
→ astronavt joined06:46
← crisfm left06:52
← tiin57 left06:53
→ Caspan joined06:54
→ tiin57 joined06:56
← yonder left06:57
← Heirlung left07:03
→ Heirlung- joined07:03
→ rjsalts joined07:03
Heirlung- → Heirlung07:04
→ VPS joined07:06
← Caspan left07:11
→ sdw_three joined07:14
j416 Wulf: set it like normal (git config --global user.name Foo Bar; git config --global user.email [email@hidden.address] and then commit with --reset-author. Or, man git-commit look for --author, --date. For committer, set GIT_COMMITTER_{NAME,EMAIL}.07:19
gitinfo Wulf: the git-commit manpage is available at https://gitirc.eu/git-commit.html07:19
j416 (and you may or may not want to set a global e-mail if you prefer different e-mail addresses depending on repo, but above should at least get the point across)07:21
← tiin57 left07:23
→ sidetrack joined07:23
→ tiin57 joined07:27
← ferdna left07:31
← Goplat left07:34
← SpeakerToMeat left07:34
→ Caspan joined07:35
← pspace left07:35
← sidetrack left07:39
← Caspan left07:41
→ SpeakerToMeat joined07:42
← Bcadren left07:43
← sdw_three left07:49
→ Caspan joined07:50
→ dedowsdi joined07:51
→ feriman joined07:52
← tiin57 left07:53
← bettencb left07:54
→ tiin57 joined07:56
← mat001 left07:57
→ sdw_three joined08:00
← barteks2x left08:02
← javaJake left08:03
→ javaJake joined08:03
← sdw_three left08:05
→ aw1 joined08:06
← Caspan left08:07
→ g00s joined08:07
elichai2 Hi, how do I see only commits updating a specific submodule?08:10
ikke git log -- path/to/submodule08:10
elichai2 ikke: thanks!08:11
ikke the "--" is probably optional, but in some cases required, so I tend to add it always08:12
→ BPL joined08:12
→ neure joined08:13
neure hi08:13
elichai2 Another thing, every time I do `git pull` it also updates the submodules which I then need to reset, is there some flag I can pass git pull so it won't do it?08:13
neure I have setup multiple github accounts with ~/.ssh/config where I have two user accounts08:15
now when I do git push, I get error that permission denied to my git to <wrong user>.08:15
I wonder where does git get that wrong user from?08:15
`git config user.name` and `git config user.email` show the correct user08:16
these are in .git/config08:16
my origin url is form [email@hidden.address]08:17
oh, ssh keyring is the cause08:20
→ jaziz joined08:22
← tiin57 left08:23
→ tiin57 joined08:26
→ staafl_r19 joined08:27
→ NeoCron joined08:32
← sudoforge left08:32
→ delvian joined08:36
→ filcab joined08:39
→ raven-au_ joined08:41
← raven-au left08:41
raven-au_ → raven-au08:41
← tiin57 left08:53
← jaggz left08:55
← g00s left08:56
→ tiin57 joined08:57
← causasui left08:58
→ Caspan joined08:59
→ Caspan_ joined09:07
j416 neure: the user and e-mail set in the config have nothing to do with authentication09:08
← SoF left09:08
→ SoF joined09:09
← Caspan left09:11
→ Hilbert joined09:12
neure yeah, I figured09:13
I got it sorted09:13
← Caspan_ left09:16
← tiin57 left09:23
j416 o/09:24
→ tiin57 joined09:27
← neure left09:27
← filcab left09:37
← xcm left09:44
→ xcm joined09:45
→ Caspan_ joined09:46
→ aliss joined09:46
← tiin57 left09:53
← denisse left09:56
← darkstardev13 left09:56
→ denisse joined09:56
→ tiin57 joined09:56
→ sdw_three joined10:01
← Caspan_ left10:03
← xcm left10:04
→ xcm joined10:05
← rsarky left10:07
← Cabanossi left10:19
← dfee left10:20
← tiin57 left10:23
→ tiin57 joined10:27
→ j7k6 joined10:37
← crose left10:44
→ dionysus69 joined10:44
→ Sp00ky31 joined10:45
→ Lucas_Gray joined10:45
→ filcab joined10:46
→ onizu joined10:52
← tiin57 left10:53
← sdw_three left10:54
← andreas303 left10:54
→ tiin57 joined10:57
→ andreas303 joined10:57
← cim209 left11:01
→ cim209 joined11:02
→ rsarky joined11:02
→ sdw_three joined11:05
→ m0viefreak joined11:06
← sdw_three left11:11
← delvian left11:15
← chiastre left11:16
→ chiastre joined11:20
← tiin57 left11:23
→ Cabanossi joined11:25
→ tiin57 joined11:27
→ sidetrack joined11:34
← Eryn_1983_FL left11:35
→ Eryn_1983_FL joined11:36
→ sdw_three joined11:37
← sidetrack left11:39
→ aw1_ joined11:40
← aw1 left11:43
← sdw_three left11:43
→ sdw_three joined11:43
← Sp00ky31 left11:48
← filcab left11:51
← tiin57 left11:53
← c0c0 left11:55
→ tiin57 joined11:57
← rsarky left11:57
→ delvian joined12:01
→ barteks2x joined12:01
→ royal_screwup21 joined12:02
← aliss left12:03
→ aliss joined12:03
← Hilbert left12:05
→ sz0 joined12:07
→ Sp00ky31 joined12:10
← vishal left12:10
→ vishal joined12:12
→ filcab joined12:18
← Lucas_Gray left12:18
← tiin57 left12:23
→ tiin57 joined12:27
← perrier-jouet left12:40
→ sidetrack joined12:41
← sidetrack left12:46
→ rafasc joined12:51
← tiin57 left12:53
← toothe left12:55
→ tiin57 joined12:56
→ perrier-jouet joined12:57
→ mat001 joined13:11
← uebera|| left13:11
← BPL left13:12
← dedowsdi left13:12
→ dedowsdi joined13:14
← VPS left13:15
← perrier-jouet left13:16
→ VPS joined13:16
→ HourGate joined13:21
← anddam left13:21
← tiin57 left13:23
→ paws_ joined13:23
→ cd joined13:25
← cdown left13:25
→ sidetrack joined13:25
→ tiin57 joined13:26
→ cdown joined13:28
← sidetrack left13:30
← sdw_three left13:31
→ clara97 joined13:31
← jaziz left13:36
→ sdw_three joined13:39
→ miczac joined13:42
→ fission6 joined13:46
→ wymillerlinux joined13:47
→ tlaxkit joined13:53
← tiin57 left13:53
→ donofrio joined13:53
→ tiin57 joined13:57
← dedowsdi left13:57
→ perrier-jouet joined14:04
→ miczac_ joined14:13
← miczac left14:14
→ rsrx joined14:19
← fling left14:19
→ dfee joined14:22
← tiin57 left14:23
← dfee left14:23
→ tiin57 joined14:26
← teward left14:28
← xcm left14:28
→ xcm joined14:29
← cbreak left14:30
→ cbreak joined14:31
← rustyshackleford left14:35
→ tonythomas joined14:36
→ teward joined14:37
← Eryn_1983_FL left14:41
→ Eryn_1983_FL joined14:42
← Sp00ky31 left14:43
→ sidetrack joined14:47
← HourGate left14:47
→ HourGate joined14:48
→ AtumT joined14:49
→ Aquazi joined14:50
← sidetrack left14:52
→ capadesu_ joined14:53
← tiin57 left14:53
→ gareppa joined14:53
← learningc left14:54
→ g4570n joined14:54
← gareppa left14:54
→ Caspan_ joined14:55
← miczac_ left14:56
→ tiin57 joined14:57
→ davispuh joined14:57
← Caspan_ left15:00
→ orbyt_ joined15:01
← sdw_three left15:02
← jjakob left15:03
→ jjakob joined15:06
← HourGate left15:07
→ HourGate joined15:07
→ tgunr joined15:08
→ tanuki joined15:10
→ sdw_three joined15:12
→ flex14 joined15:13
← tanuki left15:14
→ darkbit joined15:15
← xcm left15:16
→ fitzgerald1337 joined15:16
→ xcm joined15:16
← astronavt left15:17
← sdw_three left15:17
← HourGate left15:18
→ astronavt joined15:18
→ HourGate joined15:18
← astronavt left15:18
→ astronavt joined15:19
← astronavt left15:19
→ astronavt joined15:19
← HourGate left15:21
→ HourGate joined15:22
← tiin57 left15:23
← capadesu_ left15:23
→ thiago joined15:23
← astronavt left15:25
→ astronavt joined15:25
→ tiin57 joined15:26
→ calcul0n_ joined15:27
← calcul0n left15:27
→ ferdna joined15:28
← astronavt left15:33
→ sidetrack joined15:34
→ astronavt joined15:35
→ uebera|| joined15:37
← sidetrack left15:38
→ Goplat joined15:46
← delvian left15:50
← tiin57 left15:53
→ tiin57 joined15:57
→ kuklofon joined15:58
→ kuklofon_ joined16:04
→ Hilbert joined16:06
← kuklofon left16:07
→ Newami joined16:07
← Newami left16:08
→ sudoforge joined16:15
← royal_screwup21 left16:17
← xcm left16:19
→ xcm joined16:19
← tgunr left16:21
→ royal_screwup21 joined16:22
← tiin57 left16:23
→ tiin57 joined16:26
← fission6 left16:27
→ TomyWork joined16:27
← opal left16:28
→ opal joined16:28
→ Betal joined16:30
← xcm left16:31
→ xcm joined16:32
→ gareppa joined16:40
← gareppa left16:42
← rsrx left16:44
→ fling joined16:44
→ gareppa joined16:46
← royal_screwup21 left16:48
→ royal_screwup21 joined16:48
← orbyt_ left16:48
← royal_screwup21 left16:53
← tiin57 left16:53
← gareppa left16:54
→ tiin57 joined16:57
→ orbyt_ joined16:57
← wymillerlinux left16:58
→ chandoo joined16:58
→ wnbeser joined16:58
→ kupi joined16:59
yashi What to do about this error message:17:00
error: Could not stat '.git/objects/ce/tmp_obj_lprk2a'17:00
(after executing git annex sync)17:00
← denisse left17:00
→ denisse joined17:01
← inkbottle left17:02
→ maryo joined17:02
→ rustyshackleford joined17:02
→ inkbottle joined17:02
→ crose joined17:05
→ royal_screwup21 joined17:06
→ wymillerlinux joined17:06
← astronavt left17:10
← misuto left17:12
← paws_ left17:12
→ delvian joined17:13
→ rsarky joined17:17
← TomyWork left17:18
→ misuto joined17:19
← HumanGeek left17:22
→ HumanGeek joined17:22
→ Narrat joined17:23
← tiin57 left17:23
→ tiin57 joined17:26
← LiENUS left17:27
→ learningc joined17:28
→ sunrunner20 joined17:28
→ iffraff joined17:30
→ LiENUS joined17:30
← iffraff left17:31
← Hilbert left17:33
→ jstein joined17:35
← orbyt_ left17:39
→ CodeSlingerPaul joined17:42
→ theoceaniscool joined17:43
→ sidetrack joined17:45
rafasc yashi: seems like a permission problem, or corruption.17:48
My guess is that something was trying to write an object there, using write to temp, then rename to prevent partial writes, and something failed.17:50
← sidetrack left17:52
← tiin57 left17:53
→ troulouliou_div2 joined17:53
→ causasui joined17:53
→ sidetrack joined17:53
← troulouliou_div2 left17:55
→ tiin57 joined17:57
yashi rafasc: so how can one recover from this?18:00
← xcm left18:00
→ tgunr joined18:02
→ bolovanos joined18:06
→ fission6 joined18:07
← tgunr left18:07
rafasc running git fsck could be a good starting point.18:10
← perrier-jouet left18:13
→ nullheroes joined18:13
← graingert left18:14
→ graingert joined18:15
→ Meli joined18:15
→ kuklofon__ joined18:18
← delvian left18:20
← kuklofon_ left18:20
→ delvian joined18:22
← ferdna left18:22
← tiin57 left18:23
→ ferdna joined18:24
← xelxebar left18:25
→ tiin57 joined18:27
→ xelxebar joined18:27
→ astronavt joined18:28
yashi git fsck says the following:18:31
dangling blob 520df7449b8b8ecff36feed931fcec695a6b379e18:31
dangling blob 6b538d63b8067d99f7f0a7cac51d2fa56401e91918:32
not sure what that means18:32
← fling left18:32
← astronavt left18:33
→ astronavt joined18:33
← astronavt left18:33
→ fling joined18:34
→ astronavt joined18:34
← astronavt left18:35
rafasc it just means you have those objects, but they're not referenced by anything else. It's normal.18:35
bremner yashi: it's not obviously git-annex specific, but there is a git-annex channel on irc.oftc.net if you need annex specific help18:36
yashi ok there weren't any other errors18:36
bremner: Thanks, I tried it once and nobody ever talks there18:36
bremner you have to be patient, yes.18:37
← delvian left18:37
rafasc not sure, you probably need to run it with GIT_TRACE=1, not sure if there are envs for git annex.18:37
yashi let's see18:37
rafasc git annex also has a fsck.. git annex fsck..18:37
bremner it does, but the objects for annex are in a different place18:37
yashi ah ok with GIT_TRACE there is more info18:38
bremner .git/annex/objects18:38
rafasc bremner: but it still writes the symbolic links into the tree itself, right?18:38
yashi it seems like the error message happens when git gc --auto is run18:38
← acetakwas left18:39
← nikivi left18:39
bremner rafasc: yes, by default. Although there's a "new" mode that doesn't do that.18:39
rafasc yashi: can you make a backup of that file, or better make a complete backup and remove that file ?18:39
← pikapika left18:39
← roboirc left18:39
← POQDavid left18:39
yashi what's this new mode?18:39
rafasc: Let me try (I'm waiting for git annes fsck to finish)18:40
bremner yashi: something like v7 or "adjusted unlocked". I use the old symlink (indirect) mode, so I don't know the details.18:42
yashi I find the standard (symlink) mode to be not very useful on macOS18:43
Whenever you open files with Preview / Mail it ends up with the SHA hash name in the title18:43
is it better in linux?18:43
→ pikapika joined18:46
→ roboirc joined18:47
→ POQDavid joined18:47
yashi rafasc: I can't remove that file because it doesn't seem to exist?18:47
rafasc that explains the 'cannot stat' I guess... 🤦18:49
yashi so how to remove whatever is trying to reference it?18:50
rafasc If you run that thing again, does it error again?18:50
yashi git annex has been *such* a headache so far, I've had repos getting corrupted like 5 times18:50
rafasc: Yeah, I tried it like 10 times18:50
rafasc and refers the same 'tmpfile'?18:51
aw1_ HEAD and HEAD~1 are not ready for pushing yet. I have an unrelated fix that I committed but git rebased it to below/before H and H~1. If I checkout to H~3 (the fix I want to push) I will be in detached HEAD state. Will I be able to push to remote when in detached HEAD state?18:51
yashi yeah always the same guy18:51
rafasc Because usually those things are generated... the plot thickens.18:51
yashi since last night error: Could not stat '.git/objects/ce/tmp_obj_lprk2a'18:51
→ nikivi joined18:52
Henry151_ → Henry15118:52
→ acetakwas joined18:52
rafasc aw1_: While detached, you can push with git push origin HEAD:<target_branch_on_remote>18:53
← tiin57 left18:53
aw1_ rafasc, ah nice :) thanks so much18:53
← g4570n left18:53
← aliss left18:53
rafasc You don't even need to detach.. I think that git push origin HASH~3 would probably work, but not sure.18:54
you can try with push's "--dry-run" and see what happens.18:54
→ delvian joined18:54
→ tiin57 joined18:56
→ birkoff joined18:56
birkoff is there some git command that splits a mailbox patch file into its mail messages components ?18:58
← kuklofon__ left18:58
← SuperLag left18:58
→ SuperLag joined19:00
bremner git am ?19:00
rafasc man git mailsplit19:01
gitinfo the git-mailsplit manpage is available at https://gitirc.eu/git-mailsplit.html19:01
rafasc birkoff: ^ this was for you19:02
birkoff thanks rafasc19:02
rafasc yw19:02
→ vdamewood joined19:02
→ orbyt_ joined19:03
→ SuperL4g joined19:05
← causasui left19:08
← SuperLag left19:08
← wymillerlinux left19:11
→ tanuki joined19:14
← ferdna left19:15
← staafl_r19 left19:15
← flex14 left19:16
→ flex14 joined19:16
← Aquazi left19:19
→ muelleme joined19:23
← tiin57 left19:23
← flex14 left19:24
← silverwhitefish left19:25
→ causasui joined19:26
→ tiin57 joined19:27
aw1_ rafasc, sorry i had not checked your response. I will try that "git push origin HASH". Many thanks.19:27
rafasc aw1_: sorry, not HASH, HEAD~319:30
aw1_ oh i took that to mean the hash ... which should also work i think.. right?19:31
HEAD~3 is the symbolic name right? i can sub that with the SHAx id right?19:31
← davispuh left19:32
aw1_ i will try with the --dry-run :)19:32
thanks19:32
→ gato joined19:32
gato Hello colleagues. How can I bypass my proxy for a single 'git clone <repository>'19:34
i.e 'git clone <repo> --no-proxy'19:35
→ davispuh joined19:35
gato I dont want to modify my global git config19:35
is it possible?19:36
← fission6 left19:36
→ xcm joined19:37
rafasc aw1_: just checked, seems it doesn't work. But git checkout <hash>; git push origin HEAD:<targetbranch>; definitely will19:37
→ SwiftMatt joined19:38
krobelus gato: I think you can do HOME=/tmp git clone ...; this way git will not use ~/.gitconfig19:38
→ Brainium joined19:39
→ aw1__ joined19:40
aw1__ gato, http_proxy= https_proxy= git clone ... should work i think19:43
← aw1_ left19:43
SuperL4g → SuperLag19:44
aw1__ ah seems like gato meant to bypass the config for http.proxy in git rather than the env variables19:45
← maryo left19:46
gato I have .gitconfig with my proxy settings19:47
rafasc aw1__: maybe git -c http.proxy= clone19:47
gato can I add a rule to this file to avoid using proxy when I do 'git clone https://repo_name' ?19:48
← irrgit left19:50
← SwiftMatt left19:51
← tiin57 left19:53
→ aliss joined19:54
→ tiin57 joined19:57
→ JD-Robbs joined19:58
JD-Robbs If a repository I forked (GitHub) is deleted - will my fork continue to exist?19:59
→ maryo joined20:00
→ dfee joined20:03
→ irrgit joined20:05
Habbie JD-Robbs, i happen to know the answer is yes, it will - in fact, one of the existing forks will, through a magic decision process, be appointed as the new base repo20:05
JD-Robbs, but note that this is a gitub question, not a git question20:06
JD-Robbs Habbie: Interesting! Thanks. Say I were to be the only fork, would I become the new base repo?20:07
Habbie JD-Robbs, it seems unavoidable, but i make no promises :)20:07
JD-Robbs Habbie: :) THanks! Took a while, but also found this which corroborates what you said :) --> https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility20:09
Good to know!20:10
Habbie ok good20:10
← clara97 left20:11
→ fattredd joined20:12
← onizu left20:14
← gato left20:15
← crose left20:16
← ixian left20:17
→ ixian joined20:23
← tiin57 left20:23
← maryo left20:25
→ maryo joined20:25
→ tiin57 joined20:26
→ ariedro joined20:27
← ixian left20:30
→ ixian joined20:30
← JD-Robbs left20:31
← andreas303 left20:35
→ andreas303 joined20:38
← xcm left20:47
← lucianp left20:47
→ Codaraxis joined20:47
→ wootehfoot joined20:48
→ moo joined20:48
← tlaxkit left20:49
→ xcm joined20:50
← darkbit left20:50
← wootehfoot left20:51
← moo left20:51
← wnbeser left20:52
→ maryo_s joined20:53
← tiin57 left20:53
← maryo left20:56
→ tiin57 joined20:57
→ wymillerlinux joined20:57
xcm → Guest8962221:08
← Guest89622 left21:08
→ xcm joined21:08
Abdullah So I have a master repo and I have added my other repo as submodule to it. The work I do in master repo, also changes something in submodule which I have to commit then and push. Is there a way so if I commit into master repo, it should do same with submodule and push that as well?21:09
← Anthaas left21:09
Abdullah maybe git hooks?21:09
→ Anthaas joined21:11
thiago yes, you can do it with a hook21:12
I advise not to21:12
Abdullah thiago: I think so...21:12
thiago I advise that you do not develop both super and submdoule at the same time. You'll get into rebase conflicts.21:12
← quackgyver left21:12
thiago subumodules work best if the repositories are developed indepeendently21:13
Abdullah As sometimes I create a new branch, work, commit, come back to master and do cherry-pick.21:13
thiago so make your change to the submodule, test it, push it, release it21:13
then make the update to the supermodule to match21:13
Abdullah hmm21:14
thiago it's very hard to change commits in a supermodule if the submodule is not up-to-date. I highly recommend that you always leave the submodule in the commit that thte parent says it should be in.21:14
i.e., just after "git submodule update"21:14
← feriman left21:14
Abdullah thiago: How can I just get the last commit's message?21:15
thiago to see it?21:15
or to reuse it?21:15
Abdullah Just the message to use in another command21:15
Actually my super is containing my website source code.21:16
and submodule is rendered version of it21:16
thiago git log -n1 --format=%B21:16
Abdullah so what I was thinking, after commiting to master, I should use that commit message into a script which pushed submodule21:17
thiago piping or saving to a file works best, because of the newlines. If you read into a shell variable, remember IFS.21:17
the other way around: you want to commit to the submodule first and then update the submodule link21:17
I don't know that you can do that21:17
maybe do as you said and git commit --amend --no-edit21:18
are you thinking of a commit hook or a receive hook?21:18
Abdullah thiago: here is the deploy script I'm using for submodule push and commit https://bpaste.net/show/5CAA21:19
→ Caspan_ joined21:19
← bolovanos left21:19
thiago first, let me repeat I advise against this21:21
second, instead of set -e, just put the -e in the #! line21:21
third, test that stdout is a tty, so you don't print escape sequences to an editor capturing the output21:21
→ maestrojed joined21:21
thiago fourth, git add -A instead of git add .21:21
fifth: the commit message is in on the command-line?21:22
and sixth, I advise against this. Especially the part where you automatically push.21:22
what if you were making a test? What if you were working on a branch?21:23
Abdullah thiago: https://bpaste.net/show/R3JA21:23
← tiin57 left21:23
Abdullah now I hope it would be fine.21:23
it did what we are expecting but...21:25
modified: public (new commits) in git status21:25
→ Lucas_Gray joined21:25
Abdullah if its meant to be this way, just leave it21:25
→ tiin57 joined21:26
→ BPL joined21:26
← BPL left21:27
← maryo_s left21:27
Abdullah thiago: if I do test my work, and then run this script in older version, come back and do git add -am? I think that is also the soultion. isn't that?21:28
thiago: older version script was https://bpaste.net/show/5CAA21:29
→ adrian_1908 joined21:31
← dfee left21:31
← theoceaniscool left21:35
→ thebope joined21:35
← Anthaas left21:35
← Caspan_ left21:36
→ kjartan_ joined21:37
→ Anthaas joined21:37
← muelleme left21:38
→ yonder joined21:39
← Wulf left21:40
← dhollinger left21:40
← kjartan left21:41
→ dhollinger joined21:41
← HumanGeek left21:42
→ Caspan_ joined21:47
→ HumanGeek joined21:50
← HumanGeek left21:50
← Lucas_Gray left21:53
← tiin57 left21:53
← calcul0n_ left21:56
→ tiin57 joined21:56
← m0viefreak left21:57
→ fstd_ joined22:01
← denisse left22:01
← jstein left22:01
→ denisse joined22:01
← wymillerlinux left22:02
← Caspan_ left22:04
← fstd left22:04
fstd_ → fstd22:04
← sidetrack left22:15
→ sidetrack joined22:17
← sidetrack left22:18
← tiin57 left22:23
← adrian_1908 left22:26
→ tiin57 joined22:26
← Narrat left22:26
→ SwiftMatt joined22:27
→ teej joined22:28
← fling left22:35
→ cgi joined22:38
← thebope left22:38
→ thebope joined22:38
cgi ssh -Tvvv [email@hidden.address] -- works like a charm. GIT_SSH_COMMAND="ssh -vvvv" git clone ssh://git.mydomain.com/project/myproj.git -- gives me permission denied error.22:38
← zulutango left22:39
rewt what user is it trying to ssh as?22:40
→ g4570n joined22:40
cgi rewt, both commands are root22:41
rewt your first one is git@22:41
meaning user git on the remote22:42
cgi rewt, thanks - that is what was the problem!22:42
I added a config file - worked22:42
← thebope left22:43
← NeoCron left22:44
→ fling joined22:44
→ Caspan_ joined22:47
← delvian left22:52
← tiin57 left22:53
→ tiin57 joined22:56
← opal left22:57
→ wymillerlinux joined22:57
← Shentino left22:58
← shabius left22:59
→ Shentino joined23:00
← netz left23:03
← JanC left23:04
← Caspan_ left23:04
→ netz joined23:05
→ astronavt joined23:08
← aliss left23:09
→ opal joined23:10
← Shentino left23:14
→ darkstardevx joined23:15
→ Shentino joined23:17
→ dfee joined23:21
← jsatk left23:22
← tiin57 left23:23
→ HumanG33k joined23:23
← dionysus69 left23:23
← HumanG33k left23:24
→ HumanG33k joined23:25
→ tiin57 joined23:26
← Shentino left23:28
← opal left23:29
→ opal joined23:29
→ Shentino joined23:30
← dfee left23:37
← SwiftMatt left23:38
→ vicfred joined23:46
→ shabius joined23:46
→ ferdna joined23:49
→ vicfred_ joined23:49
← fitzgerald1337 left23:49
← vicfred_ left23:52
← vicfred left23:53
→ vicfred_ joined23:53
← tiin57 left23:53
→ JanC joined23:55
← tryte left23:56
→ tiin57 joined23:56
→ tryte joined23:56
→ fairuz joined23:57
→ Caspan_ joined23:59

Logs Search ←Prev date Next date→ Channels Documentation