Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-07-25

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

All times shown according to UTC.

Time Nick Message
00:02 hfu joined #git
00:03 Random832 joined #git
00:04 l0x0304 joined #git
00:04 bitmod joined #git
00:05 dsdeiz joined #git
00:05 dsdeiz joined #git
00:07 D joined #git
00:08 Cabanossi joined #git
00:08 plasticle joined #git
00:10 kadoban joined #git
00:16 Lunatrius joined #git
00:17 bitBaron joined #git
00:18 busybusybusy joined #git
00:18 kadoban joined #git
00:20 bronson joined #git
00:27 snowkidind joined #git
00:27 valhalla_22 joined #git
00:28 orbyt_ joined #git
00:28 fat_cat joined #git
00:30 juvenal joined #git
00:30 bgerber joined #git
00:31 aakz joined #git
00:32 bgerber joined #git
00:35 mel00010 joined #git
00:36 Lipp joined #git
00:37 minot joined #git
00:37 mel00010 joined #git
00:38 Cabanossi joined #git
00:40 mel00010 joined #git
00:41 menip joined #git
00:42 kus joined #git
00:49 olalonde joined #git
00:51 jaziz joined #git
00:52 kus joined #git
00:52 khada__ joined #git
00:54 rominronin joined #git
00:55 Rodya_ joined #git
00:57 kculpis joined #git
00:58 Gsham joined #git
01:01 Random832 joined #git
01:05 sbasso joined #git
01:05 dsdeiz joined #git
01:06 elijah joined #git
01:08 cagomez joined #git
01:08 cagomez joined #git
01:09 cagomez joined #git
01:11 bgerber joined #git
01:12 Lipp joined #git
01:15 finalbeta joined #git
01:18 sunri5e joined #git
01:20 nevodka joined #git
01:21 WhiskerBiscuit joined #git
01:21 bronson joined #git
01:21 chachasmooth joined #git
01:21 askb joined #git
01:22 bitBaron joined #git
01:22 dreiss joined #git
01:24 theiostream joined #git
01:24 Shakeel_ joined #git
01:28 juvenal joined #git
01:29 fat_cat joined #git
01:31 buffal0 joined #git
01:36 diogenese joined #git
01:37 Wulf4 joined #git
01:39 heroux joined #git
01:40 d^sh_ joined #git
01:40 Pacra joined #git
01:50 Murr joined #git
01:52 ilbot3 joined #git
01:52 Topic for #git is now Welcome to #git, the place for git help and ______ | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.13.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This space intentionally left ______
01:53 Cabanossi joined #git
01:55 shiranuidong joined #git
01:57 Rodya_ joined #git
01:57 mostlybadfly joined #git
01:57 shiranuidong joined #git
01:58 Random832 joined #git
02:00 fission6 joined #git
02:02 stutter joined #git
02:03 cagomez joined #git
02:05 Vortex34 joined #git
02:05 sbasso joined #git
02:06 chachasmooth joined #git
02:10 dsdeiz joined #git
02:10 dsdeiz joined #git
02:14 cdg joined #git
02:17 lagothri1 joined #git
02:18 Blendify_ joined #git
02:18 Blendify_ how can I make a diff from two branches?
02:19 Arcaelyx joined #git
02:19 Blendify_ git diff branch_one..branch_two ?
02:21 jameser joined #git
02:22 bronson joined #git
02:22 jameser joined #git
02:24 TbobbyZ joined #git
02:25 rominronin joined #git
02:25 bitBaron joined #git
02:30 fat_cat joined #git
02:31 heroux joined #git
02:31 Darren_ joined #git
02:31 jimklo_ joined #git
02:36 chachasmooth joined #git
02:38 Bubiah joined #git
02:38 Cabanossi joined #git
02:38 Arcaelyx_ joined #git
02:38 githubmgw joined #git
02:39 wilbert joined #git
02:40 Rodya_ joined #git
02:42 Arcaely__ joined #git
02:43 Bubiah joined #git
02:45 Dreamer3_ joined #git
02:46 SpaceAce joined #git
02:47 peterbecich joined #git
02:50 chachasmooth joined #git
02:54 Dreamer3_ joined #git
02:54 johnlage_ joined #git
02:55 jameser joined #git
02:56 valhalla_22 joined #git
02:57 justanotheruser joined #git
02:57 Random832 joined #git
02:58 mattcen joined #git
02:58 quarters joined #git
02:59 quarters can someone recommend a decent diff tool for use with mergetool?
02:59 quarters my main use case is that the repo I'm merging from will usually win
03:00 str joined #git
03:01 justanotheruser joined #git
03:01 jameser joined #git
03:02 xcm joined #git
03:05 pks joined #git
03:05 nobso joined #git
03:05 nobso left #git
03:05 snowkidind joined #git
03:06 sbasso joined #git
03:07 supervolting Beyond Compare?
03:07 supervolting oh *with* mergetool
03:07 donmichelangelo joined #git
03:10 peterbecich joined #git
03:12 peterbecich joined #git
03:17 dave0x6d joined #git
03:18 fstd_ joined #git
03:21 juvenal joined #git
03:23 bronson joined #git
03:23 quarters oh, also, I tried to have a global .gitignore setup for ./node_modules/ but it looks like my current git pushes include that folder
03:25 hfu_ joined #git
03:26 sleepee joined #git
03:29 sleepee joined #git
03:30 bitBaron joined #git
03:30 pyfoo joined #git
03:31 fat_cat joined #git
03:34 PtxDK joined #git
03:35 cliluw joined #git
03:36 pyfoo joined #git
03:37 Cabanossi joined #git
03:38 wilbert joined #git
03:41 heroux joined #git
03:42 bibek22 joined #git
03:42 bibek22 hi
03:45 busybusybusy joined #git
03:46 Murr joined #git
03:50 chachasmooth joined #git
03:50 df0 joined #git
03:53 Rodya_ joined #git
03:53 Random832 joined #git
03:54 pyfoo joined #git
03:55 CBF16888 joined #git
03:55 pyfoo joined #git
03:56 rominronin joined #git
03:57 heroux joined #git
03:59 WhiskerBiscuit joined #git
04:04 Lipp joined #git
04:04 vignesh joined #git
04:11 bket joined #git
04:12 juvenal joined #git
04:17 heroux joined #git
04:24 bronson joined #git
04:27 scoobert1on joined #git
04:30 blunaxela joined #git
04:32 fat_cat joined #git
04:34 bitBaron joined #git
04:36 indistylo joined #git
04:39 cebor joined #git
04:44 peterbecich joined #git
04:45 peterbecich joined #git
04:47 CBF16888 left #git
04:47 CBF16888 joined #git
04:48 Tobbi joined #git
04:50 chachasmooth joined #git
04:52 Cabanossi joined #git
04:52 Random832 joined #git
04:53 pR0Ps joined #git
04:58 Rodya_ joined #git
04:58 Lyqyd joined #git
04:59 svm_invictvs joined #git
05:01 peterbecich joined #git
05:02 macrover joined #git
05:05 sarbs joined #git
05:06 dec0n joined #git
05:06 robertparkerx joined #git
05:07 Zoxc joined #git
05:09 peterbecich joined #git
05:09 Rodya_ joined #git
05:12 steeze joined #git
05:12 heroux joined #git
05:14 peterbecich joined #git
05:16 svm_invictvs joined #git
05:19 jameser joined #git
05:20 tunekey joined #git
05:23 high_fiver joined #git
05:24 Bock joined #git
05:25 bronson joined #git
05:27 dpl joined #git
05:30 jameser joined #git
05:30 King_Hual joined #git
05:33 fat_cat joined #git
05:34 energizer joined #git
05:35 chachasmooth joined #git
05:37 steeze joined #git
05:38 imack joined #git
05:39 bitBaron joined #git
05:40 high_fiver joined #git
05:40 Lipp joined #git
05:43 Es0teric joined #git
05:44 nunchuck joined #git
05:44 gfixler joined #git
05:46 Murr joined #git
05:46 crab joined #git
05:47 crab left #git
05:48 Random832 joined #git
05:49 jaziz left #git
05:53 rchavik joined #git
05:54 ThomasLocke joined #git
05:54 ThomasLocke joined #git
05:55 schleppel joined #git
05:57 KeyJoo joined #git
05:57 steeze joined #git
05:59 Raging_Hog joined #git
05:59 fatihgenc joined #git
06:00 shgysk8zer0 joined #git
06:00 Bubiah joined #git
06:01 czart__ joined #git
06:05 j08nY joined #git
06:05 chachasmooth joined #git
06:07 YuGiOhJCJ joined #git
06:07 Cabanossi joined #git
06:07 opalepatrick joined #git
06:09 dpl joined #git
06:11 chele joined #git
06:13 _ng joined #git
06:14 _ng joined #git
06:16 gloomy joined #git
06:18 TomyLobo2 joined #git
06:18 vignesh joined #git
06:18 thiago joined #git
06:21 fbwnd joined #git
06:21 rominronin joined #git
06:25 zerow joined #git
06:25 jimklo joined #git
06:25 bronson joined #git
06:29 str joined #git
06:30 overlord_tm joined #git
06:31 JeroenT joined #git
06:32 rscata joined #git
06:32 lb1c joined #git
06:33 fat_cat joined #git
06:34 raulp joined #git
06:35 chachasmooth joined #git
06:37 tkore joined #git
06:37 valhalla_22 joined #git
06:38 malmalmal joined #git
06:38 jknetl joined #git
06:41 Lipp joined #git
06:42 JeroenT joined #git
06:45 bitBaron joined #git
06:45 valhalla_22 joined #git
06:46 jceb joined #git
06:47 fat_cat joined #git
06:48 Random832 joined #git
06:49 JeroenT joined #git
06:50 cata__ joined #git
06:51 Silmarilion joined #git
06:56 tanuki joined #git
06:59 overlordtm joined #git
07:00 high_fiver joined #git
07:02 overlord_tm joined #git
07:04 ojdo joined #git
07:05 chachasmooth joined #git
07:06 _ikke_ quarters: gitignore does not apply to tracked files
07:07 Cabanossi joined #git
07:08 Bubiah joined #git
07:10 nd_ joined #git
07:11 Gurkenglas joined #git
07:12 overlord_tm joined #git
07:12 ShekharReddy joined #git
07:12 tanuki joined #git
07:13 msonntag joined #git
07:13 nd joined #git
07:15 raijin joined #git
07:15 ok91 joined #git
07:18 vuoto joined #git
07:18 ZyX-I joined #git
07:19 Tobbi joined #git
07:23 jceb joined #git
07:24 eshlox joined #git
07:24 fbwnd joined #git
07:26 high_fiver joined #git
07:26 gfixler joined #git
07:26 bronson joined #git
07:29 seschwar joined #git
07:34 SirPole joined #git
07:35 chachasmooth joined #git
07:37 justanotheruser joined #git
07:40 overlord_tm joined #git
07:41 overlord_tm joined #git
07:41 Chuguniy joined #git
07:42 grift joined #git
07:43 overlord_tm joined #git
07:43 jimklo joined #git
07:45 Random832 joined #git
07:46 TerianceViernion joined #git
07:47 overlord_tm joined #git
07:47 sea-gull joined #git
07:47 bitBaron joined #git
07:48 overlord_tm joined #git
07:52 JeroenT joined #git
07:52 MACscr joined #git
07:52 bket joined #git
07:53 xaa joined #git
07:54 zulutango joined #git
07:56 lss8 joined #git
07:56 lss8 joined #git
07:58 dege joined #git
07:59 nivag joined #git
08:00 mikecmpbll joined #git
08:00 pbandark joined #git
08:03 catch22__ joined #git
08:05 CheckDavid joined #git
08:06 weltall joined #git
08:07 Murii joined #git
08:10 cagomez joined #git
08:11 hfu joined #git
08:12 ok91 joined #git
08:14 bongjovi joined #git
08:14 indistylo joined #git
08:15 _ADN_ joined #git
08:18 marcogmonteiro joined #git
08:19 imack joined #git
08:20 ronskisika joined #git
08:20 chachasmooth joined #git
08:22 ronskisika joined #git
08:23 sarri joined #git
08:23 sarri joined #git
08:24 grayjoc joined #git
08:25 kurkale6ka joined #git
08:27 wandering_vagran joined #git
08:27 Lipp joined #git
08:27 bronson joined #git
08:30 maarhart joined #git
08:30 malmalmal joined #git
08:32 bitmod_ joined #git
08:33 dre_ joined #git
08:33 TbobbyZ joined #git
08:33 joeytwiddle joined #git
08:35 SirFunk joined #git
08:36 Ladus joined #git
08:37 ashnur joined #git
08:37 ashnur joined #git
08:37 chll_ joined #git
08:38 austin987 joined #git
08:38 brewmaster joined #git
08:39 javaJake joined #git
08:39 markmarkmark joined #git
08:39 ashnur joined #git
08:39 ashnur joined #git
08:39 AlgorithmWizard joined #git
08:40 forgot joined #git
08:40 joeytwiddle joined #git
08:41 alcohol joined #git
08:41 bodie_ joined #git
08:42 kirb joined #git
08:42 kirb joined #git
08:43 Random832 joined #git
08:44 evolution_ joined #git
08:48 relrod joined #git
08:48 relrod joined #git
08:50 TomyWork joined #git
08:51 cagedwisdom joined #git
08:52 PHPanos joined #git
08:53 bitBaron joined #git
08:59 theiostream joined #git
09:00 cstratak joined #git
09:05 chachasmooth joined #git
09:06 mr_sm1th joined #git
09:06 achadwick joined #git
09:07 Lipp joined #git
09:07 Darcidride joined #git
09:07 bowersbros joined #git
09:09 jstein_ joined #git
09:10 basiclaser joined #git
09:10 ok92 joined #git
09:10 vuoto joined #git
09:10 overlord_tm joined #git
09:16 mcfrisk joined #git
09:16 mcfrisk hi, does git run gc automatically by default also on some read-only operatons like git grep ?
09:18 gitfire joined #git
09:18 gitfire Hello
09:18 gitinfo gitfire: 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.
09:19 sbasso joined #git
09:19 jknetl joined #git
09:21 gitfire I'm using GIT Bash on Windows 7 x64 (also have Cygwin, MinGW and MSYS installed) and I somehow fail to clone a repo via SSH. I've added a host alias to my .ssh/config (let's name it foo) and when I type 'ssh foo' it asks for a password, then connects, but when I use 'git clone foo:~/files/repos/bar' it doesn't ask for a password and just outputs 'Unable to open connection: Host does not exist'. I'm confused. Can you help me?
09:22 _ikke_ mcfrisk: iirc, it doesn't
09:22 _ikke_ mcfrisk: only operations like git fetch would run it
09:23 wohfab joined #git
09:23 re1 joined #git
09:23 marcogmonteiro joined #git
09:23 gitfire I also failed to use 'git clone ssh://foo@<ip address>:22/~/files/repos/bar' with the error 'fatal: protocol error: bad line length character'
09:24 mcfrisk _ikke_: interesting, tar balling a git tree fails if anything is changing files in the git tree, and I just saw a failure in my build server where tar says ".git/objects/pack: file changed as we read it"
09:24 valhalla_22 joined #git
09:24 valhalla_22 joined #git
09:27 oskarkv joined #git
09:27 gloomy joined #git
09:29 bronson joined #git
09:32 bowersbros left #git
09:35 gitfire Okay, I think I found out what's going on here. The 'bad line length character' error shows me the first four characters of what the server responded. Actually it's the login prompt. If I try to connect without username, it's 'logi', because the prompt is 'login as:', and with username it's 'foo@', because the prompt is 'foo@<ip address>'s password'. Any idea why git fails to ask me for the credentials?
09:38 ssarah joined #git
09:38 sbasso joined #git
09:38 rockfruit joined #git
09:40 heroux joined #git
09:40 oxymoron93 joined #git
09:40 exotime joined #git
09:40 Random832 joined #git
09:40 Sharker joined #git
09:41 Lipp joined #git
09:44 gitfire Apparently it just doesn't like usint plink as GIT_SSH. Thank you for your help.
09:45 Murr joined #git
09:50 chachasmooth joined #git
09:51 sbasso_ joined #git
09:51 jceb joined #git
09:54 nettoweb__ joined #git
09:56 bitBaron joined #git
09:59 mkoskar joined #git
09:59 Antimachine joined #git
10:00 sz0 joined #git
10:03 Vampire0 gitfire, afaik plink could be used as GIT_SSH, but if you use plink, that explains that .ssh/config is ignored, because plink does not consider it
10:04 Kingsy left #git
10:05 gitfire Vampire0: Yes, but I also added a host for testing in PuTTY. The problem was that it didn't ask for credentials. I read somewhere that this is a known issue.
10:05 cdown joined #git
10:05 g0d355__ joined #git
10:06 Vampire0 gitfire, ah, ok
10:07 Vampire0 gitfire, well, then use certificates instead :-)
10:09 Lipp joined #git
10:15 inovas joined #git
10:20 Devastator_k joined #git
10:20 Xatenev_ joined #git
10:20 Xatenev_ Hi
10:20 Xatenev_ Can I do something like git commit --amend 2?
10:21 j416 Xatenev_: interactive rebase (man git-rebase ; look for -i)
10:21 gitinfo Xatenev_: the git-rebase manpage is available at https://gitirc.eu/git-rebase.html
10:22 Xatenev_ Ok wow
10:22 Xatenev_ im about to destroy my whole repo
10:22 Xatenev_ I will just stop and live with the wrong commit message
10:22 Xatenev_ :D
10:22 Xatenev_ funny thing: git commit --amend does weird stuff even if you CTRL + C it
10:23 j416 Xatenev_: there's also a section describing interactive rebase in more detail, in the same man page.
10:23 Vampire0 Xatenev_, !just
10:23 gitinfo Xatenev_: [!just_ask] You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)
10:23 j416 Xatenev_: !backup
10:23 gitinfo Xatenev_: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
10:23 Vampire0 Xatenev_, !justt
10:23 Vampire0 Xatenev_, !just_t
10:23 Xatenev_ Holy
10:23 Xatenev_ the spam isreal
10:23 Vampire0 damn what was it
10:23 lxnr joined #git
10:24 lxnr left #git
10:24 selckin i lookup the triggers on the site sometimes
10:24 Vampire0 Xatenev_, ah, !try it was
10:24 gitinfo Xatenev_: [!tias] Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.
10:24 Vampire0 selckin, yes, me too
10:24 Xatenev_ Vampire0, Im not sure what I should try
10:24 Xatenev_ Vampire0, and see
10:25 j416 Xatenev_: what he means is, take a backup of your repo (see above), then go wild and learn
10:25 j416 Xatenev_: interactive rebase, etc.
10:25 ronator joined #git
10:25 Vampire0 Xatenev_, the interactive rebase. Quite easy to change the commit message
10:26 ok91 joined #git
10:27 Xatenev_ Yea im just unsure why you're bombarding me with wall of texts even though the oneliner of j416 was sufficient
10:27 j416 Xatenev_: he got the command wrong, that's all
10:28 Vampire0 exactly
10:28 j416 ^ what he means is, sorry about that, I could have been more concise
10:29 yan joined #git
10:30 bronson joined #git
10:30 Vampire0 hey, don't destroy my conciseness
10:31 bomb-on joined #git
10:31 govg joined #git
10:32 * gitinfo slaps around j416  a bit with a large trout
10:32 valhalla_22 joined #git
10:32 * j416 shoves trout down gitinfo's throat
10:33 sbasso joined #git
10:34 finalbeta joined #git
10:34 gitinfo Beer! It's what's for dinner!
10:35 chachasmooth joined #git
10:36 Lipp joined #git
10:36 MadLamb joined #git
10:36 cagedwisdom joined #git
10:37 MadLamb Hello, I'm in the middle of a rebase and I acidentaly removed the changes from the index (git status reports an empty index, git rebase --continue says there are no changes). I would like to reaply the same patch. Is that possible?
10:38 fatihgenc joined #git
10:39 moritz MadLamb: if you haven't invested much work yet, you could git rebase --abort and then start over
10:39 Random832 joined #git
10:39 MadLamb moritz, that is what I usually do, but I invested a lot of work already xD
10:40 MadLamb moritz, its like 300 commits, I'm somewhere in the middle
10:40 JeroenT joined #git
10:40 catch22_ joined #git
10:43 synthmeat joined #git
10:45 maarhart joined #git
10:48 venmx joined #git
10:49 stoopkid_ joined #git
10:51 tcorneli joined #git
10:54 rahtgaz joined #git
10:54 hexagoxel joined #git
10:56 Vampire0 MadLamb, I guess `git cherry-pick -n <committ-ish>` could be the way to go
11:00 venmx joined #git
11:00 bitBaron joined #git
11:02 rscata joined #git
11:03 j416 MadLamb: perhaps start with a backup just in case.
11:03 MadLamb j416, I can still abort the rebase worst case
11:04 j416 MadLamb: yes, but it'd be troublesome to get back to the exact state in which you are now in
11:04 tvw joined #git
11:04 MadLamb j416, I would have to do the rebase again from the start.
11:04 j416 MadLamb: you could continue from where you are now.
11:05 j416 MadLamb: but if you're comfortable without backups, by all means don't backup. ;)
11:05 thinkpad joined #git
11:07 MadLamb j416, not sure what you mean by backuping. Git reflog is there for this AFAIK.
11:07 j416 !backup
11:07 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
11:07 j416 i.e., cp -a path/to/workdir path/to/backup
11:07 MadLamb j416, hmm, but doesn't git already does that for you with reflog?
11:07 j416 no
11:07 MadLamb j416, what is the difference?
11:08 j416 above would keep the exact state you are in now
11:08 j416 including where you are in the rebase
11:08 MadLamb if I checkout to the reference I am now I would also come to the same exact state.
11:09 j416 no, there'd be another entry in your reflog, HEAD@{n} would behave differently, and you might not be sure of how to get back
11:09 MadLamb hmm
11:09 j416 but as I said, if you're comfortable without backup, go ahead :)
11:09 MadLamb its a nice advice and discussion anyway, thanks
11:10 j416 just saying it's an easy enough thing to do if you're the least bit worried about losing your work
11:10 j416 in any case, what Vampire0 said should probably do what you want.
11:11 MadLamb j416, just concerned on the speed of doing that, the repo is huge, but might be worth the investment for some cases
11:11 j416 MadLamb: in that case, don't then.
11:11 kurkale61 joined #git
11:12 j416 you'll know if you don't need a backup
11:13 MadLamb :D
11:14 nicolai86 joined #git
11:15 kurkale6ka joined #git
11:15 cagedwisdom joined #git
11:15 rahtgaz joined #git
11:16 staafl joined #git
11:18 govg joined #git
11:20 nicolai86 joined #git
11:21 gloomy joined #git
11:22 Cabanossi joined #git
11:25 nicolai86 joined #git
11:28 cagedwisdom joined #git
11:31 bronson joined #git
11:32 db8093246 joined #git
11:33 Tobbi joined #git
11:35 Cavallari joined #git
11:35 chachasmooth joined #git
11:36 Random832 joined #git
11:37 TbobbyZ joined #git
11:37 dglambert joined #git
11:37 dglambert yo
11:38 kurkale61 joined #git
11:38 Vampire0 oy
11:38 sostenuto joined #git
11:39 mcfrisk left #git
11:40 VladGh joined #git
11:40 kurkale6ka joined #git
11:44 manuelschneid3r joined #git
11:44 holodoc joined #git
11:44 kurkale61 joined #git
11:46 Murr joined #git
11:47 jc__ joined #git
11:51 rscata joined #git
11:52 jameser joined #git
11:52 valhalla_22 joined #git
11:53 brent__ joined #git
12:02 venmx joined #git
12:04 igo joined #git
12:04 igo left #git
12:05 chachasmooth joined #git
12:05 duckydan joined #git
12:08 Bubiah joined #git
12:08 Gustavo6046 joined #git
12:10 marcogmonteiro joined #git
12:12 kurkale61 joined #git
12:13 jhattara joined #git
12:13 jeffreylevesque joined #git
12:13 Swey_Hey joined #git
12:14 jhattara i have an issued with importing from svn to git with a branch that has a colon character in it's name, any idea how i could circumvent errors caused by "git svn" reading that colon as a regular separator?
12:18 JeroenT joined #git
12:20 Pacra joined #git
12:21 _ADN_ joined #git
12:22 blah123 joined #git
12:24 kurkale6ka joined #git
12:25 svm_invictvs joined #git
12:25 bgarrett joined #git
12:25 ok91 joined #git
12:29 Wulf jhattara: modify the code (git-svn) to replace the colon
12:30 jameser joined #git
12:31 kurkale6ka joined #git
12:32 bronson joined #git
12:32 Xatenev_ left #git
12:32 tvw joined #git
12:32 Bubiah joined #git
12:32 marcogmonteiro joined #git
12:34 Random832 joined #git
12:34 jameser joined #git
12:35 Cavallari joined #git
12:35 MadLamb joined #git
12:35 nettoweb__ joined #git
12:36 jhattara Wulf, any advice how? i'm not so familiar with perl
12:37 moritz s/:/_/
12:37 Cabanossi joined #git
12:37 bgarrett Hiya, got a problem and I'm hoping someone can point me in the right direction.  I've got a git repo created using svn clone which when cloned onto a Windows 7 box fails to clone with "fatal: pack has bad object at offset 1863759142: inflate returned 1" "fatal: index-pack failed"  however when I run the same clone on a Linux machine it succeeds.  The Windows machine is running 64 bit OS using NTFS and using git
12:37 bgarrett bash with git version 2.13.0.windows.1 64bit.  I've looked for long paths and case sensativity clashes but couldn't see anything.
12:37 Lipp joined #git
12:38 JeroenT joined #git
12:38 stutter joined #git
12:38 Wulf jhattara: do you get an error?
12:39 CheckDavid joined #git
12:40 jhattara Wulf, few different kinds
12:40 jhattara 1) W: unknown path/rev in svn:mergeinfo dirprop: /pwd/trunk:51729-51811
12:40 jhattara 2) Odd number of elements in hash assignment at /Applications/Xcode.app/Contents/Developer/usr/share/git-core/perl/Git/SVN.pm line 1777.
12:41 jhattara 3) Use of uninitialized value $b in string eq at /Applications/Xcode.app/Contents/Developer/usr/share/git-core/perl/Git/SVN.pm line 1800.
12:41 LBV_User joined #git
12:41 dpl joined #git
12:41 nfk joined #git
12:41 jhattara and then several "Couldn't find revmap for " notices
12:41 githubmgw joined #git
12:42 disse joined #git
12:42 Wulf hmm
12:43 Wulf jhattara: looks more complicated than I thought
12:43 jhattara Wulf, it's probably something to do with Git::SVN splitting elements by colon
12:44 sbasso joined #git
12:44 Wulf $refname =~ s{([ \%~\^:\?\*\[\t\\])}{sprintf('%%%02X',ord($1))}eg;
12:44 jhattara if i could just find the points where the splitting is done ...
12:44 Wulf jhattara: isn't that supposed to filter out colons?
12:45 HardlySeen joined #git
12:45 Wulf perhaps you're mistaken and it's not the colons but something else
12:47 jhattara Wulf, where is that ?
12:47 Wulf jhattara: SVN.pm
12:47 wandering_vagran joined #git
12:48 synthroid joined #git
12:49 jameser joined #git
12:49 jhattara Wulf, found it.... yeah, could be something completely different, but it starts throwing those exception right after merging that branch with ": " in it's name
12:52 sbasso_ joined #git
12:52 stutter joined #git
12:53 jhattara every other kind of error encountered so far i could skip by skipping some obsolete revisions, but this throws errors from mergeinfos ...
12:54 synthroi_ joined #git
12:55 Vampire0 jhattara, is this about a one-time migration or do you want to use Git as frontend for the SVN server and commit back to SVN?
12:55 zxd what does this mean ? git push gitlab refs/heads/main:refs/heads/main
12:55 zxd error: src refspec refs/heads/main does not match any.
12:55 doev joined #git
12:55 Vampire0 zxd, you don't have a local branch called "main"
12:56 synthro__ joined #git
12:56 jhattara Vampire0, it's a one time migration to git, but retaining history is extremely important
12:57 zxd ah main hehe
12:57 zxd the computer should know what I ment common
12:57 bgerber joined #git
12:57 Vampire0 jhattara, I totally agree to that, but !svn2git
12:57 gitinfo jhattara: For a one-time conversion of SVN to git, svn2git should be used instead of git-svn. There are many tools with this name. Probably the best is the KDE one at https://github.com/svn-all-fast-export/svn2git. To analyze the SVN repo history upfront for building up proper rules for svn2git, you might use svneverever from here: http://blog.hartwork.org/?p=763
12:57 cdown joined #git
12:58 StyXman joined #git
12:58 StyXman I have a repo with local modifications. I git stash, git pull, and git stash pop. this last operation fails because of conflicts. i manually resolve the conflicts, whatshould i do now?
12:59 stutter joined #git
12:59 StyXman I want to keep the local copy with modifications, and not commit anything yet
13:01 _ikke_ You don't have to do anything
13:03 StyXman I'm getting this: Fhttp://linkode.org/#E8yYLSwousfZ3ib4rNFeX5
13:03 StyXman err, http://linkode.org/#E8yYLSwousfZ3ib4rNFeX5
13:04 mgedmin usually when you fix merge conflicts you have to let git know by running git add on those files
13:04 StyXman but then if I try to stash, I won't get anything
13:05 mgedmin iirc by default git stash also stashes the staged changes you have in the index
13:05 StyXman last line reads 'impossible to save the current state of the index'
13:05 StyXman ok, lemme try
13:05 mgedmin but perhaps you can use git add -N to tell git you resolved the conflict but without staging that file for commit
13:06 Ryanar joined #git
13:07 Lipp joined #git
13:07 _ikke_ N
13:07 _ikke_ no
13:07 _ikke_ or
13:07 _ikke_ perhaps, ignore me
13:08 StyXman will try to :)
13:08 StyXman mgedmin: I don't quite get the -N option
13:08 _ikke_ it's intent-to-add
13:09 mgedmin pet peeve: I split the changes into things I want to keep and things I want to stash using git add -p, then git stash, then discover the stash stashed EVERYTHING (and git stash pop smushes my two sets of diffs back into one)
13:09 mgedmin (and this is how I know git stash stashes changes added to the index)
13:09 mgedmin (so you don't really need git add -N)
13:09 stutter joined #git
13:10 cagomez joined #git
13:13 jameser joined #git
13:18 dos000 joined #git
13:19 bsanford joined #git
13:19 dos000 it looks like git is not respecting my ~/.ssh/config file. Is it me or is it supposed to resolve hosnames based on the .ssh/config file ?
13:19 sleepee joined #git
13:19 wohfab joined #git
13:20 mgedmin it's supposed to
13:20 chachasmooth joined #git
13:21 mgedmin (more specifically git just exec's ssh, which will read ~/.ssh/config)
13:23 dust_ joined #git
13:25 dos000 mgedmin: the only way its finding my hosname is if i put it in my /etc/hosts otherwise its saying that this host does not exist
13:25 cdown joined #git
13:25 mgedmin there are so many possibilities ...
13:26 nettoweb__ joined #git
13:26 dos000 i am on git version 2.11.0 in ubuntu 17.04
13:26 mgedmin bisect the problem: can you 'ssh <hostname>'?
13:26 dos000 yes indeed
13:26 dos000 oops .. wait a sec  ...
13:26 ankit01ojha joined #git
13:27 mgedmin hm, strace -f -o /tmp/trace.log git clone <hostname>:/path/to/repo.git then look at how git execs ssh and whether ssh reads /home/yourusername/.ssh/config?
13:27 kus you guys I have found what I think is a well kept git secret. So what I have started doing is git stash;git pull {remote} {branch};git stash apply; what is wrong with this approach and why don't we do it more often?
13:27 jameser joined #git
13:27 _ikke_ you can also use GIT_TRACE=1 git clone ..
13:27 mgedmin isn't there a git pull --autostash?
13:27 kus oh is there?
13:28 mgedmin looks like there is!
13:28 hfu joined #git
13:28 kus so it does the git stash git pull git stash apply in one go?
13:28 mgedmin but "This option is only valid when "--rebase" is used."
13:28 zerow joined #git
13:28 kus or does it do it differently?
13:29 kus rebase scares me
13:29 kus don't want to rewrite history or people will yell at me
13:29 mgedmin it's not the rebase that makes people yell at you, it's git push --force
13:29 mgedmin rebasing things you haven't pushed anywhere is fine
13:29 Gsham joined #git
13:31 Random832 joined #git
13:32 tvw joined #git
13:32 cagmz_ joined #git
13:32 ForeignBiscuit joined #git
13:32 BSAlb joined #git
13:33 bronson joined #git
13:33 fahadash joined #git
13:33 shiva__ joined #git
13:33 sathed_ joined #git
13:33 milki__ joined #git
13:34 cdown joined #git
13:34 nicolai86_ joined #git
13:34 watersoul_ joined #git
13:34 PaulCape_ joined #git
13:34 Bercik joined #git
13:34 Darren_ joined #git
13:35 jamal7_ joined #git
13:35 oprypin joined #git
13:35 salamanderrake joined #git
13:36 markus-k joined #git
13:36 ws2k3 joined #git
13:36 seschwar joined #git
13:36 fox_ joined #git
13:36 rafalcpp joined #git
13:36 volestorm joined #git
13:36 tijensse joined #git
13:36 sothym joined #git
13:36 shampine joined #git
13:38 hfu joined #git
13:38 jameser joined #git
13:39 jstein_ joined #git
13:39 __name__ joined #git
13:40 sweatsuit joined #git
13:40 SirPole joined #git
13:41 zetax joined #git
13:42 zetax I'm working on group project and every time I do git pull and remote has changes, it wants to *merge*
13:42 dzho yes
13:42 zetax I have absolutely no idea what is causing this.
13:42 oxymoron93 pull + fetch + merge
13:43 oxymoron93 pull = *
13:43 mgedmin you have local changes you haven't pushed to the remote
13:43 mgedmin so you must either merge or rebase
13:43 manuelschneid3r joined #git
13:43 mgedmin git pull will try to merge; git pull --rebase will try to rebase
13:43 cam27 joined #git
13:43 dzho git fetch will just fetch
13:43 xPucTu4 joined #git
13:43 * mgedmin strongly prefers --rebase
13:43 dzho leaving you to do the merge or rebase in a separate step
13:44 gloomy joined #git
13:44 zetax but I have worked on group projects before and this is the first time it throws "Merge branch 'dev' of yadayada" on my face
13:44 dzho zetax: so, perhaps, you might wish to git fetch and then evaluate where you stand with git status and git diff
13:44 zetax upon pull that is
13:44 dzho ok
13:45 AaronMT joined #git
13:45 Jackneillll how can i merge all the commits into one? have a lot of commits with "." msg (all of them) and want 1 decent. i did git rebase .i <first_commit_id> bu that gave me conflicts
13:45 Jackneillll -i*
13:46 Murr joined #git
13:46 skunkz joined #git
13:47 zetax what was eli5-tldr on rebase again. moves HEAD on top no questions asked eh
13:47 jameser joined #git
13:47 Dougie187 joined #git
13:47 stux|RC-only joined #git
13:48 mgedmin left #git
13:49 kpease joined #git
13:49 _ikke_ zetax: it takes a list of commits, and recommits them on top of a new 'base'
13:49 _ikke_ is that eli5 enough?
13:50 venmx joined #git
13:50 oxymoron93 go to rebase manual page
13:50 chachasmooth joined #git
13:51 sbasso joined #git
13:51 arnoldoree joined #git
13:52 nfk joined #git
13:52 arnoldoree joined #git
13:55 SporkWitch _ikke_: !rebase
13:55 gitinfo _ikke_: 'git rebase' takes away your local commits, updates your branch with new stuff from <upstream> (argument), then re-applies your local commits on top. This makes it look like your commits were created "after" the new stuff, and it can look cleaner than doing a !merge. Beware of !rewriting_public_history, though. Not to be confused with !interactive_rebase.
13:55 Tobbi joined #git
13:56 dviola joined #git
13:56 _ikke_ SporkWitch: I know the triggers, but sometimes I prefer to explain it myself
13:56 SporkWitch multitasking, it looked like you were the one asking about it
13:57 dos000 joined #git
14:01 Vampire0 quite unlikely :-D
14:01 LeBlaaanc joined #git
14:03 oxymoron93 how come interactive rebase results in conflicts? or does it have to do with possibility of changing the order of commits?
14:04 str joined #git
14:04 cbreak oxymoron93: rebase changes bases
14:04 _ikke_ yes, reordering commits can result in conflicts
14:04 cbreak it builds on top of cherry-picking, and picks commits
14:05 cbreak which in turn builds on applying patches
14:05 tcorneli joined #git
14:05 cbreak and that can fail, if the state you apply on isn't compatible with the patch you try to apply
14:05 cbreak many causes for that can exist.
14:05 oxymoron93 right, thanks, was thinking about Jackneillll 's question
14:05 cbreak reordering is one, deleting commits, inserting commits an other, or just rebasing onto somewhere else
14:06 cbreak squashing commits (what he wants to do) should be conflict free
14:06 oxymoron93 cbreak yes i was aware normal rebase conflicts, but tnx
14:06 Jackneillll i was searching for git reset --soft HEAD~x && git commit
14:06 cbreak but it's easier without rebase
14:07 Cabanossi joined #git
14:14 Gurkenglas joined #git
14:15 menip joined #git
14:16 thebope joined #git
14:17 perlpilot joined #git
14:17 mkoskar joined #git
14:18 Khisanth joined #git
14:21 dos000 btw folks thank you for all your help i had bad .ssh/config file and it was confusing since i switched between host and hostname !
14:23 Darren_ joined #git
14:27 Murii joined #git
14:29 jceb joined #git
14:30 Random832 joined #git
14:31 andai_ joined #git
14:33 bronson joined #git
14:33 TbobbyZ joined #git
14:33 venmx joined #git
14:35 marcogmonteiro joined #git
14:35 raijin joined #git
14:35 maarhart_ joined #git
14:36 mikecmpbll joined #git
14:37 Cabanossi joined #git
14:41 thiago joined #git
14:41 sbasso joined #git
14:43 StyXman left #git
14:43 amrits joined #git
14:43 Anon1921 joined #git
14:43 andai__ joined #git
14:46 Jackneill joined #git
14:47 githubmgw1 joined #git
14:50 chachasmooth joined #git
14:51 Ardethian joined #git
14:54 mcfrisk joined #git
14:55 tvw joined #git
14:55 dpl joined #git
14:55 mcfrisk Hi, any idea how to fix this problem when switching from git 1.9.1 in Ubuntu 14.04 to 2.7.4 in Ubuntu 16.04? https://pastebin.com/raw/VVYTVfZ5
14:56 bsanford joined #git
14:56 mikecmpbll joined #git
14:56 dreiss joined #git
14:59 cbreak mcfrisk: looks like your remote is broken
15:00 cbreak mcfrisk: delete one of the two offending refs
15:00 _ikke_ git cannot have foo and foo/bare
15:00 _ikke_ foo/bar*
15:00 _ikke_ (linux file systems prevent that)
15:01 _ikke_ I think 1.9.1 does not check that, and you might run into problems later
15:01 eto joined #git
15:01 eto hello
15:01 thiago joined #git
15:01 malide joined #git
15:02 eto i am kinda fighting with this some minutes but I cannot find out how to list active "tree" contents
15:02 oxymoron93 joined #git
15:02 eto eg i would like to do something akin to ls -al but on HEAD instead of staging area or workdir
15:02 matsaman joined #git
15:02 hyperair joined #git
15:02 eto any hints which subcommand does the magic?
15:03 _ikke_ eto: git ls-tree HEAD
15:03 _ikke_ (add -r for recursive)
15:03 nettoweb__ joined #git
15:04 mcfrisk cbreak: how is it broken? any git commands to fix the repo? I may have to run it automatically for tens of trees..
15:05 eto _ikke_: that is what i thought
15:05 cbreak git update-ref -d the refs that are conflicting on the server?
15:05 _ikke_ eto: but?
15:05 cbreak no idea how you even got those
15:06 eto _ikke_: okay thanks! it is that subcommand ... but somehow it doesn't work if I am inside certain subdir within git tracked project
15:06 mcfrisk cbreak: it's a local clone which is failing, git gc doesn't report anything.
15:06 steeze joined #git
15:06 eto well never mind maybe it's caused by fs traversal, thanks anyway _ikke_ !
15:07 cbreak mcfrisk: gc isn't supposed to report things
15:07 cbreak fsck might.
15:07 cbreak mcfrisk: the problem is that the server seems to be bogous
15:07 in1t3r_ joined #git
15:07 Gurkenglas joined #git
15:08 _ikke_ cbreak: the 'server' is another repo at the same machine
15:08 _ikke_ fyi
15:08 cbreak I am aware
15:08 cbreak maybe "remote" would have been a better name
15:09 bytefire joined #git
15:09 ok91 joined #git
15:09 wohfab joined #git
15:11 Devastator_x joined #git
15:11 shiva__ joined #git
15:12 valhalla_22 joined #git
15:12 valhalla_22 joined #git
15:12 bytefire hey guys... i accidentally pushed two commits to origin/master. so i did this: create separate feature branch locally --> one master revert the two commits and push them to remote --> switched to feature branch --> pushed it to feature branch (of same name) on origin. now i can't create a pull request because those commits are already in master!

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