Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-05-15

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
19:56 ilbot3 joined #git
19:56 Topic for #git is now Welcome to #git, the place for git help and regex jokes | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Today's edition of https://madeitwor.se/git-jokes was brought to you by ^\w{6}-(?:\w{4}-){5}\w{6}$
19:57 liamonade joined #git
19:59 sctskw joined #git
19:59 ajf- joined #git
20:05 mischat joined #git
20:06 Limes_ joined #git
20:09 ceaucari joined #git
20:10 Limes__ joined #git
20:10 HerrThees_ joined #git
20:11 linuxmint joined #git
20:12 Oog joined #git
20:14 rainbyte joined #git
20:15 Novitsh joined #git
20:18 blackwind_123 joined #git
20:18 renlo joined #git
20:19 bket1 joined #git
20:20 boombatower joined #git
20:20 relipse2 anyone around?
20:21 Gsham joined #git
20:22 govg joined #git
20:23 wcpan joined #git
20:23 garethdaine joined #git
20:26 bronson joined #git
20:27 dreiss joined #git
20:28 mizu_no_oto joined #git
20:30 IWishIKnew joined #git
20:30 aizex joined #git
20:30 baba_ joined #git
20:31 aizex git is awesome
20:31 ochorocho__ joined #git
20:32 osse correct
20:32 nnyk joined #git
20:33 liamonade joined #git
20:33 lpapp joined #git
20:33 lpapp hi, I registered on a company's gitlab, gut it always asks for git@... when I am trying to push my changes.
20:34 lpapp I added the id_rsa.pub content verbatim to the website, but still.
20:34 lpapp how am I supposed to my changes this way?
20:35 nowhereman joined #git
20:38 relipse2 i have a bunch of branches that I'm not sure if they were merged into master, is there a way I can tell ?
20:38 relipse2 i want to delete them but i'm afraid
20:39 relipse2 git branch --merged master
20:39 radsy joined #git
20:42 gaen joined #git
20:43 renlo joined #git
20:44 ceaucari joined #git
20:44 _nadim joined #git
20:45 MattMaker joined #git
20:46 renlo joined #git
20:47 mizu_no_oto joined #git
20:47 citizen-stig joined #git
20:47 osse lpapp: The url is supposed to be git@hostname
20:47 andyhoang joined #git
20:48 osse On the OS level everyone pushes as the 'git' user
20:48 lpapp osse: but I do not know the git user's password :)
20:48 relipse2 What does this mean and how do I fix it: Your branch and 'origin/userbeefup' have diverged, and have 74 and 25 different commits each, respectively.
20:49 lpapp osse: so how am I supposed to push this way?
20:49 osse lpapp: Then the ssh config is not complete
20:49 lpapp osse: what are the steps to be complete?
20:50 osse make  ssh git@host  work. If that works then git will
20:50 aidalgol joined #git
20:51 aidalgol joined #git
20:51 ceaucari joined #git
20:52 lpapp osse: is it not supposed to be enough to upload my id_rsa.pub to the gitlab instance?
20:52 lpapp perhaps I should use the http url for pushing?
20:52 osse I don't know. You usually add your keys via the Web ui
20:52 lpapp yes
20:53 osse If that's what you've done then I don't know why ssh won't use it
20:53 osse You can use http if you like
20:53 lpapp osse: so basically the ~/.ssh/id_rsa.pub file verbatim should be ok, right?
20:53 relipse2 if i am on branch 'foobar' and I do git rebase master , then technically foobar would be diverged from origin/foobar until i do git push -f right?
20:53 aeva left #git
20:53 lpapp even the fingerprint that the website shows afterwards for my uploaded key matches the one on github to which I can push.
20:54 ceaucari joined #git
20:55 Rikairchy joined #git
20:55 _rgn joined #git
20:55 _rgn joined #git
20:56 lpapp osse: pff, it says authentication failed for the http.
20:56 linuxmint joined #git
20:56 yqt joined #git
20:56 lpapp even though I did quote my "lpapp@kde.org" username.
20:56 Rikairchy joined #git
20:57 flaguy48 joined #git
20:57 osse relipse2: yes
20:57 relipse2 osse: ok thanks
20:58 sq-one joined #git
20:58 osse lpapp: your username should be the same as you log into the web site with. Quotes will probably be taken literally
20:58 osse maybe without the @part
20:58 lpapp osse: I tried without quote first, and yes, I log in with the email
20:59 osse try with just the user name
20:59 osse and try ssh -vvv
20:59 lpapp already tried, but tanks.
20:59 lpapp the reason why it needs the quotes, btw, because it extends to http://"lpapp@kde.org"@git....
21:00 osse umh
21:00 osse you're supposed to use the URL given in the web ui
21:00 lpapp osse: by the way, -vvv does not show any more.
21:00 lpapp not sure what your last sentence is supposed to mean.
21:00 renlo left #git
21:01 lpapp that is exactly the url given in the webgui fwiw.
21:01 HerrThees joined #git
21:01 osse are you saying  ssh -vvv git@hostname is quiet?
21:01 osse ah ok
21:01 lpapp no
21:01 lpapp I am not sshing that.
21:01 orbyt_ joined #git
21:02 osse it would help figuring out why ssh doesn't work
21:02 mischat joined #git
21:02 orbyt_ left #git
21:03 wibosco joined #git
21:03 lpapp osse: I will do ssh -vvv and abfuscate the confidential parts. Then, I will paste it here.
21:03 lpapp but even though ssh does not work, I really do not know why http does not work either with my credentials.
21:04 osse that part i can't help you with
21:05 lpapp osse: https://paste.kde.org/pdhglndkq/yws2br (password: gitssh)
21:06 osse /home/lpapp/.ssh/id_dsa: No such file or directory
21:07 lpapp that is right, I use rsa
21:07 AfroThundr joined #git
21:07 lpapp so what exactly is the problem with my rsa key?
21:07 osse ah
21:07 MattMaker joined #git
21:08 osse I can't tell
21:08 lpapp :(
21:08 lpapp I will try to generate brand new keys.
21:09 lpapp perhaps that is gonna be alright...
21:09 osse #openssh might be able to help
21:10 endiruna joined #git
21:10 relipse2 I have a weird problem -- I try to git checkout oldBranch but it lists a ton of files that "would be overwritten by checkout" but I have no idea why?
21:11 lpapp osse: ok, asked, cheers.
21:11 osse relipse2: it means they are untracked in this branch, tracked in that branch
21:11 osse and for git to checkout that branch it needs to modify them
21:12 elastix joined #git
21:13 relipse2 osse: but why doesn't it just switch the branch over and change everything it should? why ist it asking me
21:13 mehola joined #git
21:14 cosmologic joined #git
21:15 osse relipse2: because the changes to the files will be lost
21:15 ahmed_elgabri joined #git
21:16 osse they don't have to be untracked. they can also be modified
21:16 relipse2 osse: why would they be lost? I am currently on master, I know that checkout out another branch will have me different files, its not like there is anything modified in git status
21:16 osse relipse2: how would they not be lost ?
21:16 osse how would you get them back ?
21:16 relipse2 ossse: i would get them back by just checkout out master again?
21:17 linuxmint joined #git
21:17 osse if that were the case you wouldn't get that warning
21:17 osse At the top of the error it says "The following ... files". Does it say modified or untracked?
21:19 relipse2 osse: ok now a bigger problem, i did git status (on master) and it has a ton of files deleted and some modified and then a whole bunch of untracked files and i have no idea why
21:20 relipse2 i've done nothing to master but why are there so many files modified
21:20 osse git diff
21:21 relipse2 something has gone wrong, it has a bunch of my good files as deleted
21:21 Gsham joined #git
21:21 relipse2 is there a way to just reset master back to the way it is on the remote?
21:21 relipse2 or is there something better I can do?
21:22 * arahael twitches
21:24 osse relipse2: git status tells you how
21:25 relipse2 but I don't understand , why is there all of a sudden a hundred files as modified or deleted and untracked
21:25 osse i have no way of knowing
21:32 baba_ joined #git
21:32 arahael relipse2: what osse means, is that you did something.  maybe you renamed a directory? actually deleted them? goofed up? who knows.
21:33 relipse2 arahael, i have no idea what happened, i've saved my work onto another branch and then did git fetch origin && git reset --hard origin/master
21:33 relipse2 sound good?
21:33 arahael relipse2: or maybe you did a soft git reset.
21:34 arahael that's one way of fixing it, sure. git reset --hard would throw away whatever you have in your working directory.
21:34 boombatower joined #git
21:35 arahael relipse2: far better would have been to just read what 'git status' tells you and unstage the particular files.
21:35 arahael osse: sorry.  my twitching became too hard to resist.
21:35 relipse2 arahael, there were hundreds of files that would take a very long time...the only thing I did was delete a bunch of master branches and try to checkout branches and it failed checkout
21:35 StuartMI joined #git
21:36 arahael relipse2: did you read the message regarding the failed checkout? (did it say why?)
21:36 osse relipse2: you can list directories
21:36 skirk joined #git
21:36 osse git checkout -- . for example
21:36 arahael relipse2: also. you have a real command line. no need to work file-by-file.  though you can do that too, just takes longer..
21:38 _rgn joined #git
21:38 _rgn joined #git
21:39 mdw joined #git
21:39 lamont joined #git
21:46 toogley joined #git
21:46 LekeFly joined #git
21:46 Noldorin joined #git
21:48 Topic for #git is now Welcome to #git, the place for git help and tig welding | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.8.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Error: insufficient entries in https://madeitwor.se/git-jokes
21:48 jaguarmagenta joined #git
21:49 fuchstronaut joined #git
21:50 a3Dman joined #git
21:52 daynaskully joined #git
21:52 MrWoohoo joined #git
21:54 |ifei5g00d joined #git
21:54 mizu_no_oto joined #git
21:55 eletuchy_ joined #git
21:56 Gsham joined #git
21:58 jonmorehouse joined #git
21:59 ochorocho__ joined #git
22:00 kcy joined #git
22:01 Th0bse joined #git
22:02 Th0bse joined #git
22:03 Th0bse Hi guys
22:03 gitinfo Th0bse: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
22:04 wibosco joined #git
22:04 ceaucari joined #git
22:06 noteness joined #git
22:08 kadoban joined #git
22:10 endiruna1 joined #git
22:11 mischat_ joined #git
22:14 mischat joined #git
22:19 przemoc joined #git
22:19 elastix joined #git
22:20 ygeLN joined #git
22:20 aizex joined #git
22:25 clemf joined #git
22:27 mischat joined #git
22:29 bronson joined #git
22:38 diegoaguilar joined #git
22:40 relipse2 arahael, no i was in gitkraken gui and i didn't know how to read the message
22:41 ajf- joined #git
22:41 xall joined #git
22:42 xbob joined #git
22:44 arahael this channel really should have a disclaimer regarding alternative clients. we really can't help with them all - we mainly focus on the official git and that's it
22:45 ojacobson !gui
22:45 gitinfo Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
22:45 ojacobson like that? :)
22:45 mwhooker joined #git
22:48 andyhoang joined #git
22:49 sd512 joined #git
22:50 Motoko joined #git
22:50 sd512 is it best practice to never work on the main(master) branch directly? to always branch and then merge in?
22:50 fuchstronaut joined #git
22:50 arahael sd512: that's a workflow decision.
22:51 ril joined #git
22:51 arahael ojacobson: maybe gitinfo should do that automatically at join? ;)
22:51 ojacobson No.
22:51 arahael ojacobson: only half joking../
22:51 ojacobson For a bunch of reasons - not least of which is that telling people "you'll only get help if you jump through this hoop" is a terrible first impression.
22:52 sd512 arahael ok, so is it mostly a matter of preference?
22:52 ojacobson Sometimes we can help people who are using non-standard clients! Not often, but it doesn't hurt to ask. If you're tired of hearing it, you know how /ignore works.
22:52 Gitzilla joined #git
22:53 arahael sd512: arguably.
22:54 arahael ojacobson: i was mainly being flippant, really.
22:55 ojacobson Yeah. I understand the irritation :)
22:58 govg joined #git
23:00 Kallis joined #git
23:02 mischat joined #git
23:02 |2701 joined #git
23:02 Eugene arahael - willingness-to-help with implementations other than git.git varies dramatically by person and mood. I have no problem with pointing people in the right direction with libgit2 or their GUI while drunk.
23:03 Eugene A lot of git problems have to do with theory, eg "what is a rebase"
23:07 Kallis joined #git
23:07 qtax^w joined #git
23:10 Th0bse joined #git
23:13 jaguarmagenta joined #git
23:15 aidalgol Is there a git command to grep commit diff instead of the commit logs?
23:16 Th0bse joined #git
23:16 IWishIKnew joined #git
23:16 ojacobson git log -S and git log -G (man git-log)
23:16 gitinfo the git-log manpage is available at http://jk.gs/git-log.html
23:18 ffabi joined #git
23:19 Ahmed90 joined #git
23:20 Noldorin joined #git
23:20 endiruna joined #git
23:23 kadoban joined #git
23:27 d5sx43 joined #git
23:27 govg joined #git
23:29 aidalgol thanks!  don't know how I missed that.
23:29 liquidjamm joined #git
23:30 aidalgol joined #git
23:31 Gsham joined #git
23:32 liamonade joined #git
23:35 zivester joined #git
23:36 d0nn1e joined #git
23:39 EzeQL which are the consecuences of a force-push ?
23:40 stantonk joined #git
23:43 govg joined #git
23:44 Th0bse joined #git
23:45 nidr0x joined #git
23:45 mablae__ joined #git
23:46 bremner !rewrite
23:46 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
23:47 mischat joined #git
23:49 Pieplay joined #git
23:49 govg joined #git
23:50 stantonk joined #git
23:55 boombatower joined #git
23:56 przemoc joined #git
23:58 Technocrat7 joined #git
23:59 fstd joined #git
23:59 rgrinberg joined #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary