IRCloggy #git 2020-08-05

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-08-05

← bn_work left00:01
← crose left00:03
← tiin57 left00:09
→ royal_screwup21 joined00:10
→ tiin57 joined00:13
← g4570n left00:15
← royal_screwup21 left00:15
← heth left00:19
→ heth joined00:20
← tgunr left00:20
← shush left00:20
→ shush joined00:21
marc2377-2 → test00:21
test → Guest5896200:22
← Guest58962 left00:22
→ marc2377 joined00:23
→ Wetmelon joined00:24
← BlessJah left00:24
← Lucas_Gray left00:24
→ BlessJah joined00:25
→ cfoch joined00:25
cfoch hello00:26
← shush left00:26
→ Lucas_Gray joined00:27
cfoch I created a worktree directory for a git repo using submodules, then in the worktree I did "git submodule init --recursive"... Now I want to get rid off of that worktree00:28
I get "fatal: working trees containing submodules cannot be moved or removed"00:28
What can I do?00:28
← random_yanek left00:34
← rafasc left00:37
← rumbler31 left00:38
← tiin57 left00:39
→ random_yanek joined00:41
← arcatech left00:42
→ tiin57 joined00:43
→ shush joined01:00
← sudoforge left01:01
← canton7 left01:02
← shush left01:05
← gildarts left01:05
← SwiftMatt left01:06
→ unihernandez22 joined01:07
← tiin57 left01:09
← independent left01:11
→ SwiftMatt joined01:12
→ tiin57 joined01:13
→ kalbasit joined01:14
→ causasui joined01:14
→ independent joined01:15
puff So after adding the gradle lines for the Hugo plugin, etc... I get: Manifest file does not exist: /home/puff/tablet_repo/src/main/AndroidManifest.xml01:15
← SwiftMatt left01:15
puff and: compileSdkVersion is not specified01:15
→ sudoforge joined01:16
j416 puff: wrong channel?01:16
← davispuh left01:16
← unihernandez22 left01:22
→ arcatech joined01:25
→ unihernandez22 joined01:25
← lukd left01:30
→ lukd joined01:31
← unihernandez22 left01:34
→ canton7 joined01:35
→ gildarts joined01:37
← Wetmelon left01:38
← independent left01:39
→ unihernandez22 joined01:39
← tiin57 left01:40
→ shush joined01:40
→ tiin57 joined01:43
← Lucas_Gray left01:43
→ SwiftMatt joined01:45
← shush left01:45
→ Wetmelon joined01:47
← tgamblin left01:49
→ Lucas_Gray joined01:49
→ tgamblin joined01:49
→ HumanG33k joined01:50
← ttoocs left01:50
← Cabanossi left01:51
← comptroller left01:54
→ Newami joined01:55
→ Cabanossi joined01:55
geosmile when i git submodule update --init --recursive - one of the submodules is stuck to non-master - anyone knows how to fix this?01:56
I want it to get master?01:56
← gildarts left01:56
geosmile This is a fresh clone - HEAD detached at 6dbb8b2 is what the submodule says01:57
→ tinfoil-hat joined01:57
geosmile I see why - the submodule attached to the parent project is make@6...01:57
how do i make it make@master?01:57
→ gildarts joined01:58
← F0rTex left01:58
tinfoil-hat Hi there, is it possible to move a git repo into a branch from another repo?01:58
← gildarts left01:59
← HumanG33k left01:59
tinfoil-hat I have like 5 different dotfile repos, which I would like to move into one git repo with one branch per distro01:59
→ F0rTex joined01:59
→ comptroller joined02:00
→ troulouliou_div2 joined02:00
← Newami left02:02
→ atomi_ joined02:02
→ HumanG33k joined02:03
← Someguy123 left02:05
→ Someguy123 joined02:08
← tiin57 left02:09
→ royal_screwup21 joined02:11
→ tiin57 joined02:12
← royal_screwup21 left02:15
← marc2377 left02:20
← HumanG33k left02:20
← lagothrix left02:22
→ lagothrix joined02:23
← chachasmooth left02:24
→ chachasmooth joined02:24
→ gildarts joined02:24
← mns left02:26
→ HumanG33k joined02:27
→ mns joined02:28
← CodeSlingerPaul left02:28
← codingquark left02:33
← mns left02:35
→ Goplat joined02:39
→ madduck joined02:40
← tiin57 left02:40
→ shush joined02:40
puff j416: Dangit, yes. SOrry.02:41
→ tiin57 joined02:43
← cfoch left02:43
← cuppajoeman left02:43
→ bhavikdbavishi joined02:44
← Cabanossi left02:48
→ Technodrome joined02:48
← arcatech left02:52
→ mns joined02:56
→ Cabanossi joined02:56
tinfoil-hat nvm got it02:58
→ bhavikdbavishi1 joined02:59
→ bn_work joined03:00
← bhavikdbavishi left03:01
bhavikdbavishi1 → bhavikdbavishi03:01
← m0viefreak left03:03
← bhavikdbavishi left03:07
← shush left03:09
← tiin57 left03:09
→ Muimi joined03:09
← synx left03:11
← justanotheruser left03:11
→ arcatech joined03:11
← arcatech left03:12
→ tiin57 joined03:13
→ umask078 joined03:15
← wymillerlinux left03:17
← troulouliou_div2 left03:23
→ bhavikdbavishi joined03:24
← kalbasit left03:24
← vicfred left03:29
→ lispmacs joined03:29
← Lucas_Gray left03:31
→ chuseman joined03:38
← tiin57 left03:39
← j7k6 left03:40
← dedowsdi left03:41
→ dedowsdi joined03:42
→ tiin57 joined03:42
← Cabanossi left03:42
→ j7k6 joined03:45
→ Cabanossi joined03:48
← stitched_unicorn left03:53
← level3 left03:54
→ libertyprime joined03:55
← SwiftMatt left03:55
→ stitched_unicorn joined04:02
← unihernandez22 left04:03
← caskd left04:03
← cruxeternus left04:04
→ unihernandez22 joined04:04
← unihernandez22 left04:04
→ unihernandez22 joined04:04
← Kaivo left04:06
← unihernandez22 left04:08
← tiin57 left04:09
→ Kintsugi joined04:09
← libertyprime left04:09
← Kintsugi left04:10
→ Kintsugi joined04:11
← mindCrime left04:11
→ libertyprime joined04:11
→ royal_screwup21 joined04:12
Kintsugi I'm trying to set up git for the first time, but am having problems with automatically generated binaries getting added/modified/tracked, etc. But I'm not sure how to set up the .gitignore. Am using Visual Studio Community and mostly C#04:12
Also using Unity04:12
→ unihernandez22 joined04:12
→ tiin57 joined04:13
← unihernandez22 left04:15
gildarts Kintsugi: For .gitignore just add the file name to ignore it. And git isn't really designed to hold binary blobs.04:16
→ justanotheruser joined04:16
← royal_screwup21 left04:17
Kintsugi I was hoping there was a pattern I could add that would make it simple04:17
I guess I'll just try experimenting with a few times. Been trying to set this up all day :P04:18
*with a few things04:18
← oatmealraisin left04:19
→ kalbasit joined04:23
← Gustavo6046 left04:24
← libertyprime left04:25
← bhavikdbavishi left04:26
← giorgian left04:27
→ libertyprime joined04:27
gildarts If they are all `.exe` you can do *.exe04:28
→ bhavikdbavishi joined04:28
Kintsugi It looks like most of them are in the obj and bin directories of the project folder. I will try ignoring those directories04:31
← geosmile left04:33
← Goplat left04:36
← mns left04:36
→ Guest20 joined04:38
Voxel Hey all :)04:39
Git for Windows or TortoiseGit?04:39
← tiin57 left04:39
← causasui left04:39
umask078 → umask07704:41
→ Kaivo joined04:41
← Kintsugi left04:42
→ tiin57 joined04:42
← Wetmelon left04:48
← libertyprime left04:50
→ libertyprime joined04:52
← lukd left05:00
→ lukd joined05:00
→ mns joined05:00
← mp3 left05:02
← mat001 left05:04
→ vicfred joined05:08
← vicfred left05:09
← tiin57 left05:09
← lucasb left05:10
→ tiin57 joined05:13
← wallacer3 left05:17
→ wallacer3 joined05:21
← xelxebar_ left05:22
→ xelxebar joined05:23
← mns left05:29
← Kaivo left05:34
→ makara1 joined05:37
← tiin57 left05:39
→ mat001 joined05:40
→ tiin57 joined05:43
→ bocaneri joined05:44
← mat001 left05:44
→ mns joined05:45
→ caskd joined05:48
→ rfuentess joined05:51
← libertyprime left05:54
→ bhavikdbavishi1 joined05:57
← bhavikdbavishi left05:57
bhavikdbavishi1 → bhavikdbavishi05:57
← thiago left05:58
← snowkidimd left06:04
→ libertyprime joined06:06
← sudoforge left06:06
→ cfoch joined06:09
← tiin57 left06:09
→ Wetmelon joined06:09
→ ferdna joined06:10
← xcm left06:11
→ xcm joined06:12
→ tiin57 joined06:13
→ royal_screwup21 joined06:13
→ YuGiOhJCJ joined06:14
← Wetmelon left06:15
← royal_screwup21 left06:18
← mns left06:18
→ stutter joined06:21
→ Aquazi joined06:21
→ feriman joined06:22
→ snowkidimd joined06:23
← ferdna left06:27
→ chele joined06:28
← Whiskey left06:28
→ KnoP joined06:32
← kalbasit left06:35
← dfee left06:36
→ mightyjens joined06:38
← tiin57 left06:39
→ independent joined06:41
→ tiin57 joined06:43
→ royal_screwup21 joined06:46
→ mns joined06:47
→ calcul0n joined06:50
→ Whiskey joined06:51
← snowkidimd left06:54
→ dionysus69 joined06:56
← dionysus69 left06:56
→ LetoThe2nd joined06:57
← unluckyshrubbery left07:06
← tiin57 left07:09
→ tiin57 joined07:13
→ Mattiaslndstrm joined07:16
← Betal left07:17
← mns left07:17
→ interrobangd joined07:18
→ dfee joined07:23
→ seiburii joined07:27
→ Kaivo joined07:30
→ ramsub07 joined07:30
← bn_work left07:31
ramsub07 Hi. I have a code that already has a remote defined and have been pushing to that repository. I'd want to separate branch alone into a new project. How do I change the remote just for a branch?07:34
← ramsub07 left07:34
→ mobidrop joined07:34
→ ramsub07 joined07:35
ramsub07 Hi sorry I was disconnected07:35
I have a code that already has a remote defined and have been pushing to that repository. I'd want to separate branch alone into a new project. How do I change the remote just for a branch?07:36
← libertyprime left07:37
← tiin57 left07:39
Jookia will git ever get the ability to decouple author/committer names/emails from the commit itself?07:42
→ tiin57 joined07:42
→ libertyprime joined07:43
guardian hello, is there something shorter than this by chance? "$(git rev-parse HEAD)$(git diff-files --ignore-submodules --quiet || printf -- '-dirty')"07:47
I'm adding labels to Docker images and I would like to capture the repository SHA1 and whether the tree is dirty or not07:47
← royal_screwup21 left07:49
← ramsub07 left07:49
→ tonythomas joined07:54
→ jaziz joined07:55
→ ramsub07 joined08:03
← alesan left08:05
→ alesan joined08:05
← tiin57 left08:09
→ otisolsen70 joined08:11
→ tiin57 joined08:13
→ dionysus69 joined08:16
← Aelius left08:23
→ m0viefreak joined08:23
→ crose joined08:24
→ Aelius joined08:24
← xcm left08:25
→ xcm joined08:25
→ Gustavo6046 joined08:27
← FabioP left08:27
← cfoch left08:29
← bocaneri left08:32
→ bocaneri joined08:33
← bocaneri left08:34
→ benfelin joined08:34
→ bocaneri joined08:35
→ unluckyshrubbery joined08:35
← bocaneri left08:39
→ bocaneri joined08:39
← tiin57 left08:39
← rfuentess left08:39
← Mattiaslndstrm left08:40
→ tiin57 joined08:43
→ rfuentess joined08:48
← dfee left08:55
→ vincent- joined09:03
→ palooka-jock joined09:08
← tiin57 left09:09
→ pinpox joined09:09
→ tiin57 joined09:12
← benfelin left09:15
← veegee left09:17
→ veegee joined09:20
→ royal_screwup21 joined09:32
→ Lucas_Gray joined09:33
→ veegee_ joined09:39
← justanotheruser left09:39
← tiin57 left09:39
← veegee left09:40
← syr left09:42
→ syr joined09:43
→ tiin57 joined09:43
→ benfelin joined09:44
← royal_screwup21 left09:44
→ royal_screwup21 joined09:44
→ Mattiaslndstrm joined09:45
← royal_screwup21 left09:49
← ramsub07 left10:07
← tiin57 left10:09
→ ramsub07 joined10:09
→ tiin57 joined10:13
→ rewrited joined10:14
← seiburii left10:22
← iNs_ left10:26
→ iNs joined10:27
← tonythomas left10:29
← bhavikdbavishi left10:30
← [Brain] left10:30
→ bhavikdbavishi joined10:30
→ cosimone joined10:32
← tiin57 left10:39
← g00s left10:40
→ tiin57 joined10:43
← Benzi-Junior left10:55
→ Masklin joined10:56
→ the_drow[m] joined11:01
the_drow[m] Hi everyone. How do I checkout the commit before the l merged?11:02
→ gxt joined11:02
→ Repox joined11:03
BtbN Uhm, not sure what you mean, but... attach ~1?11:08
← tiin57 left11:09
→ tiin57 joined11:12
thblt the_drow[m]: The commit before HEAD is HEAD~, if that's what you mean. You can also checkout any commit with git checkout COMMITISH-REF11:14
→ sgen joined11:14
the_drow[m] No I committed after that11:15
I just want to jump right before the last merge and create a new branch from there11:15
thblt git branch BRANCH COMMIT11:16
the_drow[m] I don't know the commit's sha11:16
I'm not a total beginner :)11:16
thblt well git log11:16
the_drow[m] is there a shortcut to jump to the last merge from there?11:17
← dedowsdi left11:17
the_drow[m] I mean show the merge commit of the last merge11:17
thblt find the first commit with two parents? Maybe11:17
← mightyjens left11:18
→ royal_screwup21 joined11:18
thblt git log --min-parents=211:18
the_drow[m] thanks!11:18
thblt You're welcome.11:19
← royal_screwup21 left11:19
→ dedowsdi joined11:19
→ royal_screwup21 joined11:19
ramsub07 Hi. i've a code that already has remote. I'd like to push this to a new repository(remote) . How do I do that?11:22
thblt ramsub07: you can git push to an url , IIRC11:22
For a one-time thing.11:22
ramsub07 thblt i'd like to change this permanantly11:23
thblt Or just create a new remote with a different name, git remote add upstream ssh://git.myserver.example.com…11:23
You want to change the URL of origin?11:23
← royal_screwup21 left11:24
thblt git remote set-url [--push] REMOTE URL11:24
← YuGiOhJCJ left11:26
← Cabanossi left11:26
→ royal_screwup21 joined11:27
← cosimone left11:29
← royal_screwup21 left11:33
→ royal_screwup21 joined11:33
→ Cabanossi joined11:34
→ rafasc joined11:39
← royal_screwup21 left11:39
← tiin57 left11:39
→ brunocarvalho joined11:40
→ tiin57 joined11:43
← sgen left11:45
← raven-au left11:51
→ raven-au joined11:52
→ tgunr joined11:54
← palooka-jock left11:56
→ raven-au_ joined12:02
← raven-au left12:04
→ palooka-jock joined12:05
→ raven-au joined12:06
← pinpox left12:07
→ pinpox joined12:07
← ramsub07 left12:07
← Whiskey left12:08
← dedowsdi left12:08
← raven-au_ left12:08
← Guest20 left12:09
← tiin57 left12:09
← feriman left12:09
→ vicfred joined12:10
→ dedowsdi joined12:11
← Celelibi left12:13
→ tiin57 joined12:13
→ cuppajoeman joined12:14
← raven-au left12:18
→ raven-au joined12:20
→ royal_screwup21 joined12:21
→ Wetmelon joined12:21
← dedowsdi left12:21
← interrobangd left12:22
→ dedowsdi joined12:25
← royal_screwup21 left12:26
→ royal_screwup21 joined12:26
← lankanmon left12:26
← thblt left12:27
→ lankanmon joined12:28
→ raven-au_ joined12:30
← jaziz left12:30
← royal_screwup21 left12:31
← raven-au left12:31
→ Whiskey joined12:32
→ royal_screwup21 joined12:35
← raven-au_ left12:35
← dedowsdi left12:36
→ hussam joined12:38
→ dedowsdi joined12:39
← tiin57 left12:39
→ FabioP joined12:39
← royal_screwup21 left12:40
→ royal_screwup21 joined12:40
→ tiin57 joined12:43
→ h3ck joined12:43
→ CodeSlingerPaul joined12:43
← rewrited left12:43
← CodeSlingerPaul left12:47
→ CodeSlingerPaul joined12:50
← Technodrome left12:50
← royal_screwup21 left12:52
→ royal_screwup21 joined12:52
→ level3 joined12:53
← Wetmelon left12:54
→ geosmile joined12:55
← jetchisel left12:57
← royal_screwup21 left13:04
→ royal_screwup21 joined13:04
← Cabanossi left13:05
→ Cabanossi joined13:06
← gxt left13:09
← tiin57 left13:09
← royal_screwup21 left13:09
→ tiin57 joined13:13
→ oatmealraisin joined13:18
FabioP is thre a commandline for mark individual files as staged/unstaged?13:18
Jookia git add / git reset/ ?13:20
← m0viefreak left13:21
→ causasui joined13:22
FabioP that was easy.. thx13:22
← bhavikdbavishi left13:22
canton7 FabioP, 'git status' reminds you what the right command to use for each file is13:30
FabioP yes that was dumb of me13:31
← tgunr left13:31
← diogenese left13:36
→ diogenese joined13:36
← sweatsuit left13:37
← tiin57 left13:39
← Cabanossi left13:41
→ tiin57 joined13:42
← Whiskey left13:47
← Mattiaslndstrm left13:47
→ Cabanossi joined13:48
→ Mattiaslndstrm joined13:48
→ TomyWork joined13:57
→ sweatsuit joined13:58
→ royal_screwup21 joined14:03
→ rumbler31 joined14:05
← royal_screwup21 left14:06
→ royal_screwup21 joined14:07
← tiin57 left14:09
← Repox left14:10
→ mat001 joined14:11
← royal_screwup21 left14:11
→ vdamewood joined14:12
→ tiin57 joined14:12
← rumbler31 left14:14
→ g4570n joined14:16
← jrnieder left14:17
← dedowsdi left14:18
← rustyshackleford left14:18
→ Brain joined14:22
→ tgunr joined14:26
→ [Brain] joined14:27
→ fstd_ joined14:27
← fstd left14:27
fstd_ → fstd14:27
← Brain left14:29
→ thiago joined14:30
→ Wetmelon joined14:32
← OMGOMG left14:35
← vicfred left14:35
→ akem_ joined14:38
← tiin57 left14:39
← chele left14:40
← akem left14:41
→ tiin57 joined14:43
← akem_ left14:43
→ snowkidimd joined14:43
← oatmealraisin left14:45
→ OMGOMG joined14:48
← h3ck left14:52
← tgunr left14:54
→ royal_screwup21 joined14:55
← caskd left14:55
→ Human_G33k joined14:56
← royal_screwup21 left14:57
→ royal_screwup21 joined14:58
← HumanG33k left14:59
→ dviola joined15:02
← royal_screwup21 left15:02
← mobidrop left15:03
→ mobidrop joined15:04
→ synx` joined15:05
→ royal_screwup21 joined15:05
← chuseman left15:08
→ chuseman joined15:09
← tiin57 left15:09
← ezio left15:09
← royal_screwup21 left15:10
→ royal_screwup21 joined15:10
→ mindCrime joined15:10
→ tiin57 joined15:13
→ vicfred joined15:13
→ SwiftMatt joined15:14
← royal_screwup21 left15:15
→ dfee joined15:15
← KnoP left15:16
→ dfee_ joined15:19
← dfee left15:20
← Wetmelon left15:20
→ cosimone joined15:23
→ Whiskey joined15:24
→ wnbeser joined15:24
← wnbeser left15:24
→ royal_screwup21 joined15:28
amosbird Hello, is it possible to have branch based user and email configuration?15:29
→ bgilb joined15:30
rafasc amosbird: no15:30
bgilb maybe i dont understand git, but i have a team of 3 working on the same branch, and we're randomly just erasing each others changes. any ideas?15:31
rafasc bgilb: you'll need to explain your workflow a bit better.15:31
amosbird can I have per worktree git config?15:32
bgilb we're all using vscode15:32
im not sure what that is15:32
rafasc amosbird: I think you can, but you have to enable it manually.15:32
bgilb our workflow is make a change in vscode -> commit -> push/pull15:33
also using github windows client for push/pull15:34
rafasc git usually don't delete the changes. Usually what happens is that when you pull, you'll get a conflict you have to solve.15:34
bgilb the other members say they haven't seen any conflicts is the thing, i keep asking them15:34
rafasc someone might be solving it wrong, or someone might be doing force-pushes to avoid solving the conflicts.15:35
bgilb i dont think they are15:35
rafasc bgilb: you can probably figure out where the changes are being "deleted" if you look at $git log -p --graph --oneline; for example15:36
amosbird rafasc: what do you mean by that?15:36
→ BPL joined15:37
rafasc amosbird: man git worktree; per-worktree configs is a extension for worktree15:39
gitinfo amosbird: the git-worktree manpage is available at https://gitirc.eu/git-worktree.html15:39
← tiin57 left15:39
bgilb that shows the line it was removed, but also doesn't quite make sense15:39
because it shows commit -> add line (usera) -> userb shows merge with new stuff on previous commit -> next commit shows randomly erase same stuff from userb15:40
rafasc amosbird: that is close to what you asked, but it will not be per-branch, as you can checkout other branches freely, and they will still use the worktree configuration, if you enable the extension.15:40
← Mattiaslndstrm left15:41
← royal_screwup21 left15:42
← thebope left15:42
→ royal_screwup21 joined15:42
→ tiin57 joined15:43
synx` → synx15:43
→ Guest67 joined15:46
rafasc amosbird: I think the other way to go about that problem is to write hooks, the type of hook kind of depends on the goal. Locally with pre-commit / pre-push or a server side update/pre-receive that denies the push.15:46
→ mp3 joined15:47
← royal_screwup21 left15:47
rafasc If you want this to be enforced, you have to do it on the server because hooks can be bypassed by running --no-verify15:47
→ cahoots joined15:49
→ sudoforge joined15:49
→ Wetmelon joined15:51
cahoots hi, i'm trying to find a file from an old branch. i can't use `git reflog` locally because i don't have many branches locally. instead, i want to fetch all branches that i created on my remote, but not branches created elsewhere. any ideas how to do this? there must be an easy way, since github lists these branches15:53
→ Lachezar joined15:53
Guest67 I have several commits on a parallel subversion repository. When I do `git svn init $SVN_REPO` it pulls them from subversion. Howver I can only see them in `git svn log`. How do I add them to my git branch?15:54
bremner git svn rebase, iirc15:55
Lachezar Hey all. I have multiple identities in a Git server (Github or Gitlab), I'd like to be able to set a different ssh key for connecting to those. Is there a way to configure a repository remote to use a specific SSH key?15:55
Guest67 `Unable to determine upstream SVN information from working tree history`,15:55
← zsoc left15:55
Lachezar Guest67: `git log --graph --all` see if you can see the commits. Then maybe `git checkout -b svn-trunk ...commit-id...`15:56
→ davispuh joined15:56
canton7 Lachezar, !multiple_id15:56
gitinfo Lachezar: git by itself does not allow you to specify which SSH key to use when speaking to a remote. You can use ssh_config+remote hostname tricks to achieve this goal: http://superuser.com/questions/272465/using-multiple-ssh-public-keys15:56
← sudoforge left15:56
Guest67 Lachezar thanks in advance15:56
Lachezar canton7: Thanks. I already have setup the .ssh/config. Totally forgot I can have aliases.15:57
Guest67 yes, they show up15:57
Lachezar Guest67: does `git branch -v -a` show anything that resembles the svn commits?15:58
rafasc There's also man git remote-ext; which allows you to wrap the command to specify the key in the "url". But is less known.15:58
gitinfo the git-remote-ext manpage is available at https://gitirc.eu/git-remote-ext.html15:58
Guest67 Lachezar it does, indeed.16:00
remotes/git-svn is my branch I think16:00
so that's just normal push to merge things?16:01
← unluckyshrubbery left16:01
Lachezar Guest67: remotes/git-svn is a 'remote' there should be branches under that, they should match the branches in the SVN repository.16:02
→ m0viefreak joined16:02
← heyitsrama left16:02
Lachezar Guest67: so probably `git checkout -b master remotes/git-svn/trunk` or something similar.16:02
← Sven_vB left16:02
bremner or just start again with git-svn clone16:03
Guest67 well anything under `remotes/origin/` was when I did the last `git-svn clone`16:04
→ caskd joined16:05
Guest67 like, I have a subversion history before this, and whenever I check those out, those have all of the old commits I've synced16:05
so `remotes/origin/HEAD` has an SVN commit from a month ago or something16:06
rafasc cahoots: git already fetches all the branches. Your clone is, well, a clone. It should contain all the remote branches locally.16:06
cahoots: git fetch myremote; will update them.16:06
← j7k6 left16:06
← tiin57 left16:09
→ Newami joined16:09
→ unluckyshrubbery joined16:10
← mobidrop left16:10
cahoots rafasc, ok cool. and how would i list all the commits across all the branches?16:11
→ mobidrop joined16:11
← benfelin left16:11
rafasc cahoots: git log --all; for example16:11
← Newami left16:11
← rfuentess left16:12
→ tiin57 joined16:13
Lachezar Guest67: Maybe you just need a `git pull`? I am not sure I understand your setup correctly.16:14
Q: Is there any way to `git log --graph`, but only show tips, splits and merges?16:15
Guest67 well, the problem isn't really whether I can pull svn changes. that seems to be just fine at the moment16:16
→ j7k6 joined16:17
Guest67 I just don't know what to do once I do a `git svn fetch` how to incorporate the detached head back into master16:18
→ bhavikdbavishi joined16:18
Lachezar Guest67: `git checkout master` && `git merge remotes/git-svn/trunk` ?16:19
← TomyWork left16:21
← dionysus69 left16:21
rafasc Lachezar: there's --simplify-by-decoration and --simplify-merges; but it's not really what you want.16:22
Lachezar: I think you could trick git into doing that if you tagged every merge and used --simplify-by-decoration...16:22
← orbyt_ left16:23
→ muhaha joined16:24
→ nly joined16:24
→ Guest20 joined16:26
→ orbyt_ joined16:28
Lachezar rafasc: Simplify by decoration is very close to what I want, but I'd like to see the commits where branches have split too. If possible ofcourse.16:28
rafasc: Ahhh... That's what you menat by tagging the merges :)16:29
← maxwilli- left16:31
← level3 left16:32
→ level3 joined16:32
→ Benzi-Junior joined16:32
→ Betal joined16:38
→ theoceaniscool joined16:38
← silverwhitefish left16:39
← tiin57 left16:39
← mobidrop left16:40
→ silverwhitefish joined16:40
→ Narrat joined16:40
→ trepidacious joined16:40
→ royal_screwup21 joined16:40
← royal_screwup21 left16:42
→ tiin57 joined16:43
→ royal_screwup21 joined16:43
gitinfo set mode: +v16:43
trepidacious Let's say I did something dumb in SVN, and made a branch from only one directory in the trunk. Now I've migrated to git, and it's all looking good, except that I can't merge that branch, because it only contains part of the trunk (master). The master hasn't actually had anything useful happen to it since the branch. Is there way to get the "partial branch" back into master, even if that involves overwriting the directory in master?16:44
→ oatmealraisin joined16:46
→ dqx_ joined16:47
← royal_screwup21 left16:48
← EmmaT_ left16:50
→ bhavikdbavishi1 joined16:51
← bhavikdbavishi left16:52
bhavikdbavishi1 → bhavikdbavishi16:52
→ orbyt_v7 joined16:55
← dviola left16:56
← bhavikdbavishi left16:56
→ bhavikdbavishi joined16:58
← Muimi left16:58
← mindCrime left16:59
→ royal_screwup21 joined17:07
→ shad11 joined17:08
← shad11 left17:09
← tiin57 left17:09
← royal_screwup21 left17:09
→ royal_screwup21 joined17:10
← Lucas_Gray left17:12
→ tiin57 joined17:13
← dqx_ left17:14
← royal_screwup21 left17:14
→ Maxattax joined17:15
← Cabanossi left17:15
→ dviola joined17:19
→ Cabanossi joined17:23
→ h3ck joined17:23
→ cfoch joined17:24
→ g00s joined17:24
← libertyprime left17:25
→ royal_screwup21 joined17:25
→ benfelin joined17:25
← royal_screwup21 left17:26
→ royal_screwup21 joined17:27
→ dqx_ joined17:30
← FabioP left17:32
← Cabanossi left17:32
← cosimone left17:35
← tiin57 left17:39
← bhavikdbavishi left17:40
→ wootehfoot joined17:41
→ cosimone joined17:41
→ tiin57 joined17:43
→ Cabanossi joined17:43
← Wetmelon left17:45
← LetoThe2nd left17:49
← Narrat left17:49
← dqx_ left17:54
→ dqx_ joined17:55
← SwiftMatt left17:55
← cim209 left17:58
→ cim209 joined17:59
← blowry left17:59
→ sav__ joined18:00
→ blowry joined18:00
→ Narrat joined18:03
← dqx_ left18:04
← cosimone left18:06
← tiin57 left18:09
→ cosimone joined18:10
→ tiin57 joined18:13
→ justanotheruser joined18:19
→ wolfshappen joined18:23
→ mowcat joined18:24
← davispuh left18:24
→ sozuba joined18:26
← bocaneri left18:27
← theoceaniscool left18:27
← cosimone left18:30
← Lachezar left18:31
→ Phylock joined18:31
→ akem joined18:33
→ mindCrime joined18:36
← wootehfoot left18:38
← tiin57 left18:39
← mindCrime left18:42
→ tiin57 joined18:43
→ wunderba_ joined18:46
← SporkWitch left18:53
← dfee_ left18:54
→ mns joined18:54
→ SporkWitch joined18:56
→ mijndert joined18:59
← stitched_unicorn left19:03
→ davispuh joined19:04
→ dfee joined19:07
→ cosimone joined19:09
← tiin57 left19:09
→ tiin57 joined19:13
← Utnap left19:13
→ Utnap joined19:16
← otisolsen70 left19:24
→ Mattiaslndstrm joined19:32
→ SwiftMatt joined19:32
← Mattiaslndstrm left19:34
← level3 left19:35
← royal_screwup21 left19:35
→ level3 joined19:35
→ royal_screwup21 joined19:36
→ rumbler31 joined19:37
← cuppajoeman left19:37
← bvdw left19:38
← vincent- left19:38
← tiin57 left19:39
← royal_screwup21 left19:41
→ bvdw joined19:41
→ tgunr joined19:41
→ royal_screwup21 joined19:41
→ tiin57 joined19:42
→ vicfred_ joined19:46
← royal_screwup21 left19:46
← bvdw left19:47
→ bvdw joined19:48
← sav__ left19:48
← vicfred left19:48
← rumbler31 left19:49
geosmile how do i make a submodule follow the master?19:49
currently its sticking to a hash19:49
ikke yes, that's basically what submodules do19:50
→ Mattiaslndstrm joined19:50
ikke There are some config options that help, but the fact that submodules are tracked by commit hash remains19:50
geosmile how do i update that commit hash?19:51
preferably automatically following master of the submodule19:52
→ codingquark joined19:53
ikke there is git submodule update --remote, which uses the remote tracking branch to determine what commit to checkout19:54
→ Ignacy joined19:55
geosmile Is there a way for submodules to always checkout master? a fresh git clone => git clone --recurse-submodules -j8 git://github.com/foo/bar.git19:56
→ feriman joined19:57
→ sudoforge joined19:58
→ eamanu1 joined20:03
← bgilb left20:03
← caskd left20:05
→ caskd joined20:05
← tiin57 left20:09
→ tiin57 joined20:12
← caskd left20:14
→ caskd joined20:14
← makara1 left20:18
← dfee left20:21
→ royal_screwup21 joined20:23
→ dfee joined20:24
→ _aaron_ joined20:24
_aaron_ if I perform a partial rebase exclusively on commits which have *not* been pulled by teammates, will that be viewed as a conflict for them, or can they still pull/FF ?20:25
geosmile if i checkout another branch in a submodule - is it still a submodule?20:26
ikke _aaron_: you are free to rebase non-published commits20:26
ie, private history20:26
geosmile: yes20:26
_aaron_ ikke: well, some are actually published, i just don't think teammates have fetched them20:26
ikke right, if they haven't fetched it, they are not aware that it was rewritten20:27
_aaron_ just don't know if *only* those commits are rewritten20:27
geosmile ikke, if i rm -rf submodule, and then git clone submod_repo_url - is it still a submodule?20:27
_aaron_ ok, prior commits they haven't pulled won't affect them +120:27
thks!20:27
← Narrat left20:28
ikke geosmile: yes and no: a submodule is just a normal git repository, so yes, cloning it would still create what git considers a submodule for that repo20:29
but nowadays, git stores the repo content in .git/modules of the parent repo20:29
and .git is a file with a reference to that20:29
that way, git is free to remove the submodule repo for example when you checkout a branch that does not have that submodule20:30
← _aaron_ left20:30
→ Wetmelon joined20:31
← mns left20:33
→ mns joined20:34
geosmile ikke, so if i rm -rf submodule && git clone submodule - what happens to the state of git?20:38
will git submodule commands still work normally?20:39
is that a bad thing to do?20:39
→ vincent- joined20:39
← tiin57 left20:39
← DarthRadar left20:39
ikke geosmile: I would not recommend that workflow20:39
I assume git submodule commands should still work20:40
geosmile ikke, so - cd submodule && git checkout develop && git pull && cd .. - is fine workflow?20:40
ikke yes, or the other command I gave20:41
geosmile ikke, git submodule update --remote --> This one does not checkout develop instead of master - correct?20:42
→ tiin57 joined20:43
ikke You can use git submodule set-branch apparently to change what branch it tracks20:43
(remote tracking branch I was referring to earlier)20:43
→ vincent-- joined20:46
← vicfred_ left20:47
← vincent- left20:47
← feriman left20:49
→ wallacer3_ joined20:49
→ jstein joined20:50
→ heroux_ joined20:50
← wallacer3 left20:51
← heroux left20:51
heroux_ → heroux20:51
← cfoch left20:54
← muhaha left20:55
← caskd left20:59
→ vicfred joined21:01
→ mindCrime joined21:05
← royal_screwup21 left21:06
→ royal_screwup21 joined21:07
→ brethil_ joined21:08
← brethil left21:08
← tiin57 left21:09
← g00s left21:09
→ g00s joined21:10
← royal_screwup21 left21:12
→ zumba_addict joined21:12
→ tiin57 joined21:13
→ royal_screwup21 joined21:14
→ cehteh joined21:14
← jstein left21:15
← comptroller left21:15
cehteh how can i reset a work tree to a tree-ish21:15
← sozuba left21:17
← royal_screwup21 left21:19
← cliluw left21:21
→ cliluw joined21:23
← Wetmelon left21:25
rafasc discarding any uncommitted changes: git reset --hard treeish21:25
← mowcat left21:27
→ comptroller joined21:28
← tgunr left21:29
cehteh rafasc: $ git reset --hard 197184cd506340efd16da291fc55d28dcde11c421:29
error: object 197184cd506340efd16da291fc55d28dcde11c47 is a tree, not a commit21:29
← cliluw left21:30
cehteh thats actually my problem :) ...21:30
rafasc cehteh: make a commit with it using git commit-tree; then use the commit for the checkout21:31
I think that maybe git checkout treeish -- :/ ; would also work21:32
← Jookia left21:32
← h3ck left21:33
cehteh nope checkout neither21:33
→ Jookia joined21:33
rafasc then to the commit-tree thing21:34
cehteh actually i am expermenting with git-worktree having a dedicated worktree to run the testsuite from a pre-commit hook, so i have only a treeish but no commit yet21:34
want to reset that worktree to the treeish and run the tests21:34
how does the plumbing check a treeish out?21:34
rafasc cehteh: does git restore --source works with treish?21:35
cehteh lemme try21:36
→ cliluw joined21:36
cehteh err wants a pathspec, but i need all21:38
rafasc use :/21:38
→ alexeightsix joined21:38
cehteh and is not recursive restore <treeish> -- . nope21:38
← tiin57 left21:39
rafasc that's not the interface of restore21:40
← oatmealraisin left21:40
cehteh i thought there must be some simple (maybe plumbing) to check out a tree, prolly from index, but i havent worked it out yet21:42
→ tiin57 joined21:43
← eamanu1 left21:45
rafasc for the index there's checkout-index21:47
cehteh git read-tree -i --reset 197184 ....21:47
ah21:48
→ royal_screwup21 joined21:48
→ Technodrome joined21:49
cehteh got it now21:49
hah maybe i dont need git worktree at all21:51
← royal_screwup21 left21:51
→ royal_screwup21 joined21:52
→ rangergord joined21:53
rangergord Offtopic, but...I have a Linux system I'm setting up for identical devices. Other than the network configuration and a specific custom configuration file, nothing would vary from system to system. What are my options for having git-like change history changes that I'm able to apply (or revert) on already-created systems that I can reach on the LAN, but which don't have Internet access? Example: on the reference system I apt21:56
install gdb, install some random library in /usr/local/lib, and modify /etc/ssh/sshd_config. I'd commit these changes, and now I want to run a command on an existing system to have them fetch the changes, and apply if I want. What's the best option? git + rsync? Don't worry about repo size, my changes are minimal.21:56
← royal_screwup21 left21:57
rangergord basically git for OS updates21:57
cehteh rafasc: i just git archive ...21:57
rangergord: there is etckeeper for the config stuff21:57
← calcul0n left21:58
rangergord git archive doesn't keep the history, does it, it's just a file archive?21:58
← orbyt_v7 left21:58
cehteh for binaries you could use rsync to hardlinked directory tress21:58
rafasc a filesystem that does snapshots also works21:59
rangergord I really need ext4 for reliability21:59
cehteh i do that for backups21:59
rangergord these devices might not have UPSes21:59
← cliluw left21:59
cehteh rangergord: https://public.pipapo.org/mmcbackup take some inspiration from that22:00
→ cliluw joined22:00
cehteh i use that to make backups on usb-flash or sd-card on laptops or rasbperrypi's22:01
rangergord thanks22:01
cehteh not exactly what you need, but shows how to do hardlinked snapshots with rsync22:02
← brethil_ left22:02
cehteh runnning rsync twice is a bit slow but makes things more atomic22:03
→ masber joined22:04
rangergord so I guess I was on the right path, and there's no more appropriate tool than rsync.22:04
cehteh by what definition of approbiate22:05
rangergord designed to give me easy viewing of history, like git does22:05
I know I can diff directories22:05
cehteh because rsync is highly portable, works on almost all filesystem, leaves files with no magic22:05
rangergord and maybe put some description.txt in there22:05
cehteh you can add a diff there but keep in mind that this is meant for binaries22:06
→ lucasb joined22:06
cehteh it wont store binary diffs, only hardlinks for not changed files22:06
rangergord I'd still like to see "new file /usr/bin/whatever"22:06
cehteh thats simple22:07
rangergord yeah I know22:07
cehteh i mean that rsync backups to dirs named by timestamp22:07
i have some more elaborate backup system for rsync, that can do some stats and stuff, running since long time here (15 years?)22:08
but isnt really documented or finished :D22:08
← tiin57 left22:09
cehteh root@rpi:~# mount /media/sda1/22:09
root@rpi:~# ls /media/sda1/backups/22:09
1577573360 1578584888 157953530022:09
...22:09
that are the timestamped dirs22:09
→ satousan joined22:10
cehteh # diff --no-dereference -rq 1596609932 159663874222:12
Files 1596609932/var/lib/dhcp/dhclient.br0.leases and 1596638742/var/lib/dhcp/dhclient.br0.leases differ22:12
..etc22:12
→ kenwoodfox_ joined22:12
rangergord nice22:12
→ tiin57 joined22:12
← kenwoodfox left22:12
→ jetchisel joined22:12
cehteh imo the biggiest advnatage is that/when backuped files are stored as plain files, as in restoring doesnt need any tool you can just copy them back22:14
← satousan left22:14
→ orbyt_v7 joined22:16
← BPL left22:16
→ BPL joined22:17
← vicfred left22:18
← alexeightsix left22:20
← Maxattax left22:21
→ brethil joined22:25
← benfelin left22:27
→ wymillerlinux joined22:28
← vdamewood left22:28
← masber left22:29
→ rustyshackleford joined22:29
→ misuto3 joined22:29
← misuto left22:30
misuto3 → misuto22:30
← dfee left22:34
peepsalot i'm doing a large rebase and something got messed up while resolving conflicts. is there a way to reset to the conflicted version and redo the conflict resolving?22:35
i've already done quite a few "git rebase --continue", just the current step i want to redo22:36
← misuto left22:36
→ dfee joined22:36
→ misuto joined22:37
peepsalot so starting over completely would be a huge setback for me22:37
rafasc peepsalot: I think you can do git checkout -m; But just to be sure, take not of the current commit hash.22:39
← tiin57 left22:39
rafasc If something goes wrong, you can resume from there with git rebase --onto=hash <x> <y>22:40
→ tiin57 joined22:42
peepsalot rafasc: do i need to reset the currently added files first?22:43
→ mat001_ joined22:44
rafasc I'm not sure. Another thing you can do is: git rebase --edit-todo list;22:45
and put the pick instruction again, and rebase --skip; whatever you did.22:46
← mat001 left22:46
rafasc consider making a backup of the repo, it would give you peace of mind experimenting with the solution.22:47
peepsalot yeah, i've done that22:48
← BPL left22:48
← mns left22:49
→ mns joined22:49
→ eamanu1 joined22:50
veegee_ → veegee22:51
peepsalot --edit-todo seems like its working ok22:52
→ royal_screwup21 joined22:54
→ yonder joined23:03
← royal_screwup21 left23:05
→ royal_screwup21 joined23:06
← Human_G33k left23:06
← tiin57 left23:09
→ alexeightsix joined23:11
← jast left23:11
→ jast joined23:12
→ dpflick joined23:12
→ tiin57 joined23:13
→ oatmealraisin joined23:16
→ maxwilliamson joined23:17
← cehteh left23:18
← dfee left23:18
← royal_screwup21 left23:19
← Phylock left23:19
→ royal_screwup21 joined23:19
← causasui left23:20
← CodeSlingerPaul left23:20
← justanotheruser left23:20
← rafasc left23:20
→ dfee joined23:20
← oatmealraisin left23:21
→ jaziz joined23:24
→ DarthRadar joined23:26
← royal_screwup21 left23:26
← cosimone left23:26
→ cosimone joined23:26
→ royal_screwup21 joined23:27
→ Brainium joined23:27
→ Human_G33k joined23:27
→ satousan joined23:29
← DarthRadar left23:35
← tiin57 left23:39
→ justanotheruser joined23:40
← satousan left23:41
→ tiin57 joined23:43
BtbN Is it normal that a simple cherry-pick takes _forever_ on the linux kernel?23:43
It's not doing anything really. No disk IO, just... sitting there23:44
→ zulutango joined23:44
← royal_screwup21 left23:45
← wunderba_ left23:46
→ dedowsdi joined23:46
→ royal_screwup21 joined23:46
→ wunderbar joined23:46
← g4570n left23:47
← eamanu1 left23:49
Jookia BtbN: nope, that's weird23:50
← royal_screwup21 left23:51
← Human_G33k left23:52
← orbyt_v7 left23:57
→ g4570n joined23:58

Logs Search ←Prev date Next date→ Channels Documentation