| 2019-03-17 |
| ← Kokpit left | 00:01 |
| → seds joined | 00:02 |
| ← dege left | 00:03 |
| → devster31 joined | 00:03 |
| ← finalbeta left | 00:04 |
| → g2anj joined | 00:06 |
| ← agg left | 00:15 |
| → delipickle joined | 00:16 |
| ← hofmann3900 left | 00:19 |
| ← wootehfoot left | 00:21 |
| → Beam_Inn joined | 00:22 |
| → jstimm joined | 00:23 |
| → Goplat joined | 00:26 |
| ← faLUCE left | 00:27 |
| → nowhere_man joined | 00:28 |
| ← Murr left | 00:30 |
| → Murr joined | 00:31 |
| ← greatgatsby left | 00:32 |
| ← nowhere_man left | 00:35 |
| → black_13 joined | 00:35 |
|
black_13
| is there a channel to ask about repo | 00:35 |
| → nowhere_man joined | 00:35 |
|
rafasc
| probably #android? | 00:37 |
|
| at least android devs usually deal it with to download android sources. | 00:37 |
| → Lucas_Gray joined | 00:40 |
| ← Beam_Inn left | 00:40 |
| ← Lucas_Gray left | 00:41 |
| → Lucas_Gray joined | 00:42 |
| ← yyy left | 00:44 |
| → Wryhder joined | 00:45 |
| ← Murr left | 00:45 |
| ← Lucas_Gray left | 00:47 |
| Wryhder → Lucas_Gray | 00:47 |
| ← jstimm left | 00:47 |
| ← tm007 left | 00:47 |
|
black_13
| rafasc: andoid is full of strange more importantly useless conversation | 00:51 |
| → Beam_Inn joined | 00:52 |
|
rafasc
| what's the problem? | 00:52 |
| ← orbyt_ left | 00:53 |
| ← seds left | 00:54 |
|
black_13
| with repo or the crazy stuff people say? | 00:54 |
|
| with repo its how to use with git | 00:55 |
| → orbyt_ joined | 00:56 |
|
black_13
| rafasc: i am using repo to manage the open embedded bsp from toradex | 00:56 |
| ← Makaveli7 left | 00:56 |
|
rafasc
| what's the problem specifically? | 01:00 |
| ← de-facto left | 01:01 |
| → de-facto joined | 01:01 |
| → Mattiaslndstrm joined | 01:01 |
|
rafasc
| repo is built on top of git. | 01:02 |
|
black_13
| i have a repository that repo uses | 01:03 |
|
| is that the correct thing to say | 01:03 |
|
| that is repo uses various repositories | 01:03 |
| ← Beam_Inn left | 01:04 |
| ← Mattiaslndstrm left | 01:06 |
| → dre_ joined | 01:12 |
|
black_13
| http://codepad.org/0bZl2GBN is my basic understand of repo .. repo sync | 01:12 |
|
| or repo -u url -b branch then repo sync | 01:13 |
|
| i want to add my own repo to this | 01:14 |
| ← diogenese left | 01:14 |
|
black_13
| or git repository that the command repo can pull access if that is correct | 01:15 |
| ← nowhere_man left | 01:23 |
| → nowhere_man joined | 01:23 |
| ← apoos_maximus left | 01:23 |
| ← delipickle left | 01:25 |
| ← dino82 left | 01:27 |
| ← mowcat left | 01:28 |
|
rafasc
| My limited understanding of it is that the repository you use with repo, is not a code repository. | 01:33 |
|
| it's a repository with metadata/manifest files, which $repo uses to actually 'clone' what you want. | 01:33 |
|
black_13
| that is as much as i know | 01:34 |
|
rafasc
| so you'll want to clone the manifest repo, and change the manifest so it actually includes your git project. | 01:35 |
| ← Essadon left | 01:35 |
|
rafasc
| look at .repo/manifest.xml | 01:36 |
|
black_13
| yeah | 01:36 |
|
| i had tried to manipulate that file directly | 01:37 |
|
| and sadly my coworkers are not much help | 01:37 |
|
rafasc
| I have no experience with repo, other than minimal use for building custom roms. | 01:38 |
|
black_13
| roms for? | 01:38 |
|
| android | 01:38 |
|
| ? | 01:38 |
|
| ok strait up qit question | 01:38 |
|
| how do i deal with a detached head | 01:39 |
|
rafasc
| android, yes. | 01:39 |
|
| !detached | 01:39 |
|
gitinfo
| A detached HEAD (aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach | 01:39 |
|
rafasc
| and !reattach | 01:39 |
|
gitinfo
| Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue | 01:39 |
|
rafasc
| black_13: https://www.instructables.com/id/Using-Googles-repo-command-in-your-own-projects/ | 01:42 |
|
| weird place to refer, but looks somewhat decent. | 01:43 |
|
black_13
| i saw it but was looking at it at work | 01:43 |
|
| not at home home were i could actually read | 01:43 |
|
| http://codepad.org/Msa7Aa4k | 01:44 |
|
| the above shows some of the history | 01:44 |
|
| when I sync ed using repo sync I pull down some of the work i did | 01:45 |
|
rafasc
| https://stackoverflow.com/questions/46339775/adding-new-git-into-aosp-repo | 01:45 |
|
| I think you will have more luck if you search about as if you were using it for android, then adapt the information to your usecase. | 01:45 |
|
| e.g. https://forum.xda-developers.com/showthread.php?t=2329228 | 01:47 |
| ← ave_milia left | 01:47 |
| ← AtumT_ left | 01:48 |
| → jstimm joined | 01:50 |
|
black_13
| rafasc: good point | 01:51 |
| ← kjartan left | 01:54 |
| → kjartan joined | 01:56 |
| ← dre_ left | 01:57 |
| ← bukaboi left | 02:01 |
| → jakogut_ joined | 02:02 |
| → finalbeta joined | 02:02 |
| ← jakogut left | 02:03 |
| jakogut_ → jakogut | 02:03 |
|
black_13
| the instructables articles says "like git submodules but without the pain" | 02:03 |
| → lankanmon joined | 02:03 |
| ← sunri5e left | 02:04 |
| ← Novae left | 02:05 |
| → sunri5e joined | 02:05 |
|
rafasc
| submodules are much nicer nowadays. | 02:06 |
| → diogenese joined | 02:08 |
| → Novae joined | 02:10 |
| → Dragon092 joined | 02:11 |
| → bsdlain joined | 02:14 |
| ← CryptoDavid left | 02:16 |
| ← Lucas_Gray left | 02:17 |
| → Lucas_Gray joined | 02:23 |
|
black_13
| repo init -u http://git.toradex.com/toradex-bsp-platform.git -b LinuxImageV2.8 works | 02:24 |
|
| and there is a .repo dir | 02:24 |
| ← rafasc left | 02:25 |
|
black_13
| and the .repo dir is | 02:28 |
|
| http://codepad.org/sfkNFZi8 | 02:28 |
|
| quite long | 02:28 |
| → kezimo joined | 02:32 |
| ← orbyt_ left | 02:34 |
| → Raimondi joined | 02:38 |
| ← sl4ck left | 02:41 |
| → orbyt_ joined | 02:53 |
| ← F0rTex left | 03:02 |
| → Mattiaslndstrm joined | 03:02 |
| → F0rTex joined | 03:03 |
| ← orbyt_ left | 03:06 |
| ← Mattiaslndstrm left | 03:07 |
| → zacts joined | 03:10 |
| → Wee_Tohtekcop joined | 03:10 |
| ← lupine left | 03:11 |
| ← shentino_ left | 03:11 |
| → shentino joined | 03:12 |
| → lupine joined | 03:13 |
|
black_13
| so repo curls the git repos | 03:16 |
| ← zacts left | 03:19 |
| → orbyt_ joined | 03:20 |
| → delipickle joined | 03:22 |
| → ferdna joined | 03:25 |
| ← cd left | 03:25 |
| ← Snoober left | 03:26 |
| ← Regon left | 03:30 |
| lagothrix → Guest46902 | 03:31 |
| ← Guest46902 left | 03:31 |
| → lagothrix joined | 03:32 |
| ← freeman42x left | 03:34 |
| → User_ joined | 03:36 |
| ← Lucas_Gray left | 03:47 |
| → dre_ joined | 03:48 |
| ← Cabanossi left | 03:49 |
| → Cabanossi joined | 03:50 |
| → bashfulshell joined | 03:50 |
| ← Wee_Tohtekcop left | 03:52 |
| ← null1337 left | 03:56 |
| → boombatower joined | 03:57 |
|
black_13
| what does it mean when something is "upstream" | 03:58 |
| → kadoban joined | 04:03 |
| ← Phylock left | 04:04 |
|
kerframil
| that it is incorporated by whomsoever owns and maintains the applicable codebase | 04:07 |
| ← nic-hartley left | 04:07 |
| → lungaro_ joined | 04:09 |
| ← boombatower left | 04:09 |
|
lungaro_
| what are some short hand forms of git commit -a -m' some things have changed'? | 04:09 |
|
| I am just gonna make a gcm alias if anyone doesn't have something better | 04:10 |
|
mud
| Not too far from "git stash" depending on how you use it | 04:12 |
| ← delipickle left | 04:16 |
| ← Khisanth left | 04:18 |
| ← tombusby left | 04:22 |
| ← jakogut left | 04:25 |
| ← misuto left | 04:25 |
| → jakogut joined | 04:26 |
| → tombusby joined | 04:27 |
| ← inkbottle left | 04:28 |
| → inkbottle joined | 04:28 |
| → Khisanth joined | 04:33 |
| → SkarmoutsosV joined | 04:38 |
|
black_13
| kerframil: was that in response to my question | 04:39 |
| ← lungaro_ left | 04:39 |
|
kerframil
| black_13: yes | 04:40 |
| → misuto joined | 04:40 |
| ← m0viefreak left | 04:41 |
| ← inkbottle left | 04:42 |
| ← Cabanossi left | 04:44 |
| → mat001 joined | 04:47 |
| → Cabanossi joined | 04:49 |
| ← dre_ left | 04:50 |
| → dino82 joined | 04:51 |
| ← orbyt_ left | 04:51 |
| ← random_yanek left | 04:54 |
| → inkbottle joined | 04:55 |
| → random_yanek joined | 04:56 |
| → pks_ joined | 05:02 |
|
black_13
| what does mean if i have a master and a remotes/repot/master branch | 05:02 |
| ← R2robot left | 05:03 |
| → Mattiaslndstrm joined | 05:03 |
| ← pks left | 05:04 |
| pks_ → pks | 05:04 |
| ← dino82 left | 05:06 |
|
GreenJello
| black_13, your 'repot' origin has a branch named 'master', which may be at a different state than your local 'master' branch | 05:07 |
|
black_13
| i guess | 05:07 |
|
| discard the local | 05:07 |
| ← Mattiaslndstrm left | 05:07 |
|
GreenJello
| e.g. if they're the same, and then you make a commit locally, they're no longer the same. If a commit is added on the remote, then you can merge repot/master into your local master, and then you can push to repot master, which would update it and have both pointing at the same commit again | 05:08 |
|
black_13
| nothing on the local | 05:09 |
|
GreenJello
| they regularly get out of sync, so being able to refer to it is often useful | 05:09 |
| → fekir joined | 05:09 |
|
black_13
| ok | 05:09 |
|
| how do check out and make use of the remote? | 05:09 |
|
| git checkout remotes/repo/master ? | 05:10 |
|
GreenJello
| you can merge it into your local branch, or you could create a branch based on it with `git checkout -b new-branch repot/master` | 05:10 |
|
black_13
| ok | 05:10 |
|
| http://codepad.org/VyYmGw92 | 05:12 |
| → SuperL4g joined | 05:12 |
|
GreenJello
| remove "remotes/" | 05:12 |
|
| also the argument after -b needs to be a new branch name | 05:13 |
|
| if you want to replace `master` with the contents of that branch, it's the dangerous command: git reset --hard repo/master | 05:13 |
| ← fekir left | 05:15 |
| ← SuperLag left | 05:15 |
| → fekir joined | 05:17 |
| ← iNs_ left | 05:18 |
| → iNs joined | 05:19 |
| ← Goplat left | 05:19 |
| ← SuperL4g left | 05:23 |
| ← GreenJello left | 05:26 |
| ← cbreak left | 05:32 |
| → cbreak joined | 05:33 |
| ← User_ left | 05:35 |
| ← mat001 left | 05:36 |
| → TomyLobo2 joined | 05:39 |
| ← dpyro left | 05:40 |
| → SuperLag joined | 05:41 |
| ← TomyLobo2 left | 05:45 |
| ← leeN left | 05:51 |
| → Snoober joined | 05:56 |
| ← black_13 left | 06:00 |
| ← SkarmoutsosV left | 06:03 |
| ← inkbottle left | 06:03 |
| → doubtful joined | 06:05 |
| → SuperL4g joined | 06:08 |
| ← SuperLag left | 06:08 |
| ← Snoober left | 06:18 |
| ← watabou left | 06:25 |
| ← bashfulshell left | 06:31 |
| → R2robot joined | 06:33 |
| ← thiago left | 06:44 |
| → watabou joined | 06:46 |
| → Noti joined | 06:47 |
| → Envil joined | 06:59 |
| ← troyt left | 07:01 |
| ← Crocodillian left | 07:04 |
| → Crocodillian joined | 07:04 |
| → Mattiaslndstrm joined | 07:05 |
| ← Mattiaslndstrm left | 07:09 |
| ← doubtful left | 07:13 |
| → doubtful joined | 07:14 |
| ← bket left | 07:19 |
| → blackandblue joined | 07:21 |
| → bket joined | 07:24 |
| → plexigras joined | 07:24 |
| → gloomy joined | 07:28 |
| → aniarya82 joined | 07:32 |
| ← plexigras left | 07:34 |
| ← kadoban left | 07:37 |
| → plexigras joined | 07:37 |
| ← nowhere_man left | 07:38 |
| → nowhereman joined | 07:39 |
| → troyt joined | 07:40 |
| ← gloomy left | 07:40 |
| → gloomy joined | 07:44 |
| ← kerframil left | 07:56 |
| ← doubtful left | 07:57 |
| ← gloomy left | 08:01 |
| → czart joined | 08:06 |
| ← nuc left | 08:07 |
| → doubtful joined | 08:08 |
| ← kjartan left | 08:08 |
| → kjartan joined | 08:10 |
| ← mona_x left | 08:21 |
| → gloomy joined | 08:31 |
| → dege joined | 08:34 |
| ← ferdna left | 08:34 |
| ← Bobdude left | 08:45 |
| → learningc joined | 08:48 |
| → Mattiaslndstrm joined | 08:50 |
| → nuc joined | 08:51 |
| ← gloomy left | 08:51 |
| → hofmann3900 joined | 08:55 |
| → Beam_Inn joined | 08:58 |
| ← doubtful left | 09:00 |
| ← Beam_Inn left | 09:01 |
| ← Noti left | 09:03 |
| → Noti joined | 09:07 |
| ← dege left | 09:08 |
| → _satyendra14_ joined | 09:10 |
| ← fatalhalt left | 09:12 |
| → doubtful joined | 09:19 |
| ← catsup left | 09:20 |
| → catsup joined | 09:20 |
| → gloomy joined | 09:20 |
| ← catsup left | 09:21 |
| → catsup joined | 09:21 |
| → HenryCH joined | 09:23 |
| → n3wborn joined | 09:23 |
| → apoos_maximus joined | 09:23 |
| → staafl_ joined | 09:24 |
| → sozuba joined | 09:25 |
| ← igemnace left | 09:29 |
| ← apoos_maximus left | 09:31 |
| ← Mattiaslndstrm left | 09:33 |
| → adfadfff joined | 09:38 |
|
adfadfff
| hi, i have a subtree, and im not sure while used subtree pull i get merge conflict, why? and what should I do?;o | 09:38 |
| ← gloomy left | 09:40 |
| → gloomy joined | 09:40 |
| ← gloomy left | 09:40 |
| → gloomy joined | 09:41 |
| ← gloomy left | 09:41 |
| ← finalbeta left | 09:45 |
| → finalbeta joined | 09:45 |
| → Brilpikk3wyn joined | 09:46 |
| → Mattiaslndstrm joined | 09:47 |
| → __rohit joined | 09:51 |
| → tm007 joined | 09:51 |
| ← sozuba left | 09:57 |
| ← lankanmon left | 10:00 |
| ← quite left | 10:02 |
| → quite joined | 10:03 |
| → apoos_maximus joined | 10:04 |
| ← apoos_maximus left | 10:04 |
| → apoos_maximus joined | 10:05 |
| → Lucas_Gray joined | 10:12 |
| ← HenryCH left | 10:24 |
| → lucasb joined | 10:30 |
| → Makaveli7 joined | 10:32 |
| → Phylock joined | 10:32 |
| → theoceaniscool joined | 10:38 |
| ← Inline left | 10:39 |
|
qyliss
| adfadfff: fix the conflicts, stage them, and then run git commit | 10:42 |
| ← fekir left | 10:47 |
| → fekir joined | 10:47 |
| → sozuba joined | 10:48 |
| → lankanmon joined | 10:52 |
| → Fernando-Basso joined | 10:56 |
| → Jitta joined | 11:00 |
| → ppd1990 joined | 11:01 |
| ← _satyendra14_ left | 11:03 |
| ← Lucas_Gray left | 11:05 |
|
ppd1990
| hello. I have a slight problem with understanding what's going on here: git for-each-ref refs/tags returns five annotated tags ("tag") for a cloned repo. Yet, git describe --tags does not reference the latest tag, but instead something older. What am I doing wrong? The repo is: https://github.com/solvespace/solvespace.git | 11:05 |
| → Lucas_Gray joined | 11:06 |
| ← sunri5e left | 11:08 |
| → sunri5e joined | 11:09 |
|
ppd1990
| shell output: https://pastebin.com/99dmRHtg | 11:09 |
| ← duderonomy left | 11:10 |
| ← Envil left | 11:12 |
| → Inline joined | 11:17 |
|
j416
| ppd1990: 2.1 seems to be the only one in the history of master; it went straight from 2.1 to 3.0 from what I can tell by clicking around in GH's UI. fwiw https://github.com/solvespace/solvespace/commit/4c318f09c4a0 | 11:22 |
|
Rhonda
| So … when speaking or writing about Git, would you write it with a capital G, or lower case? When not refering to the tool specifically? | 11:22 |
|
j416
| I write it as "Git". | 11:22 |
|
| following https://git-scm.com/ | 11:23 |
|
Rhonda
| Well, most of there it stands at the start of a sentence, be part of a headline … so that page wasn't too helpful. :) | 11:23 |
|
j416
| ..click the links | 11:23 |
|
ppd1990
| j416: ah. So the release was tagged in a branch != master | 11:24 |
|
Rhonda
| j416: Yep. :) | 11:24 |
|
j416
| ppd1990: that's what I conclude without having inspected further | 11:24 |
| → m0viefreak joined | 11:24 |
| ← Mattiaslndstrm left | 11:24 |
|
j416
| ppd1990: git branch --contains nameoftag | 11:24 |
| Brilpikk3wyn → Pikk3wyn | 11:26 |
|
ppd1990
| j416: I see. First I need to pull all branches and then I can search. Makes a lot of sense. Thank you | 11:27 |
|
j416
| o/ | 11:29 |
|
| ppd1990: (git branch -a --contains nameoftag) | 11:29 |
|
ppd1990
| j416: excellent :) | 11:33 |
|
j416
| \o | 11:34 |
| ← yonder left | 11:44 |
| → Regon joined | 11:46 |
| ← czart left | 11:48 |
| ← Lucas_Gray left | 11:49 |
| → Lucas_Gray joined | 11:51 |
| → mowcat joined | 11:51 |
| → igemnace joined | 11:53 |
| ← doubtful left | 11:58 |
| → Mattiaslndstrm joined | 12:02 |
| ← ppd1990 left | 12:06 |
| → mixaz joined | 12:10 |
| ← blackandblue left | 12:16 |
| → czart joined | 12:18 |
| ← shabius_ left | 12:24 |
| ← Fernando-Basso left | 12:27 |
| ← Noti left | 12:27 |
| → shabius joined | 12:28 |
| → yyy joined | 12:29 |
| ← mowcat left | 12:30 |
| → mowcat joined | 12:31 |
| ← mowcat left | 12:32 |
| → mowcat joined | 12:32 |
| ← apoos_maximus left | 12:36 |
| → SerialSmile joined | 12:43 |
| → elichai2 joined | 12:49 |
| → greatgatsby joined | 12:53 |
| ← frsk left | 12:57 |
| ← Pikk3wyn left | 12:58 |
| → Goplat joined | 12:59 |
| → gareppa joined | 13:01 |
| ← adfadfff left | 13:01 |
| ← gareppa left | 13:01 |
|
elichai2
| Hey, what is the consequences of rewriting history? | 13:04 |
| → CCDelivery joined | 13:04 |
|
elichai2
| I want to change the author name of all of the commits in the git repo, what will this cause? | 13:05 |
|
_ikke_
| It will cause people who are not cautious to merge in both old and new history when they mindlesly do git pull because git suggests that | 13:05 |
| → dudek joined | 13:06 |
| ← fekir left | 13:07 |
| ← JanC left | 13:07 |
| → JanC joined | 13:07 |
|
elichai2
| hmmm I think it will be fine. because I'm the only user of that repo | 13:09 |
|
| (thecnically it's the intellij settings repo haha) | 13:10 |
| → fekir joined | 13:10 |
|
elichai2
| but it won't affect the dates of commits, right? | 13:10 |
|
_ikke_
| It will affect the commit dates of the commits, not the author dates | 13:12 |
|
| In git those are 2 seperate things | 13:12 |
|
elichai2
| which one does github uses? | 13:12 |
| → hellauer joined | 13:13 |
|
bathtub_shark
| both afaik | 13:13 |
|
elichai2
| so what will it show? | 13:13 |
|
bathtub_shark
| it shows you if the dates aren't the same by saying "committed on %s and authored on %s" | 13:13 |
|
elichai2
| when it shows "6 days ago" what does it mean? | 13:14 |
|
| Now I need to understand how git-filter works :) | 13:17 |
| → acidjnk joined | 13:17 |
| → freeman42x joined | 13:18 |
| ← __rohit left | 13:22 |
| → leeN joined | 13:23 |
|
elichai2
| well that was pretty easy :) | 13:24 |
| → Envil joined | 13:29 |
| → cd joined | 13:35 |
| → wootehfoot joined | 13:35 |
| ← rkta left | 13:38 |
| → rkta joined | 13:38 |
| ← hellauer left | 13:44 |
| → hellauer joined | 13:50 |
| ← tm007 left | 13:53 |
| → CryptoDavid joined | 14:00 |
| → tarkus joined | 14:01 |
| → Essadon joined | 14:08 |
| → inkbottle joined | 14:08 |
| ← fekir left | 14:09 |
| ← deltab left | 14:09 |
| → fekir joined | 14:11 |
| → deltab joined | 14:13 |
| ← learningc left | 14:14 |
| → road33 joined | 14:19 |
| ← jelmer left | 14:20 |
|
road33
| lets say i want to track a public git repo, but make some personalized changes. Then as repo updates, I want to pull in changes and "merge" my changes back into upstream content on my local copy, and review the changes they made, what is the work flow I should google? | 14:20 |
| ← lightstalker left | 14:21 |
| → jelmer joined | 14:22 |
| → lightstalker joined | 14:24 |
| ← fekir left | 14:24 |
| ← tarkus left | 14:27 |
| → dpyro joined | 14:29 |
| → fekir joined | 14:31 |
| ← kjartan left | 14:32 |
| → czart_ joined | 14:33 |
| → kjartan joined | 14:34 |
|
j416
| road33: clone it, make changes on a separate branch; merge/rebase as needed | 14:36 |
| ← czart left | 14:36 |
| ← dpyro left | 14:43 |
| ← yyy left | 14:47 |
| → yyy joined | 14:49 |
| ← n3wborn left | 14:50 |
| → in1t3r_ joined | 15:01 |
| ← in1t3r left | 15:03 |
| ← greatgatsby left | 15:05 |
| ← RoriconKnight left | 15:05 |
| → shiva__ joined | 15:09 |
| → thiago joined | 15:10 |
| ← lucasb left | 15:10 |
| ← in1t3r_ left | 15:11 |
| → agowa338 joined | 15:14 |
| → pd09041999 joined | 15:17 |
| → gusnan joined | 15:19 |
| → rafasc joined | 15:25 |
| → moei joined | 15:32 |
| → Bobdude joined | 15:32 |
| ← drbean left | 15:34 |
| → drbean joined | 15:35 |
| → GreenJello joined | 15:35 |
| ← planigan left | 15:36 |
| ← pd09041999 left | 15:39 |
| → gloomy joined | 15:43 |
| ← gloomy left | 15:48 |
| ← yyy left | 15:49 |
| → yyy joined | 15:50 |
| → pd09041999 joined | 15:54 |
| → orbyt_ joined | 15:56 |
| ← rkta left | 15:59 |
| → rkta joined | 15:59 |
| ← orbyt_ left | 16:10 |
| ← ricekrispie left | 16:16 |
| ← zampano left | 16:17 |
| → apoos_maximus joined | 16:20 |
| ← alcohol left | 16:20 |
| → cam27 joined | 16:21 |
| → aw1 joined | 16:25 |
| ← cam27 left | 16:28 |
| → zampano joined | 16:28 |
| → silenc3r joined | 16:29 |
| → HenryCH joined | 16:32 |
| → renich joined | 16:39 |
| ← YuGiOhJCJ left | 16:40 |
| → gloomy joined | 16:47 |
| ← pd09041999 left | 16:48 |
| → ferdna joined | 16:50 |
| → Snoober joined | 16:51 |
| → winny joined | 16:53 |
| → Achylles joined | 16:56 |
| → Ayo joined | 16:59 |
| ← Snoober left | 16:59 |
| → manuelschneid3r joined | 17:00 |
| → orbyt_ joined | 17:00 |
|
HenryCH
| ive added an ssh key to the ssh agent, made sure it is running, seems to be fine but every git command prompts me for the passphrase. I thought it should only prompt once, anyone know what I'm missing? | 17:01 |
|
manuelschneid3r
| can I somehow flatten the dirstructure of my submodules | 17:01 |
|
| I mean I have a nested stucture but I want all repos to be in a directory ans all submodules linking to the repos in the root dirs | 17:02 |
| → pd09041999 joined | 17:02 |
|
manuelschneid3r
| HenryCH, does ssh work? | 17:03 |
|
| do you use a git remote? (instead of http) | 17:03 |
| ← road33 left | 17:04 |
| → Snoober joined | 17:05 |
| ← Snoober left | 17:06 |
| ← kreyren left | 17:08 |
| → kreyren joined | 17:09 |
| → bashfulshell joined | 17:10 |
| ← raulp left | 17:10 |
| ← quackgyver left | 17:14 |
| → Snoober joined | 17:19 |
| ← inkbottle left | 17:22 |
| ← Achylles left | 17:25 |
| → duderonomy joined | 17:26 |
| ← justan0theruser left | 17:27 |
| → justanotheruser joined | 17:27 |
| ← Goplat left | 17:30 |
| ← grumble left | 17:31 |
| ← finalbeta left | 17:32 |
| → inkbottle joined | 17:32 |
| → grumble joined | 17:32 |
| ← Ayo left | 17:32 |
| → finalbeta joined | 17:32 |
| → freeman42y joined | 17:32 |
| ← yyy left | 17:32 |
| → Goplat joined | 17:36 |
| ← freeman42x left | 17:36 |
| → triengage joined | 17:36 |
| → agowa339 joined | 17:37 |
| ← agowa338 left | 17:40 |
| → __shivam joined | 17:41 |
| → planigan joined | 17:41 |
| ← m0viefreak left | 17:42 |
|
__shivam
| hi, while using git send-email i get this error: Can't locate Git/LoadCPAN/Error.pm in @INC (you may need to install the Git::LoadCPAN::Error module) BEGIN failed--compilation aborted at git-send-email line 31. | 17:42 |
|
| and i used this just yesterday, it worked fine | 17:42 |
| ← dcpc007 left | 17:44 |
|
bremner
| well, you should speak sternly to whomever updated your computer | 17:44 |
|
__shivam
| i didn't updated it, no one did | 17:44 |
| ← inkbottle left | 17:45 |
| → Ayo joined | 17:48 |
|
rafasc
| well, it isn't finding that perl module, so something must have happened.. | 17:52 |
| ← nowhereman left | 17:53 |
| ← aw1 left | 17:53 |
|
__shivam
| lets say it did. | 17:53 |
|
| i tried installing it Git::LoadCPAN::Error. | 17:54 |
|
| and it seemed to completely install without errors | 17:54 |
|
| should i remove perl and reinstall it again ? | 17:55 |
| ← Ayo left | 17:55 |
| → Ayo joined | 17:56 |
| → orcacomputers joined | 17:56 |
| gitinfo set mode: +v | 17:57 |
| ← aniarya82 left | 17:58 |
| → sourcream joined | 17:59 |
| → jungsubk joined | 17:59 |
| → AtumT joined | 18:00 |
| → jottr joined | 18:02 |
|
HenryCH
| manuelschneid3r: yes ssh works, git also works but i'd like to enter the key passphrase once only whereas now it's prompting me for every command | 18:03 |
|
rafasc
| HenryCH: are you sure your agent is working? try ssh -T user@host ... | 18:07 |
|
| does git remote -v; show ssh urls? Or are they using http? | 18:08 |
| ← pd09041999 left | 18:09 |
| ← Lucas_Gray left | 18:10 |
|
rafasc
| __shivam: are you for instance using your own version of send-email? | 18:13 |
| → n3wborn joined | 18:13 |
| ← silenc3r left | 18:13 |
| → aniarya82_ joined | 18:14 |
|
rafasc
| maybe wrong perllibdir? Idk. | 18:15 |
| ← triengage left | 18:16 |
|
__shivam
| rafasc: i am reinstalling perl | 18:17 |
|
| and will try again with it | 18:17 |
| → triengage joined | 18:17 |
| → Narrat joined | 18:18 |
| ← HenryCH left | 18:19 |
| ← __shivam left | 18:19 |
| → Xeago_ joined | 18:20 |
| → Achylles joined | 18:21 |
| → yonder joined | 18:21 |
| ← Xeago left | 18:22 |
| Xeago_ → Xeago | 18:22 |
| → fatalhalt joined | 18:22 |
| ← triengage left | 18:24 |
| ← jungsubk left | 18:30 |
| → jungsubk joined | 18:32 |
| ← SerialSmile left | 18:33 |
| ← gloomy left | 18:33 |
| ← Achylles left | 18:34 |
| → gloomy joined | 18:38 |
| ← kjartan left | 18:42 |
| ← pR0Ps left | 18:46 |
| → kjartan joined | 18:47 |
| → __rohit joined | 18:50 |
| ← sozuba left | 18:57 |
| → HenryCH joined | 19:00 |
| ← sourcream left | 19:03 |
| → SkarmoutsosV joined | 19:06 |
| ← jungsubk left | 19:06 |
|
HenryCH
| i disconnected. to the user that was asking if ssh works and if git remote -v was showing the ssh urls: yes, everything works fine but I'd like to not have to enter the key passphrase on every command. I run ssh-add and see the identity added, but then every git command against the remote still prompts me for the passphrase | 19:06 |
| → wald0 joined | 19:08 |
|
wald0
| it is possible to remove a portion of change from a commit ? | 19:08 |
| → [rg] joined | 19:09 |
|
wald0
| im cherry-picking commits from another branch, but sometimes they have trash (un-needed things), like whitespaces changes, so i need to manually edit them and "git commit --amm end" | 19:09 |
|
rafasc
| HenryCH: then your sshagent isn't working. | 19:11 |
| → eegad joined | 19:12 |
| → dege joined | 19:12 |
| → xaltsc joined | 19:12 |
| → doubtful joined | 19:13 |
|
HenryCH
| i've confirmed it's working, wouldn't ssh-add not work if it werent? | 19:13 |
|
xaltsc
| Hey, often (not always) when I git clone sshhost:repo, git initialises the config file with sshCommand="", and thus I cannot push/pull/whatever without modifying it beforhand. Any idea where this might come from? | 19:14 |
|
rafasc
| wald0: what you're doing is one way to do that. | 19:14 |
| → pR0Ps joined | 19:14 |
|
[rg]
| can I create a repo on a remote from my host, looking for a way to push and create the repo if it doesnt exist on the remote | 19:14 |
|
GreenJello
| [rg], usually the remote won't allow it, as you have to create repos through their UI or API | 19:15 |
|
_ikke_
| [rg]: not with default git | 19:15 |
|
rafasc
| xaltsc: sshCommand is being set when you clone? Never seen that happen. | 19:15 |
|
[rg]
| GreenJello: this is on my own server | 19:16 |
|
GreenJello
| [rg], then look for a config option in your git software to allow it; if one exists | 19:17 |
|
rafasc
| HenryCH: my question is if whatever ssh client you are using is picking up the key from your agent. Try: ssh -T user@host twice; | 19:17 |
|
_ikke_
| [rg]: if you use gitolite, it has the option called wild repos | 19:18 |
|
rafasc
| see if the second prompts for the passphrase. | 19:18 |
|
[rg]
| _ikke_: interesting, i was just using plain git | 19:18 |
|
_ikke_
| [rg]: gitolite is strongly recommended :-) | 19:19 |
|
| makes managing repos and access to them a lot easier | 19:19 |
|
| and it's quite simple to setup | 19:19 |
|
[rg]
| does the host and remote need the same git version? | 19:19 |
|
HenryCH
| rafasc: ssh -T never prompts, connects fine (this is to github btw so no shell) | 19:19 |
|
_ikke_
| [rg]: no | 19:19 |
|
| [rg]: git makes a lot of effort into keeping things compattible | 19:20 |
|
rafasc
| HenryCH: can you show the git remote -v? | 19:20 |
|
[rg]
| thanks, guys | 19:20 |
| ← kreyren left | 19:24 |
|
HenryCH
| rafasc: origin git@github.com:UserName/RepoName.git (fetch) origin git@github.com:UserName/RepoName.git (push) | 19:24 |
| ← pR0Ps left | 19:25 |
| → kreyren joined | 19:27 |
| ← orbyt_ left | 19:28 |
| ← elichai2 left | 19:28 |
| → pR0Ps joined | 19:29 |
|
rafasc
| HenryCH: can you try it ssh://git@github.com/user/repo.git ? | 19:29 |
|
HenryCH
| I have two keys in github, one github desktop added, and the other one I added today, different locations, could it be that's throwing ssh agent off? | 19:29 |
|
_ikke_
| No, that should not matter | 19:30 |
| ← wootehfoot left | 19:30 |
|
rafasc
| if it works with manual ssh, it should work with git. Because a clone is essentially git ssh'ing to the server to run git-upload-pack; | 19:31 |
| ← doubtful left | 19:32 |
|
HenryCH
| it does work with git though, just doesn't save the passphrase | 19:33 |
| ← Makaveli7 left | 19:33 |
| → Kokpit joined | 19:33 |
|
HenryCH
| using the remote url above didn't help :\ | 19:33 |
|
| stills prompts every time | 19:33 |
| → doubtful joined | 19:33 |
| ← waveclaw left | 19:34 |
|
Kokpit
| Hello, I'm trying to use ssh keygen integration with jenkins. I have follow on this tutorial: https://help.github.com/en/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent but when I'm pushing code: It's still asking me for username and password. | 19:35 |
| → waveclaw joined | 19:35 |
|
rafasc
| all I can say is that whatever ssh client git is using is not picking up your sshagent. | 19:35 |
|
Kokpit
| ssh keygen integration with github**** | 19:35 |
|
rafasc
| HenryCH: git doesn't handle the authentication itself. | 19:36 |
|
HenryCH
| Kokpit: happy to see i am not alone in my struggles :P, have you switched your remotes to ssh? | 19:38 |
| → blackandblue joined | 19:39 |
| ← doubtful left | 19:40 |
|
Kokpit
| HenryCH, what do you mean with remote to ssh? , I can say you that I installed the public key on github account | 19:40 |
|
HenryCH
| rafasc: I don't get what you mean, it's ssh-agent that's prompting me for the passphrase isnt it? especially since there is more than one, and it's prompting me for the passphrase of the right one, the one i've ssh-added | 19:42 |
|
Kokpit
| HenryCH, how do I switch remote to ssh? | 19:42 |
|
HenryCH
| Kokpit: i'm not expert but if it's asking for a username and password it looks like you're still going over http, look at the docs for the git remote commands e.g. git remote set-url, git remote add | 19:43 |
| → Lucas_Gray joined | 19:43 |
| ← Lucas_Gray left | 19:45 |
| → Lucas_Gray joined | 19:45 |
| ← Ayo left | 19:46 |
|
Kokpit
| HenryCH, OK I will like to get help from you anyway. I entered this command line: "git remote add origin https://github.com/chokpit/repo.git" | 19:46 |
|
rafasc
| Kokpit: if you want to use git over ssh, you need to use a ssh url.. That one is https | 19:46 |
|
Kokpit
| ok thanks! | 19:47 |
|
HenryCH
| Kokpit: you must already have origin, and you need the ssh url | 19:47 |
| ← kreyren left | 19:47 |
| → orbyt_ joined | 19:48 |
| ← pR0Ps left | 19:49 |
| → kreyren joined | 19:49 |
| → pR0Ps joined | 19:49 |
|
Kokpit
| still asking for username and password: [root@jenkinssrv harta1000]# git remote set-url origin https://github.com/chokpit/repo.git [root@jenkinssrv harta1000]# git push origin master Username for 'https://github.com': | 19:49 |
|
rafasc
| Kokpit: you are still using https:// ... | 19:50 |
|
| you need something like ssh://git@github.com/chokpit/repo.git | 19:51 |
|
HenryCH
| rafasc: how does sshagent know which key to use? I've just added the second one, it still asks for the passphrase of the first one, is it because the one I generated i saved to the default location id_rsa? | 19:53 |
|
rafasc
| HenryCH: that depends on the implementation of the ssh client/agent I guess. If you use ssh -Tv [email@hidden.address] you'll see the keys being offered. | 19:55 |
| ← Raging_Hog left | 19:55 |
| ← apoos_maximus left | 19:55 |
|
Kokpit
| Working!!! thanks! | 19:56 |
| ← __rohit left | 19:58 |
| ← AtumT left | 19:58 |
| ← topdownjimmy left | 19:58 |
| → topdownjimmy joined | 19:59 |
|
rafasc
| HenryCH: try something like: git -c core.sshcommand='ssh -v' fetch | 20:01 |
| → __rohit joined | 20:01 |
| ← Envil left | 20:02 |
|
HenryCH
| -v showed ~/.ssh/known_hosts:1: parse error in hostkeys file. could that be an issue? | 20:02 |
| ← jelmer left | 20:03 |
|
HenryCH
| there are strangely two entries created for my connection | 20:03 |
| → jelmer joined | 20:04 |
|
HenryCH
| your suggestion has the same behaviour as the regular 'git fetch' | 20:05 |
| ← theoceaniscool left | 20:06 |
| → inkbottle joined | 20:06 |
| → AtumT joined | 20:07 |
|
rafasc
| not sure, I was more interested in the debug1: Next authentication method: publickey | 20:08 |
|
| debug1: Offering public key: aur-key_rsa RSA SHA256: | 20:08 |
|
| or something similar. | 20:09 |
| → borkr joined | 20:09 |
| → nic-hartley joined | 20:09 |
| → dcpc007 joined | 20:10 |
| → boombatower joined | 20:12 |
| ← czart_ left | 20:12 |
|
HenryCH
| ok in git bash it works | 20:13 |
|
| in powershell it doesnt | 20:13 |
|
| i mean git bash doesnt prompt, powershell does | 20:13 |
|
| what does this mean exactly, powershell is using a different ssh client? | 20:14 |
| ← rafasc left | 20:15 |
|
whatever3
| HenryCH: ssh --version | 20:18 |
|
HenryCH
| ssh --version doesn't seem to work in powershell | 20:20 |
| ← Lucas_Gray left | 20:21 |
|
HenryCH
| OpenSSH_for_Windows_7.6p1, LibreSSL 2.6.4 | 20:22 |
| → fstd_ joined | 20:27 |
| adder` → adder | 20:27 |
| ← fstd_ left | 20:29 |
| → fstd_ joined | 20:29 |
| ← Mattiaslndstrm left | 20:30 |
| ← fstd left | 20:31 |
| fstd_ → fstd | 20:31 |
|
HenryCH
| git bash finds a different version, can't seem to find it though | 20:32 |
| → sourcream joined | 20:32 |
| → theoceaniscool joined | 20:33 |
| → yyy joined | 20:33 |
| ← __rohit left | 20:35 |
| ← theoceaniscool left | 20:35 |
| ← jakogut left | 20:35 |
| ← blackandblue left | 20:36 |
| → theoceaniscool joined | 20:37 |
|
[rg]
| git clone looks like it supports remote urls | 20:38 |
|
| does it also have to exist too | 20:38 |
| → baako joined | 20:38 |
| ← igemnace left | 20:38 |
| → Makaveli7 joined | 20:38 |
| → Xeago_ joined | 20:39 |
| ← Xeago left | 20:40 |
| Xeago_ → Xeago | 20:40 |
| ← tombusby left | 20:40 |
| → tombusby joined | 20:43 |
| ← fekir left | 20:44 |
| → jakogut joined | 20:45 |
|
osse
| [rg]: What do you mean? | 20:48 |
|
| HenryCH: Probably uses the one inside the git install dir | 20:49 |
|
[rg]
| osse: on the docs it says <directory> can be remote url | 20:50 |
|
| so wondering if i can do git clone ../repo.git ssh://user@host/~/reop.git | 20:50 |
|
| trying it but it does a local clone | 20:51 |
|
| so I get ssh: as a directory | 20:51 |
|
osse
| [rg]: Your docs must be different from mine... | 20:53 |
| ← shabius left | 20:54 |
|
[rg]
| osse, https://git-scm.com/docs/git-clone#Documentation/git-clone.txt-ltdirectorygt | 20:57 |
|
HenryCH
| osse: i'm not too familiar with this. is ssh-agent a linux tool, so i can expect it to work only in git bash on windows? | 21:02 |
| ← Jitta left | 21:04 |
| → m0viefreak joined | 21:11 |
|
osse
| [rg]: I mean I don't interpret any of that to mean the dest dir can be an url | 21:11 |
| → quebec-hartley joined | 21:12 |
|
osse
| HenryCH: Not necessarily. Depend on environment variables and such | 21:13 |
|
[rg]
| osse: host.xz:foo/.git is an scp style link | 21:13 |
|
| maybe that will work | 21:13 |
|
HenryCH
| maybe git posh is interfering with something here, if i do 'start-ssh-agent.cmd' from powershell that looks like it brings me to a new terminal session where i dont have git posh but ssh agent works as expected (and as in git bash) | 21:13 |
|
[rg]
| ok i guess it doesnt | 21:14 |
| ← nic-hartley left | 21:16 |
| → Ayo joined | 21:16 |
| → greatgatsby joined | 21:18 |
|
[rg]
| osse: ok, but it does take a remote url for <repository> | 21:19 |
|
| but it doesnt seem to want to use the remote alias | 21:19 |
| → ztychr joined | 21:20 |
| ← [rg] left | 21:26 |
| ← duderonomy left | 21:27 |
| ← kneeki left | 21:28 |
| → duderonomy joined | 21:29 |
| ← duderonomy left | 21:31 |
| ← TomyLobo left | 21:32 |
| ← borkr left | 21:36 |
| → jakogut_ joined | 21:36 |
| ← Snoober left | 21:36 |
| ← jakogut left | 21:36 |
| → Snoober joined | 21:36 |
| jakogut_ → jakogut | 21:37 |
| ← Phylock left | 21:38 |
| → kneeki joined | 21:43 |
| ← xcm left | 21:46 |
| → xcm joined | 21:47 |
| → sanchexm joined | 21:47 |
| → shabius joined | 21:48 |
| ← boombatower left | 21:48 |
| ← Ayo left | 21:52 |
| → Ayo joined | 21:53 |
| ← Regon left | 22:01 |
| ← Makaveli7 left | 22:02 |
| → Noldorin joined | 22:07 |
| ← Ayo left | 22:07 |
| → Ayo joined | 22:07 |
| → gh0str3c0n joined | 22:10 |
| Ayo → Guest86178 | 22:10 |
| → Ayo joined | 22:11 |
| ← baako left | 22:12 |
| ← Guest86178 left | 22:12 |
| ← sourcream left | 22:13 |
| ← gh0str3c0n left | 22:21 |
| ← CCDelivery left | 22:27 |
| → CCDelivery joined | 22:27 |
| ← quebec-hartley left | 22:31 |
| → dpyro joined | 22:31 |
| ← orbyt_ left | 22:31 |
| Ayo → Guest96084 | 22:34 |
| ← Guest96084 left | 22:34 |
| → Ayo joined | 22:34 |
| → kneeki|a joined | 22:35 |
| ← sentriz left | 22:35 |
| ← kneeki left | 22:36 |
| hagebake → hagabaka | 22:36 |
| → orbyt_ joined | 22:38 |
| ← volestorm left | 22:38 |
| ← SkarmoutsosV left | 22:44 |
| ← manuelschneid3r left | 22:46 |
| ← Ayo left | 22:47 |
| ← greatgatsby left | 22:49 |
| ← kapil____ left | 22:51 |
| ← kjartan left | 22:55 |
| ← plexigras left | 22:59 |
| → kjartan joined | 23:00 |
| ← Puffball left | 23:01 |
| ← theoceaniscool left | 23:01 |
| → Anticom joined | 23:01 |
| → manuelschneid3r joined | 23:03 |
| ← lankanmon left | 23:07 |
| ← GreenJello left | 23:11 |
| → kapil____ joined | 23:13 |
| ← dudek left | 23:13 |
| → GreenJello joined | 23:13 |
| ← ztychr left | 23:16 |
| ← Impaloo left | 23:18 |
| → Impaloo joined | 23:19 |
| ← jottr left | 23:23 |
| ← Impaloo left | 23:24 |
| ← m0viefreak left | 23:24 |
| ← ChrisLane left | 23:24 |
| → jottr joined | 23:24 |
| → rafasc joined | 23:24 |
| → ChrisLane joined | 23:25 |
| ← jottr left | 23:29 |
| → Impaloo joined | 23:29 |
| ← Anticom left | 23:31 |
| ← dpyro left | 23:32 |
| ← orbyt_ left | 23:39 |
| → iam730 joined | 23:40 |
| ← Kokpit left | 23:43 |
| → jottr joined | 23:45 |
| ← jottr left | 23:50 |
| → orbyt_ joined | 23:51 |
| ← CEnnis91 left | 23:55 |
| ← mixaz left | 23:56 |
| → mixaz joined | 23:57 |
| → igemnace joined | 23:57 |