Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-05-02

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

All times shown according to UTC.

Time Nick Message
00:00 kutenai Aha! Was not aware that command existed. Thanks for the tip!
00:00 gitinfo kutenai: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
00:00 Vampire0 kutenai, yw
00:01 kutenai Vampire0: Thank you!! That's exactly what I needed.
00:01 Dougie187 joined #git
00:02 Vampire0 gr8
00:03 jtoy joined #git
00:03 eblip joined #git
00:05 gopar joined #git
00:06 marianina8 joined #git
00:07 cdown joined #git
00:09 tocky joined #git
00:13 kutenai Seriously, that command is awesome! I've been missing that for who knows how long.. ack
00:15 anuxivm left #git
00:15 rewt joined #git
00:21 cqi joined #git
00:22 shgysk8zer0 joined #git
00:23 YuGiOhJCJ joined #git
00:23 Vampire0 kutenai, :-)
00:25 mattcen joined #git
00:26 Cabanossi joined #git
00:27 venmx joined #git
00:30 Noldorin joined #git
00:31 caper joined #git
00:32 fstd_ joined #git
00:34 jaziz joined #git
00:34 livingstn joined #git
00:40 Hunter1 joined #git
00:42 tonyt joined #git
00:43 cads joined #git
00:43 ronin_anubis joined #git
00:44 Spacew00t joined #git
00:44 brent__ joined #git
00:46 ronin_anubis Hi, I'm new to git and need some help. I created a bare repo from a local folder, and then cloned it in a different path. At the remote path, I committed and pushed an update. However, if I go back to the original path and do a "git fetch" the file is not showing the updates. Although, if I go and create a new clone, it does have the updated changes.
00:47 jameser joined #git
00:52 netj joined #git
00:53 cust joined #git
00:54 axisys joined #git
00:54 mizu_no_oto joined #git
00:57 dreiss joined #git
01:02 ojdo joined #git
01:06 Vampire0 ronin_anubis, fetch does only update the remote tracking branches in the local repository, not the local branches or the worktree
01:06 Vampire0 ronin_anubis, if you want to incorporate the fetched changes you need to use man git merge or man git rebase
01:06 gitinfo ronin_anubis: the git-merge manpage is available at https://gitirc.eu/git-merge.html
01:06 gitinfo ronin_anubis: the git-rebase manpage is available at https://gitirc.eu/git-rebase.html
01:06 Vampire0 ronin_anubis, if this is about using git as a deployment tool, see !deploy
01:06 gitinfo ronin_anubis: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
01:08 ronin_anubis Vampire0: Both merge and rebase complain as there's no work tree, as this is a bare repo.
01:11 Cabanossi joined #git
01:11 fatalhalt joined #git
01:13 d^sh joined #git
01:15 ronin_anubis Vampire0: Should I convert it back to a non-bare repo or what's the best way to do that ?
01:15 finalbeta joined #git
01:19 Es0teric joined #git
01:26 Wulf4 joined #git
01:29 raijin joined #git
01:30 rkazak joined #git
01:31 shinnya joined #git
01:35 prg318 joined #git
01:41 brent__ joined #git
01:47 masuberu joined #git
01:47 dsdeiz joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:51 Goplat joined #git
01:52 thinkpad joined #git
01:58 durham_ joined #git
01:59 durham_ joined #git
02:04 otiose joined #git
02:04 Vortex34 joined #git
02:05 pks joined #git
02:06 menip joined #git
02:07 gableroux joined #git
02:12 chachasmooth joined #git
02:14 bitmod joined #git
02:15 svm_invictvs joined #git
02:16 fahadash joined #git
02:18 livingstn joined #git
02:19 LeBlaaanc joined #git
02:19 chatter29 joined #git
02:19 chatter29 left #git
02:21 TheSimonator joined #git
02:26 mizu_no_oto joined #git
02:26 cqi joined #git
02:30 xco left #git
02:33 snowkidind joined #git
02:34 spmlop joined #git
02:38 a_thakur joined #git
02:40 a_thakur joined #git
02:43 livingstn joined #git
02:43 wagle joined #git
02:44 jtoy joined #git
02:45 hexagoxel joined #git
02:51 kbeflo joined #git
02:51 peterbecich joined #git
02:54 mizu_no_oto joined #git
02:56 lagothri1 joined #git
02:56 raspado joined #git
02:57 Burgerz joined #git
02:58 dougquaid joined #git
02:59 dougquaid I've made a bunch of changes to my code but I also accidentially deleted a file I need. How can I restore that file without losing all of my current changes?
03:00 dougquaid I have not done a commit since deleting the file if that matters
03:00 rudi_s dougquaid: git status and follow the instructions.
03:00 rudi_s (git checkout path/to/file in this case, but git status is quite good in telling you what you have to do.)
03:01 dougquaid awesome, thanks
03:01 rudi_s (It doesn't matter, as the file won't be part of the commit unless you add it.)
03:01 DomeMasterYolo17 joined #git
03:01 rudi_s np
03:04 podlech joined #git
03:06 aavrug joined #git
03:06 hashtagstrashtag joined #git
03:10 durham joined #git
03:11 watabou joined #git
03:18 njbair joined #git
03:25 Cabanossi joined #git
03:29 brent__ joined #git
03:32 durham joined #git
03:32 mizu_no_oto joined #git
03:37 dougquaid left #git
03:41 Noodlewitt joined #git
03:43 axisys joined #git
03:46 jtoy joined #git
03:48 d4rkl0rd joined #git
03:48 dave0x6d joined #git
03:51 marianina8 joined #git
03:52 cdown_ joined #git
03:52 g0d355__ joined #git
03:54 venmx joined #git
03:55 Cabanossi joined #git
03:59 di0_ joined #git
04:02 mel00010 joined #git
04:04 otiose joined #git
04:08 livingstn joined #git
04:14 Oatmeal joined #git
04:15 otiose joined #git
04:16 dsantiago joined #git
04:17 hailhydra joined #git
04:17 hailhydra I want to make a repo for my dotfiles on github. What are the steps?
04:17 TheSimonator joined #git
04:18 hailhydra Do I initialize the repo in my home dir first then make a repo on github? or make an empty repo on github and clone it then add my dotfiles locally?
04:19 kristhian joined #git
04:19 kristhian how do you clone a specific folder from github?
04:20 kristhian not the whole components of it?
04:20 hailhydra kristhian: just wget? I don't think you can just close a folder
04:22 Yuv joined #git
04:30 ayogi joined #git
04:31 BSAlb joined #git
04:36 kent\n joined #git
04:40 durham joined #git
04:40 snowkidind joined #git
04:44 shgysk8zer0_ joined #git
04:44 xaa joined #git
04:45 Andrew_K joined #git
04:51 circ-user-3LMm1 joined #git
04:53 brandonw_ joined #git
04:57 freimatz joined #git
04:57 cyphase joined #git
04:57 FuzzyWuzzyPanda joined #git
05:01 dec0n joined #git
05:04 cdown joined #git
05:07 jozwior joined #git
05:08 bgerber joined #git
05:09 lyxus joined #git
05:10 Bock joined #git
05:11 fakenerd joined #git
05:12 Bock joined #git
05:13 rkazak joined #git
05:18 shinnya joined #git
05:20 lyxus joined #git
05:21 salamanderrake joined #git
05:23 lyxus joined #git
05:24 danimal2 joined #git
05:25 lindenle joined #git
05:27 Brski joined #git
05:39 navidr joined #git
05:39 schleppel joined #git
05:39 digidog joined #git
05:44 durham joined #git
05:45 brent__ joined #git
05:50 Raging_Hog joined #git
06:02 lb1d joined #git
06:04 diogenese joined #git
06:05 regedit joined #git
06:07 fakenerd joined #git
06:07 lordjancso joined #git
06:08 alexandre9099 joined #git
06:08 dersand joined #git
06:14 freimatz joined #git
06:14 dec0n joined #git
06:16 otiose joined #git
06:16 overlord_tm joined #git
06:17 Taikibansei joined #git
06:17 rscata joined #git
06:18 scarabx joined #git
06:18 circ-user-3LMm1_ joined #git
06:19 jagob joined #git
06:19 Junior joined #git
06:19 chele joined #git
06:20 Silenced joined #git
06:21 nickel_dime_look joined #git
06:21 idmistir joined #git
06:23 roelmonnens joined #git
06:23 roelmonnens joined #git
06:24 Celelibi joined #git
06:25 Hko joined #git
06:29 rokups joined #git
06:31 aielima joined #git
06:34 sbulage joined #git
06:36 zeroed joined #git
06:36 zeroed joined #git
06:36 nidr0x joined #git
06:39 JeroenT joined #git
06:39 JeroenT joined #git
06:39 Karazhan joined #git
06:40 Cabanossi joined #git
06:42 dreiss joined #git
06:48 jtoy joined #git
06:53 ertes joined #git
06:54 tarkus joined #git
06:54 tarkus Hey guys! What is the best 3-way merge tool nowadays? ..for resolving merge conflicts in code
06:55 selckin kdiff3 imo
06:55 _ikke_ !best
06:55 gitinfo [!bestway] You want to know the best way to do X? If you can give us a proper definition of "best", we'll give you a proper way to do X ;)
06:55 _ikke_ kdiff3 does not have undo :-/
06:55 selckin undo is close and restart :/
06:55 _ikke_ right, more akin to redo
06:56 tarkus I'm currently using 3-way merge in WebStorm, but merging package.json there is tough :) for some reason it doesn't help much with that type of conflicts
06:56 selckin don't see what you could undo
06:56 _ikke_ selckin: undo an edit in the merge result
06:57 _ikke_ Sometimes I need parts of both combined
06:57 zeroed joined #git
06:57 zeroed joined #git
06:57 tarkus other than undeo, do you think kdiff3 is better than mergetools in WebStorm or BeyondCompare?
06:57 tarkus *undo
06:57 Raging_Hog joined #git
06:57 _ikke_ I haven't used beyondcompare
06:57 ivanruizmonjo__ joined #git
06:58 _ikke_ and I don't think I have used the intellij IDE's to actually solve a merge conflict
06:58 _ikke_ so hard to tell
06:58 _ikke_ kdiff3 is easy to try yourself
06:58 Lunatrius joined #git
07:00 Chuguniy joined #git
07:01 chandu20 joined #git
07:01 vmiklos joined #git
07:02 Raging_Hog joined #git
07:03 King_Hual joined #git
07:03 circ-user-3LMm1 joined #git
07:05 wandering_vagran joined #git
07:05 ZyX-I joined #git
07:06 Burgerz joined #git
07:08 selckin i really to a global commit hook for svn collegue so it can remind him to push after committing
07:08 djb-irc joined #git
07:08 indistylo joined #git
07:09 zulutango joined #git
07:10 njbair joined #git
07:13 sea-gull joined #git
07:17 circ-user-3LMm1_ joined #git
07:19 King_Hual joined #git
07:19 King_Hual joined #git
07:19 elect joined #git
07:20 chachasmooth joined #git
07:21 durham joined #git
07:24 jackrandom joined #git
07:24 King_Hual joined #git
07:26 leeN joined #git
07:28 monokrome joined #git
07:30 jaziz joined #git
07:33 ivanruizmonjo_ joined #git
07:34 JeroenT_ joined #git
07:35 manuelschneid3r joined #git
07:38 theoceaniscool joined #git
07:40 sea-gull_ joined #git
07:41 a_thakur joined #git
07:42 User458764 joined #git
07:44 netroxen joined #git
07:47 m1dnight_ joined #git
07:47 aard joined #git
07:50 jtoy joined #git
07:52 ronskisika joined #git
07:54 venmx joined #git
07:55 m1dnight_ joined #git
07:55 zeroed joined #git
07:55 tobiasvl selckin: that should be pretty simple
07:55 zeroed joined #git
07:56 selckin not the global part
07:56 tobiasvl what do you mean by "global"
07:56 mikecmpbll joined #git
07:56 selckin everywhere, but i don't expect a way, just wanna rant about them still not pushing after years of git
07:56 tobiasvl hehe
07:57 osse better to have them push too seldom than push too soon
07:57 tobiasvl yeah, hooks are always local because of security issues
07:58 marianina8 joined #git
08:00 alexandre9099 joined #git
08:01 knitt1 joined #git
08:01 robattila256 joined #git
08:01 timewalker joined #git
08:01 a_thakur joined #git
08:01 saidelike_ joined #git
08:02 matthiaskrgr joined #git
08:02 Neico joined #git
08:04 Kulrak joined #git
08:04 Kulrak joined #git
08:05 jaziz joined #git
08:05 Guest99195 joined #git
08:05 Guest99195 joined #git
08:06 fakenerd joined #git
08:07 dwts joined #git
08:07 ErkiDerLoony joined #git
08:08 Knirch joined #git
08:10 JeroenT joined #git
08:11 bilal joined #git
08:12 marcogmonteiro joined #git
08:15 JeroenT joined #git
08:17 otiose joined #git
08:20 Snugglebash joined #git
08:23 JeroenT joined #git
08:28 arecaceae joined #git
08:28 pbandark joined #git
08:29 FuzzyWuzzyPanda joined #git
08:29 masuberu joined #git
08:29 ruskie joined #git
08:30 nioncode joined #git
08:32 Noldorin joined #git
08:32 i7c joined #git
08:34 cstratak joined #git
08:36 dvaske joined #git
08:36 vrach joined #git
08:36 MattMaker joined #git
08:38 qswz joined #git
08:38 qswz I fear that using git tags (releasing one every week or ewice a week) isn't really good, because it make a zip of the code every time?
08:39 RichiH qswz: github does this
08:39 RichiH you don't have to
08:40 qswz ah,only github
08:40 RichiH so it's their problem, not yours
08:40 Cabanossi joined #git
08:40 qswz ah,only github, I wish I could deactivate it there
08:40 qswz ok thanks
08:40 Mogget_ joined #git
08:41 kurkale6ka joined #git
08:41 osse qswz: I think the zips are made on demand. you can download zips of any commit
08:41 tobiasvl github probably generates the zip file on demand
08:41 tobiasvl yes
08:41 qswz ah what I thought but wasn't sure, great
08:41 qswz ok good
08:42 kurkale6ka joined #git
08:42 Mogget joined #git
08:48 borkr joined #git
08:49 Mogget joined #git
08:52 tvw joined #git
08:56 visual_ left #git
08:56 visual joined #git
08:56 visual hey
08:56 visual why was 'visual_' banned?
08:57 visual was it a znc auto-connect issue?
08:57 Introoter joined #git
08:58 a_thakur_ joined #git
09:02 roelmonn_ joined #git
09:03 netroxen joined #git
09:03 chandu20 joined #git
09:03 YuGiOhJCJ joined #git
09:06 nadley joined #git
09:07 cstratak joined #git
09:10 stfn joined #git
09:11 sarri joined #git
09:11 sarri joined #git
09:12 MineCoins joined #git
09:13 Velizar joined #git
09:15 Velizar When I'm implementing new features, I often notice refactoring I can do to the existing codebase, not relevant to the new features. It is tempting to do the refactoring in the same commit, even though they are unrelated; and I don't feel that small refactoring it deserves a separate commit. What is the correct approach here?
09:16 i7c Whatever works for you/your team. :P I would make a separate commit. A commit represents a single logical change for me.
09:16 lmatteis joined #git
09:19 chll_ joined #git
09:22 Tobbi joined #git
09:22 netroxen joined #git
09:23 _ikke_ visual: It's most like that visual_ was not registered
09:24 _ikke_ visual: You cannot switch to or from an unregistered nick when you are in a channel that requires registered nicks
09:24 _ikke_ giving the banned message
09:24 ertes joined #git
09:25 Cabanossi joined #git
09:25 visual huh, makes sense
09:25 visual thanks
09:25 kbeflo joined #git
09:25 _ikke_ you can use nickserv though to go back
09:26 clmsy joined #git
09:26 ToBeCloud joined #git
09:27 dvaske_ joined #git
09:30 earnestly joined #git
09:31 i7c Configure SASL :)
09:32 _ikke_ I have done that, but it's apparently not working always
09:33 Raging_Hog joined #git
09:33 Acerific joined #git
09:33 Acerific joined #git
09:36 roelmonnens joined #git
09:36 marianina8 joined #git
09:38 mindfart joined #git
09:39 crankslider joined #git
09:42 romank joined #git
09:44 ams__ joined #git
09:45 [diecast] joined #git
09:45 Impaloo joined #git
09:45 fcrick joined #git
09:45 johtso joined #git
09:46 mroth joined #git
09:46 XDS2010 joined #git
09:46 jagob joined #git
09:46 bcardarella joined #git
09:50 bdeferme joined #git
09:50 Onionnion joined #git
09:50 jtoy joined #git
09:51 noctux joined #git
09:51 contracode joined #git
09:53 nezZario joined #git
09:53 notebox joined #git
09:54 cmosguy joined #git
09:55 jackrandom joined #git
09:56 sfan786_ joined #git
09:56 codedmart joined #git
09:56 Captain_Beezay joined #git
09:56 aleb joined #git
09:57 dbedrenko joined #git
09:58 belak joined #git
09:59 dbedrenko Hello everyone, if I'm solving merge conflicts, is there a way to tell git for a single file to force all the changes of the conflicted code from the merge branch, and discard from the target branch?
10:00 JimDungo joined #git
10:00 osse no
10:00 aavrug joined #git
10:00 osse but you can easily take the whole from from the merge branch, *including* the parts that had changes but not conflicting ones
10:02 aavrug joined #git
10:02 dbedrenko osse: That won't work for me. I have some files where I need to manually solve the conflict, but other big files of generated code I'd like to force from the merge branch to solve the conflicted parts only.
10:02 dbedrenko Seems like a pretty useful feature to have... who wants to manually delete all the <<< ==== >>>> in a big file. Thanks for letting me know this doesn't exist though,
10:03 osse i bet you can google your way to some scripts that keep what you want
10:03 osse shouldn't be too hard to script
10:03 jackrandom joined #git
10:03 Altiare joined #git
10:03 osse couple of lines of awk should do the trick
10:03 osse or a macro in vim ;)
10:04 dbedrenko haha yes, with a macro it's easy pie, you're right. Thanks
10:04 dbedrenko osse: "but you can easily take the whole from from the merge branch, *including* the parts that had changes but not conflicting ones" could you tell me the command for this? I think it might be applicaple
10:05 osse dbedrenko: git checkout --theirs/ours filename
10:05 dbedrenko many thanks
10:05 tymczenko joined #git
10:06 m4sk1n joined #git
10:07 bernd27 joined #git
10:10 scoobertron joined #git
10:11 mar77i joined #git
10:12 dtype joined #git
10:13 ferr joined #git
10:13 vcoinminer joined #git
10:14 sz0 joined #git
10:14 navidr joined #git
10:14 Nilesh_ joined #git
10:14 qswz much grateful
10:16 graingert joined #git
10:16 timwis joined #git
10:16 lolmac joined #git
10:17 brent__ joined #git
10:17 raynold joined #git
10:18 otiose joined #git
10:18 plasticle joined #git
10:18 rudrab joined #git
10:22 Ryanar joined #git
10:23 theoceaniscool joined #git
10:28 Impaloo joined #git
10:31 barbos joined #git
10:32 Cerebr0 joined #git
10:35 masuberu joined #git
10:35 Murii joined #git
10:36 waveclaw joined #git
10:38 raijin joined #git
10:38 chardan joined #git
10:41 AndreaACME joined #git
10:42 AndreaACME Hi
10:42 gitinfo AndreaACME: 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.
10:43 AndreaACME GIT noob ...
10:43 AndreaACME Any help available?
10:43 bremner !ask
10:43 gitinfo Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.
10:43 chardan joined #git
10:44 murii_ joined #git
10:45 IRQ` joined #git
10:46 AndreaACME I'm on GIT server and trying to add files to start tracking an ongoing (but not yet tracked) project
10:47 bremner what does "on git server" mean?
10:47 AndreaACME It worked (I think) but on "cvs status" I get :
10:47 AndreaACME # On branch master nothing to commit, working directory clean
10:47 tobiasvl cvs?
10:47 AndreaACME Server hosting GIT
10:48 AndreaACME ops .... git (not cvs)
10:48 AndreaACME (we also have cvs)
10:48 dbedrenko do you have a question?
10:48 User458764 joined #git
10:49 tocky joined #git
10:49 tobiasvl there's nothing to commit, the working directory is clean
10:49 AndreaACME @dbed  just trying to setup the Repo and download it from clean machine
10:49 AndreaACME @tob  I have files in there, how can it be clean?
10:50 osse AndreaACME: clean as in "not dirty"
10:50 osse not clean as in "empty"
10:50 AndreaACME ooohhhhh
10:50 tobiasvl AndreaACME: if you drop the @ and press "tab" after typing the first characters of our nicks, it autocompletes and notifies us
10:50 dreamseeker joined #git
10:50 tymczenko joined #git
10:51 AndreaACME so my files are there?   in the new Repo?
10:51 AndreaACME how can I tell?
10:51 AndreaACME Just by the mere fact that they are in the filesystem?
10:51 jtoy joined #git
10:51 osse 'git ls-files'
10:51 AndreaACME and they have the .git  directory?
10:52 AndreaACME cool!
10:52 AndreaACME it works
10:52 bauruine joined #git
10:52 AndreaACME Ok so now from a remote server (empty one), can I checkout the Repo?
10:52 osse git clone
10:53 AndreaACME git checkout root@10.200.0.2://mnt/GitHome/DISTRO/M6S
10:53 AndreaACME doesn't seem to work
10:53 dglambert joined #git
10:53 dglambert yo
10:53 tobiasvl AndreaACME: osse said "git clone", not "git checkout"
10:54 MineCoins joined #git
10:54 Cerebr0 git clone is to copy the entire version of the main directory of the project in your computer right ?
10:54 AndreaACME why the clone?   doesn't that copy all the Repo with details and changes?
10:54 venmx joined #git
10:54 AndreaACME hmmm
10:55 tobiasvl AndreaACME: correct
10:55 Cabanossi joined #git
10:55 AndreaACME fatal: destination path 'M6S' already exists and is not an empty directory.
10:56 tobiasvl AndreaACME: as it says, you can only clone into an empty directory
10:56 AndreaACME Ok, i deleted .... and try again ....
10:56 AndreaACME Initialized empty Git repository in /root/M6S/.git/
10:56 AndreaACME fatal: I don't handle protocol 'root@10.200.0.2'
10:56 courrier joined #git
10:57 osse I think the double / is wrong
10:57 AndreaACME SSH is a valid protocol?
10:57 AndreaACME aaahh
10:57 tobiasvl ssh is a valid protocol
10:58 gnixev joined #git
10:58 ssarah joined #git
11:00 barbos joined #git
11:00 thiago joined #git
11:01 notebox joined #git
11:01 rominronin joined #git
11:02 Raging_Hog joined #git
11:02 AndreaACME osse: NAILED it,  it downloaded the whole load
11:02 AndreaACME Tnx
11:03 Murii joined #git
11:05 AlkindiX joined #git
11:06 ertes joined #git
11:07 LabXse joined #git
11:09 tocky joined #git
11:09 AndreaACME Is it true that I now effectively have 2 working Repos?   One on the server and another on the empty machine (that now has the git clone)?
11:09 panza joined #git
11:11 osse yes
11:12 thiago joined #git
11:12 Guest7367 joined #git
11:15 qswz left #git
11:17 AndreaACME and both can be updated simultaneously and GIT will handle versioning?
11:17 AndreaACME update and commit should be used, correct?
11:19 gottcha joined #git
11:20 s17 commit and push
11:20 AndreaACME Oh
11:21 mar77i joined #git
11:22 thiago joined #git
11:23 AndreaACME Do I have to setup this sync or is it automatic with the push?
11:24 AndreaACME Do I have to setup on both servers this sync or is it automatic with the push?
11:25 ivanruizmonjo_ joined #git
11:25 bomb-on joined #git
11:26 AndreaACME It is quite different from CVS (which I just left behind)
11:27 Vampire0 AndreaACME, do you mean you have one bare repo and two clones and your question is whether the second clone is updated automatically if you push from one clone to the bare repo?
11:27 AndreaACME Are there any good comprehensive VideoTutorials I can watch?
11:27 AlkindiX joined #git
11:27 AndreaACME Vampire0: yes, that is what I mean
11:27 AndreaACME I'm still new to this bare, non bare thing
11:28 BSaboia joined #git
11:29 JeroenT_ joined #git
11:29 Vampire0 Nope, it will not. The bare repo knows nothing about its clones, so the clones cannot be updated automatically.
11:29 lindenle joined #git
11:29 Vampire0 AndreaACME, do you try to automatically deploy something on push? Then read !deploy
11:29 gitinfo AndreaACME: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
11:30 AndreaACME Tnx for the tips
11:30 AndreaACME Will read
11:31 Vampire0 AndreaACME, yw
11:31 gitinfo AndreaACME: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
11:31 kbeflo joined #git
11:32 thiago joined #git
11:32 kbeflo joined #git
11:32 AndreaACME .karma Vampire0
11:32 gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 34 (2 in past 30 days) (4 given out)
11:33 AndreaACME .karma osse
11:33 gitinfo the Genuine Real Life Karma™ REST API results are back! o‍sse: 274 (3 in past 30 days) (6 given out)
11:33 Vampire0 AndreaACME, regarding videos, you can look at !intro and !video and also https://www.youtube.com/watch?v=1ffBJ4sVUb4 which I like personally as a starter
11:33 gitinfo AndreaACME: [!IntroToGit] Randal Schwartz has an introduction to git video http://vimeo.com/35778382 and slides http://www.slideshare.net/RandalSchwartz/introduction-to-git-11451326
11:33 gitinfo AndreaACME: [!talks] Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jessica Kerr: Git basics, descriptional)
11:34 dreamseeker joined #git
11:35 AndreaACME !video
11:35 gitinfo [!talks] Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jessica Kerr: Git basics, descriptional)
11:35 AndreaACME .karma gitinfo
11:35 gitinfo the Genuine Real Life Karma™ REST API results are back! g‍itinfo: 31 (0 in past 30 days)
11:37 matoro joined #git
11:38 AlkindiX joined #git
11:39 DomeMasterYolo17 joined #git
11:41 Tobbi joined #git
11:41 SlashLife joined #git
11:44 King_Hual joined #git
11:44 King_Hual joined #git
11:46 User458764 joined #git
11:47 a_thakur joined #git
11:47 marianina8 joined #git
11:48 G1eb joined #git
11:49 blackwind_123 joined #git
11:49 G1eb hi, is it possible to make a git-archive include stuff thats not committed yet?
11:49 G1eb i know this sounds stupid, humor me :p
11:50 _ikke_ nope, not really
11:51 Raging_Hog joined #git
11:51 _ikke_ Would you could do is stage the changes and create a tree object out of it
11:51 _ikke_ then you cuold do it
11:51 Vampire0 G1eb, no, this is not possible. You give git archive a tree-ish and that tree-ish is exported. If you want to include not-committed stuff, you need to commit it first and then use that commit
11:51 mar77i joined #git
11:51 Vampire0 G1eb, but then you can probably also simply zip up your worktree excluding the .git folder
11:52 _ikke_ Vampire0: That would also get you ignored files (and export ignored files)
11:52 jtoy joined #git
11:53 scottjl_ joined #git
11:53 Vampire0 _ikke_, sure, so heavily depens on what exactly should land in the archive. :-)
11:53 Vampire0 s/depens/depends/
11:54 peacememories joined #git
11:55 livingstn joined #git
11:56 Vampire0 _ikke_, G1eb, stashing the changes and using "stash" as tree-ish for git archive should also work, shouldn't it?
11:58 fakenerd joined #git
12:00 thiago joined #git
12:00 tribly joined #git
12:01 Raging_Hog joined #git
12:01 livingstn joined #git
12:02 ferr joined #git
12:03 ankit01ojha joined #git
12:04 hvxgr joined #git
12:07 scottjl joined #git
12:07 gableroux joined #git
12:08 tribly joined #git
12:08 Chuguniy joined #git
12:09 peacememories joined #git
12:09 a_thakur joined #git
12:09 kbeflo_ joined #git
12:09 dsdeiz joined #git
12:09 gableroux joined #git
12:10 Cabanossi joined #git
12:11 gableroux joined #git
12:17 brent__ joined #git
12:18 _ikke_ Vampire0: Yeah, I would think so
12:19 otiose joined #git
12:19 murii_ joined #git
12:19 ShapeShifter499 joined #git
12:20 User458764 joined #git
12:23 kurkale6ka joined #git
12:24 Altiare joined #git
12:24 Murii joined #git
12:29 HardlySeen joined #git
12:29 Ryanar joined #git
12:29 hnhnhnhn joined #git
12:31 d10n-work joined #git
12:32 JeroenT joined #git
12:32 ronskisika joined #git
12:33 gableroux joined #git
12:36 chandu20 joined #git
12:38 ian joined #git
12:39 MattMaker joined #git
12:41 G1eb Vampire0, _ikke_ sorry I zoned out for a second there
12:41 G1eb _ikke_, how would staging the changes add them to the tree-ish structure?
12:42 gableroux joined #git
12:42 G1eb i mean, would you be able to reference the tree including the staged changes for git-archive?
12:42 Murii joined #git
12:43 G1eb Vampire0, yeah i dont want to include ignored files and .git folder
12:44 Stumbler joined #git
12:45 brent__ joined #git
12:45 AbleBacon_ joined #git
12:48 _ikke_ G1eb: git stash creates complete commits to store the working tree state
12:49 jeffreylevesque joined #git
12:50 G1eb _ikke_, im sorry do you mean stash or stage? im confused ._.
12:52 imaginary left #git
12:53 marcogmonteiro joined #git
12:54 XenophonF joined #git
12:54 AbleBacon_ joined #git
12:55 Raging_Hog joined #git
12:55 Cabanossi joined #git
12:55 alexandre9099 joined #git
12:56 TheSimonator joined #git
12:57 livingstn joined #git
13:02 cdown joined #git
13:02 tymczenko joined #git
13:02 mar77i_ joined #git
13:03 JeroenT joined #git
13:05 tocky joined #git
13:05 Sound joined #git
13:05 Sound joined #git
13:05 tocky joined #git
13:06 ExoUNX joined #git
13:10 gableroux joined #git
13:10 jameser joined #git
13:11 ertes joined #git
13:12 cdg joined #git
13:12 AbleBacon_ joined #git
13:14 dermoth joined #git
13:14 TheSimonator joined #git
13:15 Dougie187 joined #git
13:15 circ-user-3LMm1 joined #git
13:16 gableroux joined #git
13:17 gaucheph joined #git
13:18 sonOfRa joined #git
13:18 mjuszczak joined #git
13:19 mjuszczak joined #git
13:20 bsanford joined #git
13:20 snowkidind joined #git
13:20 Vampire0 G1eb, if you stash your changes, Git technically creates two commits that you can reference with `stash`, so this is usable as tree-ish so you can give it to git-archive
13:21 TheSimonator joined #git
13:21 Vampire0 G1eb, stash the changes you want to include, then call git-archive with `stash` as tree-ish and your stashed changes should be included in the produced artefact
13:22 theoceaniscool joined #git
13:23 di0_ joined #git
13:24 ppang joined #git
13:24 jameser joined #git
13:25 _ikke_ G1eb: with git write-tree, you can create a tree object from the index
13:25 _ikke_ G1eb: Which you should be able to export
13:25 Cabanossi joined #git
13:25 Orphis joined #git
13:28 Stumbler_ joined #git
13:29 ian joined #git
13:29 Stumbler joined #git
13:30 linuxmodder- joined #git
13:31 peacememories joined #git
13:32 notebox joined #git
13:32 mniip joined #git
13:34 livingstn joined #git
13:40 bilal_ joined #git
13:41 aax joined #git
13:41 a_thakur joined #git
13:42 publio joined #git
13:43 fahadash joined #git
13:45 timvisher joined #git
13:47 _Vi joined #git
13:48 gugah joined #git
13:49 otiose joined #git
13:50 marcogmonteiro joined #git
13:53 Stumbler_ joined #git
13:54 Shock_ joined #git
13:54 felixsanz_ left #git
13:57 Es0teric joined #git
13:59 Jackneill hey
14:00 Jackneill how can i undo the latest commit? not the changes just the commit, i have accidentally added more files to it than needed
14:01 Dougie187 Jackneill: `git reset HEAD^`
14:02 awc737 joined #git
14:03 rkazak joined #git
14:03 Jackneill thanks
14:04 a_thakur joined #git
14:04 agileadam joined #git
14:05 AaronMT joined #git
14:06 ExoUNX joined #git
14:06 Cavallari joined #git
14:08 tcorneli joined #git
14:09 felixsanz joined #git
14:10 jagob joined #git
14:11 LeBlaaanc joined #git
14:11 ResidentBiscuit joined #git
14:13 Cavallari joined #git
14:13 gablerou_ joined #git
14:13 agileadam joined #git
14:14 hust921 joined #git
14:16 felixsanz joined #git
14:16 bilal_ joined #git
14:17 h12o joined #git
14:17 madprops joined #git
14:18 madprops hi
14:18 madprops anyone knows where this error is from? "fatal: unable to set up default path; use --file"
14:18 madprops it happens on git pull
14:19 madprops on a php script (apache)
14:19 chandu20 joined #git
14:20 Stumbler joined #git
14:21 bilal joined #git
14:21 shgysk8zer0 joined #git
14:21 livingstn joined #git
14:21 nanga joined #git
14:21 nanga joined #git
14:22 chubek_ joined #git
14:22 felixsanz joined #git
14:22 np31o0 joined #git
14:23 np31o0 left #git
14:23 np31o0 joined #git
14:23 np31o0 left #git
14:23 skre4 joined #git
14:23 bsanford joined #git
14:23 felixsanz joined #git
14:23 sunri5e joined #git
14:24 JeroenT_ joined #git
14:24 bilal joined #git
14:24 Domhack joined #git
14:24 felixsanz joined #git
14:25 sondr3 joined #git
14:25 Cabanossi joined #git
14:26 felixsanz joined #git
14:27 wcstok joined #git
14:29 User458764 joined #git
14:29 netroxen joined #git
14:29 Guest66324 joined #git
14:30 hashpuppy joined #git
14:31 BSAlb joined #git
14:31 aboccia joined #git
14:32 dsdeiz joined #git
14:32 dsdeiz joined #git
14:33 mikecmpb_ joined #git
14:35 borkr joined #git
14:35 rominronin joined #git
14:36 kpease joined #git
14:36 pzp joined #git
14:36 osse madprops: git config perhaps. set GIT_TRACE=1 in the environment and try again
14:37 iffraff joined #git
14:38 madprops osse, same error, nothing changed. i think this is www-data running it, should i create a git config for that user or something?
14:38 Stumbler_ joined #git
14:39 tarkus joined #git
14:40 MattMaker joined #git
14:40 felixsanz joined #git
14:41 roelmonnens joined #git
14:41 BSab joined #git
14:41 Garen joined #git
14:42 sathed_ joined #git
14:42 phase3 joined #git
14:43 Grievre joined #git
14:43 Shakeel_ joined #git
14:43 AbleBacon_ joined #git
14:44 naf joined #git
14:44 felixsanz joined #git
14:45 TikityTik joined #git
14:45 boshhead joined #git
14:45 frankkahle joined #git
14:45 Persikka joined #git
14:45 hotpancakes joined #git
14:45 Onionnion joined #git
14:45 tijensse joined #git
14:45 thesquib joined #git
14:45 kevr joined #git
14:45 cjohnson joined #git
14:45 BorkStick joined #git
14:45 wwalker joined #git
14:46 esc joined #git
14:46 esc joined #git
14:46 lus joined #git
14:46 JimDungo joined #git
14:46 fuchstronaut joined #git
14:46 ec\ joined #git
14:46 dersand joined #git
14:46 brandonw_ joined #git
14:46 madduck joined #git
14:46 nkuttler joined #git
14:46 pigeon joined #git
14:46 Cthalupa joined #git
14:47 cebor joined #git
14:47 d1b joined #git
14:47 SReject joined #git
14:47 SReject joined #git
14:47 belak joined #git
14:47 nezZario joined #git
14:47 ome joined #git
14:47 noodle joined #git
14:47 marcogmonteiro joined #git
14:47 Nilesh_ joined #git
14:48 axisys joined #git
14:48 vcoinminer joined #git
14:48 notebox joined #git
14:48 ariver joined #git
14:48 tier2villain_ joined #git
14:48 Hello71 joined #git
14:48 sim590 joined #git
14:48 tureba joined #git
14:48 lolmac joined #git
14:49 kireevco joined #git
14:49 kiltzman joined #git
14:49 dreiss joined #git
14:49 zero85 joined #git
14:49 m0ltar joined #git
14:49 hide joined #git
14:49 cmosguy joined #git
14:49 whitby joined #git
14:49 uidzer0 joined #git
14:49 Vorisi joined #git
14:49 AlgorithmWizard joined #git
14:49 exotime joined #git
14:49 spacemud joined #git
14:49 dtype joined #git
14:50 abh joined #git
14:50 rwb joined #git
14:50 jtoy joined #git
14:50 sfan786_ joined #git
14:50 shgysk8zer0 joined #git
14:50 jakesyl_mobile joined #git
14:50 worstadmin joined #git
14:51 altendky joined #git
14:51 justinmrkva joined #git
14:51 aleb joined #git
14:51 Captain_Beezay joined #git
14:51 dvaske joined #git
14:52 mattp__ joined #git
14:52 Sigma joined #git
14:52 a_thakur joined #git
14:52 caliculk joined #git
14:52 dvaske_ joined #git
14:52 Ankhers joined #git
14:52 AbleBacon_ joined #git
14:52 a_thakur joined #git
14:52 AndrewGazelka joined #git
14:53 zmachine joined #git
14:53 thecomedian joined #git
14:53 quotemstr joined #git
14:53 shakalaka joined #git
14:53 loglaunch joined #git
14:53 dsantiago joined #git
14:53 gableroux joined #git
14:54 t-richards joined #git
14:54 iota_pi joined #git
14:54 mmattice joined #git
14:55 planigan joined #git
14:55 rokups joined #git
14:55 BenderRodriguez joined #git
14:55 ExoUNX_ joined #git
14:56 roelmonnens joined #git
14:56 rscata joined #git
14:56 svm_invictvs joined #git
14:56 f0rks joined #git
14:56 tsunamie joined #git
14:56 bgerber joined #git
14:56 aielima joined #git
14:56 lohfu joined #git
14:56 Ekho joined #git
14:57 codedmart joined #git
14:57 ExoUNX__ joined #git
14:57 lewix joined #git
14:57 robogoat joined #git
14:58 zivester joined #git
14:58 Jackneill joined #git
14:58 eroux joined #git
14:59 NvpkD1y7Ez joined #git
14:59 Chicago joined #git
15:00 dvaske joined #git
15:01 Wulf joined #git
15:01 relipse joined #git
15:01 apotry joined #git
15:01 relipse For some reason master is ahead of origin/master, how do I reset my master branch back to origin/master and to be in sync?
15:02 zeroed joined #git
15:02 zeroed joined #git
15:02 durham joined #git
15:02 cust joined #git
15:02 Whisket joined #git
15:03 felixsanz joined #git
15:03 AndreaACME Thanks Vampire0
15:03 AndreaACME Thanks osse
15:03 AndreaACME Thanks gitinfo
15:03 gitinfo AndreaACME: you're welcome, but please note that I'm a bot. I'm not programmed to care.
15:03 cstratak joined #git
15:04 sebhoss joined #git
15:05 huhlig joined #git
15:05 pfg joined #git
15:06 roelmonn_ joined #git
15:06 dilijev joined #git
15:07 tharuin joined #git
15:07 manveru joined #git
15:07 bbhoss joined #git
15:08 unholycrab joined #git
15:08 kwmiebach___ joined #git
15:09 marianina8 joined #git
15:10 threecleartones joined #git
15:10 GT4066 joined #git
15:12 tubal joined #git
15:12 threecleartones joined #git
15:13 al-damiri joined #git
15:14 duderonomy joined #git
15:15 mikecmpbll joined #git
15:15 threecleartones joined #git
15:16 stutter joined #git
15:16 cstratak joined #git
15:16 a_thakur joined #git
15:18 tymczenko joined #git
15:21 MissionCritical joined #git
15:21 ExoUNX joined #git
15:22 AndreaACME How cold of you
15:25 Cabanossi joined #git
15:25 hailhydra left #git
15:25 LionsMane joined #git
15:25 _ikke_ !botsnack
15:25 gitinfo Om nom nom
15:31 a_thakur joined #git
15:31 gableroux joined #git
15:33 bitmod joined #git
15:35 circ-user-3LMm1 left #git
15:35 brent__ joined #git
15:36 scarabx joined #git
15:36 lindenle joined #git
15:36 AndreaACME !help
15:36 gitinfo What do you need help with? Something with git? Tell us what's going on, and please be specific. For information on how to abuse me (I'm a bot!), see https://gitirc.eu/bot . Please be gentle.
15:37 brent__ joined #git
15:37 TheSimonator joined #git
15:38 gableroux joined #git
15:39 AndreaACME !gremlins
15:39 gitinfo [!weasels] The consequences of this proposal are not well-defined. A band of furious weasels may infest your undergarments, or it might work just fine. You should !backup then !tryit and let us know what happens.
15:44 madewokherd joined #git
15:45 masuberu joined #git
15:45 hust921 joined #git
15:46 BSaboia joined #git
15:46 gableroux joined #git
15:46 sonOfRa joined #git
15:47 gableroux joined #git
15:48 BSAlb joined #git
15:48 peacememories joined #git
15:49 neunon joined #git
15:52 durham joined #git
15:52 peacememories joined #git
15:53 Starky joined #git
15:56 rkazak joined #git
15:57 cagomez joined #git
15:57 robertparkerx joined #git
15:57 peepsalot joined #git
15:58 cagomez joined #git
15:58 gableroux joined #git
15:58 cagomez joined #git
16:01 hobodave joined #git
16:02 apotry joined #git
16:03 LeBlaaanc joined #git
16:03 TheSimonator joined #git
16:04 s17 !tryit
16:04 gitinfo [!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.
16:05 s17 mmhmm
16:05 hotpancakes joined #git
16:08 theoceaniscool joined #git
16:09 mel00010 joined #git
16:10 lacrymology joined #git
16:10 tnecniv joined #git
16:10 tnecniv joined #git
16:10 kristofferR joined #git
16:11 slidercrank joined #git
16:11 lacrymology does anyone have a nice alias for deleting a list of branches local AND remotely?
16:11 lacrymology like `git branch -d ${list of branches} && git push origin :b1 :b2...:bn`
16:12 regedit joined #git
16:13 m4sk1n joined #git
16:13 indistylo joined #git
16:13 M6HZ joined #git
16:14 kusznir joined #git
16:15 lacrymology I just found git-extras
16:16 elect_ joined #git
16:16 tlaxkit joined #git
16:16 nixjdm joined #git
16:16 maarhart_ joined #git
16:17 awc737 joined #git
16:17 tymczenko joined #git
16:17 tnecniv joined #git
16:19 jnewt_ joined #git
16:22 blipz left #git
16:22 kpease joined #git
16:23 boombatower joined #git
16:24 tnecniv joined #git
16:26 ertes joined #git
16:26 howitdo joined #git
16:26 howitdo joined #git
16:27 roelmonnens joined #git
16:29 neunon joined #git
16:29 svm_invictvs joined #git
16:31 aspiers joined #git
16:32 Levex joined #git
16:33 BSab joined #git
16:33 TheSimonator joined #git
16:33 LionsMane1 joined #git
16:34 Gustavo6046 joined #git
16:34 gordonfish joined #git
16:36 BSaboia joined #git
16:36 rominronin joined #git
16:39 agileadam joined #git
16:40 wcstok joined #git
16:41 kpease joined #git
16:42 gableroux joined #git
16:42 courrier_ joined #git
16:43 dviola joined #git
16:43 dviola left #git
16:43 raspado joined #git
16:44 roelmonnens joined #git
16:45 phtes joined #git
16:47 Stumbler joined #git
16:47 brent__ joined #git
16:48 hotpancakes joined #git
16:49 awc737 joined #git
16:50 roelmonnens joined #git
16:50 Sleepy63 joined #git
16:51 SteffanW joined #git
16:52 MarioBranco joined #git
16:55 Cabanossi joined #git
16:55 oskarkv joined #git
16:57 dreiss joined #git
16:59 felixsanz joined #git
17:00 cebor joined #git
17:02 jackrandom joined #git
17:02 h12o joined #git
17:03 nitric joined #git
17:03 cdg joined #git
17:05 kent\n joined #git
17:05 pks joined #git
17:06 Snugglebash joined #git
17:06 ShapeShifter499 joined #git
17:06 gnixev joined #git
17:08 tyreld joined #git
17:09 hotpancakes joined #git
17:11 Maxxed joined #git
17:12 hotpanca_ joined #git
17:12 tristanp joined #git
17:13 AbleBacon_ joined #git
17:13 freimatz joined #git
17:13 gableroux joined #git
17:18 JanC joined #git
17:19 gablerou_ joined #git
17:21 thebishop joined #git
17:21 thebishop hi all, is there any kind of macro i can place in a file to force git commit to fail?
17:21 thebishop like basically as a reminder to remove some sensitive code/data?
17:21 chandu20 joined #git
17:22 gnixev joined #git
17:22 j416 thebishop: that sounds like a workaround for a broken workflow
17:22 ayogi joined #git
17:22 thebishop j416, fair ;) so it doesn't exist?
17:22 j416 thebishop: can you not not track the file to begin with?
17:22 j416 thebishop: not that I know of
17:22 _ikke_ thebishop: git pre-commit hook
17:22 TheSimonator joined #git
17:22 _ikke_ man githooks
17:22 gitinfo the githooks manpage is available at https://gitirc.eu/githooks.html
17:23 j416 that, yeah
17:23 j416 true
17:23 j416 still though.. workflow :/
17:24 thebishop i take the workflow point, but also, just let me.
17:24 j416 nod
17:24 j416 I second _ikke_'s suggestion; seems like the easiest
17:24 j416 have a script that checks file contents and prevents the commit if it's wrong
17:26 thebishop _ikke_, thanks
17:28 lyxus joined #git
17:28 LeBlaaanc joined #git
17:31 rkazak joined #git
17:33 User458764 joined #git
17:34 dvaske joined #git
17:34 Cassiopaya joined #git
17:35 jstimm joined #git
17:35 Timvde Is it possible to fetch a commit that is not attached to any branch anymore?
17:35 tang^ if git hasn't garbage collected it, probably
17:36 ojacobson It's possible, with a little sleight-of-hand, to construct a ref to an object you don't actually have, and then to push and re-fetch that ref
17:36 Timvde tang^: I added the repository as a remote, fetched it, but it only updated the master branch (there are no other branches atm, but probably it fetched all tracked branches)
17:36 mikecmpbll joined #git
17:36 sunri5e joined #git
17:36 ojacobson reachability is not a security feature
17:37 Timvde Btw, I already fixed it by creating a patch and applying it locally, I'm just curious :P
17:37 rominronin joined #git
17:38 NeXTSUN joined #git
17:38 Timvde ojacobson: I'm not sure what you mean (i.e. I can't reproduce based on the information you gave). Could you elaborate?
17:38 g6012 joined #git
17:39 YuGiOhJCJ joined #git
17:40 Levex joined #git
17:40 alfredocambera joined #git
17:40 alfredocambera hello everybody :D
17:41 j416 Timvde: you cannot fetch an object that has no reference (a branch, tag, etc.), but if you know the object hash you might be able to craft a reference, push that, and then fetch
17:41 j416 Timvde: I've never done this, but I suppose ojacobson has verified that it works
17:41 ojacobson Not in a while
17:41 bernd27 joined #git
17:42 j416 Timvde: but if you had that commit locally and just removed the branch, you can still access it
17:42 dsdeiz joined #git
17:42 dsdeiz joined #git
17:42 j416 Timvde: (unless it has been a while and it has already been garbage collected)
17:42 hotpancakes joined #git
17:43 j416 Timvde: (perhaps you know this)
17:43 agileadam joined #git
17:44 relipse joined #git
17:46 ExoUNX joined #git
17:47 hotpancakes joined #git
17:49 jmesmon joined #git
17:51 cagomez does `git reset hard` ignore files that are untracked by git? (eg not delete them)
17:51 Vampire0 cagomez, yes
17:52 bomb-on joined #git
17:52 Vampire0 cagomez, that would be `git clean`
17:52 dsdeiz joined #git
17:52 dsdeiz joined #git
17:52 cagomez Vampire0: ok ty
17:52 BSAlb joined #git
17:52 hotpancakes joined #git
17:54 romank joined #git
17:58 gugah joined #git
17:58 relipse__ joined #git
17:58 dead joined #git
18:00 dead So I have a 'rpm' directory and I want to create a tarball from another directory using a makefile in the rpm directory. So I try: git archive -o archive.tar.gz master ../../BN/. but git reports error: fatal: current working directory is not tracked. The current working directory IS tracked, I don't understand this error?
18:00 dglambert joined #git
18:00 Motoko joined #git
18:00 roelmonnens joined #git
18:01 _ikke_ what does git ls-tree master ../../BN return?
18:02 mostlybadfly joined #git
18:02 dead nothing
18:02 mjuszcza_ joined #git
18:02 duderonomy joined #git
18:03 _ikke_ and git ls-tree -r master :/ | grep BN
18:04 sonOfRa joined #git
18:04 diogenese joined #git
18:04 dead seems to return no output
18:04 dead even without the grep
18:05 dead uh.. ?
18:05 Sasazuka joined #git
18:05 cdg_ joined #git
18:06 dead i know the directories are in git, I can see them in git blame, or git log -p etc..?
18:06 ojacobson !transcript
18:06 gitinfo Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
18:06 _ikke_ git rev-parse --show-prefix
18:07 bilal joined #git
18:08 livingstn joined #git
18:09 dead transcript: http://sprunge.us/FjDK
18:09 Vampire0 dead, add to the transcript something that you think proves it is a worktree please
18:10 _ikke_ Vampire0: the rev-parse shows it
18:10 _ikke_ (and otherwise git already complained sooner)
18:10 _ikke_ would have*
18:11 _ikke_ dead: what branch are you currently on/
18:11 _ikke_ ?
18:11 _ng joined #git
18:13 dead im on branch: BNESS-6928-api-rpm
18:13 dead perhaps thats the issue?
18:13 Vampire0 ah, right, sorry
18:13 dead not master branch
18:14 _ikke_ dead: then you have to use that as a branch name
18:14 _ikke_ That directory might not exist on master
18:15 Vampire0 _ikke_, you mean the BN directory, don't you?
18:15 _ikke_ yes
18:15 maasha joined #git
18:15 Vampire0 _ikke_, so the error message is misleading, telling that the current directory is not a worktree
18:15 _ikke_ or any directory apparently :P
18:16 maasha evening
18:16 dead it does exist on master though...when I use the branch name I'm on now it says "../../BN is outside repository"
18:16 dead :(
18:16 Altiare joined #git
18:16 netj joined #git
18:16 ojacobson submodules
18:16 ojacobson submodules everywhere
18:16 _ikke_ Vampire0: it says current working directory is unracked
18:17 Vampire0 _ikke_, yes, but does this really refer to the current working directory, or does it refer to the ../../BN directory?
18:17 maasha I stuffed my git repo by adding a couple of large binary files a while back. I have tried to remove these with a filter-branch approach, but git status tells me to pull and then I am back to where I began.
18:17 dead new transcript showing taht: http://sprunge.us/hNjK
18:17 _ikke_ maasha: don't listen to git stats
18:17 _ikke_ status
18:18 maasha _ikke_: well, it sort of tells me the problem is not solved
18:18 _ikke_ maasha: when you pull, you merge in the old histor back in
18:18 _ikke_ history
18:18 maasha _ikke_: right, I am missing some step to avoid that
18:19 _ikke_ you would need to force push the new history to your remote (with all consequences)
18:19 bilal joined #git
18:20 maasha _ikke_: hm, is there a step-by-step guide somewhere_
18:20 maasha ?
18:20 Vampire0 maasha, first read and understand !rewrite
18:20 gitinfo maasha: 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
18:20 maasha Vampire0: luckily this is a small one-man project
18:21 _ikke_ maasha: git push --force-with-lease <remote> <branch>
18:21 bilal joined #git
18:22 _ikke_ dead: ls ../../BN/.git
18:22 preyalone joined #git
18:24 maasha _ikke_: soooo, that gives: ! [rejected]        master -> master (stale info)
18:24 Vgve joined #git
18:25 _ikke_ maasha: Right, so did you push something there that you don't have in your local repository?
18:25 alexandre9099 joined #git
18:25 dead _ikke_: doesn't exist
18:25 dead when i go into that directory im on the same branch, im pretty sure it's part of the same repo still.. heh
18:25 maasha _ikke_: lemmy get a fresh checkout - I have tried to many things ...
18:25 dead so weird
18:27 _ikke_ when you are in the root of your repository, does git ls-tree -r HEAD return something?
18:27 maasha _ikke_: so I have a fresh checkout (still with the large binary in history that I want to remove) - I used this command, ok? git filter-branch --tree-filter 'rm -f binaries/installer.exe' HEAD
18:28 _ikke_ Do you only have one branch with that file?
18:29 NonParity joined #git
18:30 dead ikonia: yes: http://sprunge.us/dBHa
18:30 _ikke_ So only BN is tracked
18:31 maasha _ikke_: yeah, it is on one branch
18:31 peacememories joined #git
18:32 vuoto joined #git
18:32 _ikke_ maasha: than that should work
18:32 Vampire0 maasha, while it should work, an index filter would be faster, as it does not need to maintain the worktree. The man git filter-branch has an example for exactly that
18:32 gitinfo maasha: the git-filter-branch manpage is available at https://gitirc.eu/git-filter-branch.html
18:33 dead ikonia: i grepped out BN/
18:34 _ikke_ so the "current working directory is untracked" message is comming from the archive command
18:34 dead yes
18:34 maasha _ikke_: Vampire0 I think it works now, testing ...
18:36 hotpancakes joined #git
18:36 maasha _ikke_: Vampire0 All fine. Thanks!
18:37 _ikke_ dead: so from the root of the repository, does git archive -o test.tar.gz HEAD BN work?
18:37 m0viefreak joined #git
18:37 dead yes
18:37 _Vi joined #git
18:37 AstralStorm joined #git
18:38 _ikke_ dead: what about git ls-tree HEAD rpms/bees-perl-common
18:39 bgerber joined #git
18:39 hotpanca_ joined #git
18:40 _ikke_ dead: I can repro the message
18:41 ToBeCloud joined #git
18:41 dead ikonia: yes that shows up also, from the root
18:41 kpease_ joined #git
18:41 dead err sorry
18:41 dead _ikke_: ^
18:41 _ikke_ :)
18:42 dead i think im just goign to modify my makefile to cd into that folder first, then do it
18:44 pks joined #git
18:48 mjuszczak joined #git
18:50 texasmynsted I have a file foo/bar.sh managed in a git repo.  It has a default value
18:50 _ikke_ default value?
18:50 texasmynsted I added a git ignore for it but when I change it locally it still "sees" the changes.
18:50 _ikke_ !ignore_tracked
18:50 gitinfo Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
18:50 texasmynsted it is a placeholder file for local modifications
18:51 texasmynsted You can't use ignore patterns to ignore changes to files that are already tracked by git.  :(
18:52 texasmynsted I see this "@tobiasvi: Neither .gitignore nor .git/info/exclude have any effect at all on already-tracked files, so that will do nothing."
18:52 SlashLife joined #git
18:52 dvaske_ joined #git
18:52 jaziz joined #git
18:52 gableroux joined #git
18:52 mda1 joined #git
18:52 MattMaker joined #git
18:53 gableroux joined #git
18:54 roelmonnens joined #git
18:55 texasmynsted wow
18:55 texasmynsted This is a feature I really want to have.
18:56 texasmynsted Be able to git ignore a tracked file
18:56 ojacobson Last time the discussion happened on the !list I believe the conlusion was a hard no
18:56 gitinfo [!mailing_list] The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git
18:56 ojacobson and to recommend the various strategies for keeping placeholders and non-versioned files separate
18:59 gableroux joined #git
19:01 bilal joined #git
19:01 kpease joined #git
19:02 misosoup joined #git
19:03 Acerific joined #git
19:04 LionsMane joined #git
19:04 TheSimonator joined #git
19:05 texasmynsted If I resolve a merge conflict and later find that I need changes from an older commit can I re-apply an old commit via cherry-pick or something?
19:06 jstein_ joined #git
19:08 roko joined #git
19:08 peepsalot joined #git
19:09 roko how do I merge two branches? The head of bug branch needs to be merged with master but before the head of master
19:10 hotpancakes joined #git
19:11 grawity that would involve rewriting part of master's history
19:12 tubal joined #git
19:12 grawity i.e. something like, 1) rewind master to the point where the merge needs to happen; 2) merge bugfix into it; 3) cherry-pick or something the commits you threw away in step 1
19:13 mikimau joined #git
19:13 mikimau left #git
19:13 grawity with all the downsides of !rewriting
19:13 gitinfo [!rewrite] 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
19:14 TbobbyZ joined #git
19:15 roko I checked out a branch with sha and it shows * (detached from cf1fad5). Renaming git branch does not work. How to rename?
19:16 Vampire0 roko, rename what?
19:16 grawity you checked out a commit, not a branch head
19:16 grawity so there's nothing to rename since you're not on a branch at all
19:16 Vampire0 roko, btw. if you checked out with sha, then you did not checkout a branch, but just the commit the branch is pointing to. See !zombie
19:16 gitinfo roko: Brainzz! More brainzzzz!  For information about detached heads, see !detached
19:17 roko Vampire0: got it
19:18 roko Vampire0: I got confused because it shows that I am working on a separate branch when I do git branch
19:18 phase3 joined #git
19:19 phase3 joined #git
19:20 yqt joined #git
19:21 grawity if you want to re-point master to this commit, you can a) git checkout -B master; or b) git checkout master && git reset --hard <commit>; or c) etc.
19:22 tymczenko joined #git
19:23 cagomez joined #git
19:24 texasmynsted how do I revert on file back one commit?
19:25 texasmynsted There is a shortcut like ^1 or something iirc
19:26 grawity git checkout myfile -- HEAD^
19:26 grawity `man gitrevisions`
19:26 gitinfo the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html
19:27 synthmeat joined #git
19:28 TheSimonator joined #git
19:28 overlord_tm joined #git
19:28 gableroux joined #git
19:28 marianina8 joined #git
19:29 bilal joined #git
19:29 marianina8 joined #git
19:29 texasmynsted hmm did not work
19:31 gableroux joined #git
19:32 invisbl_ joined #git
19:32 agileadam joined #git
19:33 texasmynsted so if I have a few files that I want the versions for a diff branch's version, how would I do thtat?
19:33 invisbl_ joined #git
19:34 texasmynsted I thought I could git reset —hard for a particular file
19:34 texasmynsted no
19:35 texasmynsted hmm git checout should be right
19:35 fission6 joined #git
19:36 fission6 my last commit has a file in the wrong place braking tests, before pushing i want to undo this commit and push the file to the right folder, whats my best course of action
19:36 grawity er, I got the parameters the wrong way around
19:36 texasmynsted other way around also does not work
19:38 cagomez joined #git
19:39 gableroux joined #git
19:39 venmx joined #git
19:40 bilal joined #git
19:42 AndreasLutro fission6: as long as you haven't pushed, fix the thing, then commit --amend to update the commit
19:42 a3Dman joined #git
19:42 fission6 AndreasLutro: ok i did git reset --hard HEAD^
19:43 fission6 i think your approach is a shortcut
19:43 AndreasLutro git reset means you lose the changes you made in the commit but yeah, it works too
19:43 miczac joined #git
19:44 Derperperd joined #git
19:44 Derperperd joined #git
19:44 fission6 ya
19:45 bilal joined #git
19:46 lkjhgrewwef joined #git
19:46 mel00010 joined #git
19:46 lkjhgrewwef test
19:47 texasmynsted you were right
19:48 texasmynsted I messed it up
19:49 Tobbi joined #git
19:49 lkjhgrewwef not sure if I'm approaching this in the right manner but: let's say I would like to stack multiple edits in a single commit: so, I've fixed a minor typo, and in addition added a new feature. After I've fixed the typo, is there a way to add this to the future commit message, without committing?
19:50 lkjhgrewwef that way, once I've implemented the new feature I can try and commit and see the previously set message and go "oh yeah, I fixed that too, should keep mention of that in the commit"
19:50 invisbl joined #git
19:50 lkjhgrewwef or, is it simply better practice to still separate those two instances in two commits?
19:50 grawity ideally, you wouldn't put totally unrelated things in a single commit in the first place.
19:51 grawity fixed a typo? commit it
19:51 bilal_ joined #git
19:51 grawity added a feature? commit it
19:51 grawity fixed three typos? use `git rebase` to squash those commits into one bigger typo-fixing commit
19:51 relipse__ left #git
19:51 grawity if the feature is big, branch and add it through several commits
19:52 relipse joined #git
19:52 lkjhgrewwef alright, that makes sense.
19:52 grawity then use `git rebase` to make the history look pretty before merging
19:52 relipse I'm getting this message: Your branch is ahead of 'origin/master' by 6 commits. (use "git push" to publish your local commits). How do I make "master" back on track with origin/master I don't care about any local stuff
19:52 lkjhgrewwef yeah I was afraid of "polluting" my history with a ton of commits
19:53 grawity basically, commits are cheap, branches are cheap, and editing *unpublished* history is common practice
19:53 grawity see e.g. !postproduction
19:53 gitinfo So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.
19:53 lkjhgrewwef super, thank you very much for this
19:53 grawity that said, if you make a commit and then edit something that *really* belongs in the same commit, you can just update it with `git commit --amend`
19:53 Doginal joined #git
19:54 grawity instead of having to rebase/squash/fixup later
19:54 lkjhgrewwef alright
19:54 thiago joined #git
19:54 lkjhgrewwef so basically I should be amending my history more than I previously thought
19:54 grawity (also use `git add -p`, it's convenient)
19:54 lkjhgrewwef just for nice organisation
19:55 grawity it's up to you how you end up doing it, but the point is that polishing it can be delayed until later
19:55 grawity as long as you do it sometime before `git push`, anyway.
19:56 grawity unlike svn where once you commit something it's there forever
19:56 lkjhgrewwef that makes sense
19:56 lkjhgrewwef thanks a lot
19:57 fragMental joined #git
19:58 gableroux joined #git
20:00 Chaser joined #git
20:02 dandaman joined #git
20:03 Karazhan joined #git
20:03 anjen joined #git
20:03 dandaman hey all, got a question… I've got this project that is going to be very similar between idifferent installations but there will be installations for clients which will have some form of customizations… can someone throw some suggestions at me on how to manage this software?
20:04 dandaman any case studies out there?
20:04 relipse I'm getting this message: Your branch is ahead of 'origin/master' by 6 commits. (use "git push" to publish your local commits). How do I make "master" back on track with origin/master I don't care about any local stuff
20:05 durham_ joined #git
20:05 grawity `git fetch` (just in case); `git reset --hard origin/master`
20:06 MattMaker joined #git
20:07 jnavila joined #git
20:08 jaeckel joined #git
20:10 relipse Thank you much grawity
20:10 gableroux joined #git
20:11 durham joined #git
20:11 Oatmeal joined #git
20:13 fahadash joined #git
20:14 komerdoor joined #git
20:16 dreiss joined #git
20:17 komerdoor When does git actually ask for a conflict to be resolved (adding the conflict markers to the files) instead of asking to stash or move the file out of the way? For the first time in a while I am working together with another programmer on a project and cannot remember it working this way. Am I doing things in the wrong order?
20:17 BSaboia joined #git
20:17 anuxivm joined #git
20:18 Marumarsu joined #git
20:20 kaldoran joined #git
20:20 komerdoor Example: Inside repository A I change a file. git pull. git commit. git push. On repository B I change the same file. git pull .... and then I get the message to move the file away instead of Git adding the conflict markers (like any other VCS does, and I thought Git did it as well).
20:21 Shock_ joined #git
20:21 durham joined #git
20:22 bilal joined #git
20:22 marianina8 joined #git
20:24 cagomez joined #git
20:24 jast komerdoor: this can happen if the file was untracked in repository B. since Git doesn't know its contents and history, adding conflict markers couldn't be undone so Git aborts to be safe
20:24 bilal joined #git
20:24 jast (just like it aborts if the file is tracked but there are any uncommitted changes in it)
20:25 komerdoor jast: yes, but the file was already in the repository sharing the same history.
20:25 jast can you paste(bin) the full message?
20:25 komerdoor so what should I do to get the conflict markers added to conflicting text-files?
20:25 komerdoor just a moment
20:26 Karazhan joined #git
20:27 Uneliasmarsu joined #git
20:27 gableroux joined #git
20:27 jeffreylevesque joined #git
20:30 komerdoor jast: https://pastebin.com/L2i6Bxtm
20:30 jast that does look like uncommitted changes in the file
20:30 acetakwas joined #git
20:30 mquin joined #git
20:30 komerdoor jast: What I want is it too add the conflict markers. It could be that I am doing things in the wrong order.
20:30 jast you might want to review them (git diff HEAD -- style/common.css) and make sure to commit or discard them before you go on
20:31 jast oh, I just read your example again
20:31 jast thing is, pull/merge doesn't like uncommitted changes. sometimes pulling will work anyway, if the updates from the remote repository don't touch any of the changed files. generally, though, the idea is to commit first and pull second.
20:32 komerdoor aha so I just had the order wrong
20:32 muehle joined #git
20:32 jast yep
20:32 bernd27 joined #git
20:32 jast the general idea is: once you've committed something, you can always go back to it if you accidentally mess up conflict resolution. that would be much harder if Git went in guns blazing and added conflict markers to your local uncommitted changes.
20:33 komerdoor ah. it is clear now.
20:33 jast great :)
20:33 cebula joined #git
20:34 komerdoor last time I used Git together with multiple people was like 4 years ago, so I forgot many of the simple things :|
20:34 jast I'm sure it'll come back soon enough
20:35 komerdoor yes. and they added a lot of stuff. many things that were a bit complex before can now be done with a single command, so that's nice.
20:35 komerdoor tnx
20:38 tnecniv joined #git
20:41 Atm0spher1c joined #git
20:41 peterbecich joined #git
20:42 Pieplay joined #git
20:43 Cabanossi joined #git
20:43 Karazhan joined #git
20:43 hashtagstrashtag joined #git
20:44 mjuszczak joined #git
20:44 cagomez joined #git
20:45 Karazhan joined #git
20:47 Guest57043 joined #git
20:51 manuelschneid3r joined #git
20:51 suidi joined #git
20:52 quackgyver joined #git
20:57 tnecniv joined #git
20:57 otiose joined #git
20:57 venmx joined #git
20:58 bomb-on joined #git
20:59 ertesx joined #git
21:01 Bellator joined #git
21:02 cdg joined #git
21:02 fission6 joined #git
21:04 awc737 joined #git
21:05 danijoo joined #git
21:07 hvxgr joined #git
21:08 danijoo Im having two branched (master and otherbranch), where otherbranch is really close to master from the content but its history is quite ugly (lots of unnecessary commits that are applied and reverted). I want to replace this branch with a clean one that is basically the history of master + the current content of otherbranch as latest commit. What would be a good way to do that?
21:08 Gurkenglas joined #git
21:08 Gurkenglas How do I tell git that what I've done since git clone was just the work of a tool whose outputs should not be added to my commits?
21:09 danijoo im thinking of doing a `merge otherbranch --squash` on master, then checking out a new branch, committing and replacing otherbranch with that
21:10 danijoo Gurkenglas, .gitignore?
21:11 awc737 joined #git
21:12 LionsMane joined #git
21:13 brent__ joined #git
21:13 durham joined #git
21:14 monokrome joined #git
21:16 mvensky joined #git
21:17 Anja_ joined #git
21:19 invisbl joined #git
21:21 thiago Gurkenglas: add all those new files to .gitignore
21:21 askb joined #git
21:22 thiago this does not work for modifed, tracked files
21:24 dead left #git
21:25 durham joined #git
21:26 mel00010 joined #git
21:26 durham joined #git
21:28 dreiss joined #git
21:30 rwb joined #git
21:30 hotpanca_ joined #git
21:34 NeXTSUN joined #git
21:36 hashtagstrashtag joined #git
21:37 dirtyroshi joined #git
21:38 Levex joined #git
21:41 cdg_ joined #git
21:43 reey joined #git
21:47 IndigoTiger joined #git
21:48 BSaboia joined #git
21:50 zulutango joined #git
21:50 venmx joined #git
21:51 Taikibansei joined #git
21:52 romank joined #git
21:52 hotpancakes joined #git
21:52 dsdeiz joined #git
21:53 jackrandom joined #git
21:55 salamanderrake joined #git
21:57 bernd27 joined #git
21:57 hotpancakes joined #git
21:59 bernd9000 joined #git
22:00 iamashishkebab2 joined #git
22:02 filcab joined #git
22:02 dwts joined #git
22:04 Stumbler joined #git
22:04 Taikibansei joined #git
22:05 levex_ joined #git
22:07 Dougie187 left #git
22:07 dandaman joined #git
22:08 tymczenko joined #git
22:09 jwest joined #git
22:13 rebrec joined #git
22:13 rkazak joined #git
22:14 salamanderrake joined #git
22:15 BSAlb joined #git
22:15 cdg joined #git
22:15 filcab joined #git
22:16 Taikibansei joined #git
22:16 mel00010 joined #git
22:17 lungaro i'm struggling to parse some git output here in bash. Is there a clean way to get the current local branch name?
22:17 MarioBranco joined #git
22:17 lungaro git status  -b --porcelain returns  ## release-6.8.0...origin/release-6.8.0
22:18 lungaro oh I see git branch
22:18 mjuszczak joined #git
22:19 cagomez joined #git
22:19 mjuszczak joined #git
22:20 moei joined #git
22:22 cads joined #git
22:29 hotpancakes joined #git
22:29 cdg_ joined #git
22:31 mattcen joined #git
22:32 cagomez joined #git
22:32 cagomez joined #git
22:33 cagomez joined #git
22:33 MattMaker joined #git
22:34 eikhorst joined #git
22:37 peterbecich joined #git
22:38 justanotheruser joined #git
22:38 zifnab| joined #git
22:40 invisbl joined #git
22:41 robattila256 joined #git
22:42 Taikibansei joined #git
22:44 johnny56 joined #git
22:45 peepsalot joined #git
22:45 BSab joined #git
22:49 mjuszczak joined #git
22:49 cagomez joined #git
22:49 raynold joined #git
22:50 cagomez joined #git
22:51 dsdeiz joined #git
22:51 dsdeiz joined #git
22:53 prodigel joined #git
22:54 prodigel hey all. Are git-svn questions an abomination here? :D
22:55 anuxivm joined #git
22:55 cagomez joined #git
22:56 madewokherd joined #git
22:57 Vampire0 prodigel, no
22:57 cagomez joined #git
22:57 Vampire0 prodigel, for what do you want to use it? For a one-time migration, or do you want to commit back to SVN from your Git clone?
22:57 invisbl joined #git
22:58 jast oh hey, did someone say jehovah, I mean git-svn?
22:58 prodigel @Vampire0 Huge repo that I need to dcommit to. For some reason it doesn't update anymore. svn fetch / svn rebase does nothing, while checking the actual repo url I can see that I'm a few commits behind it ...
22:58 * Vampire0 throws a stone at jast
22:58 jast nothing as in no output?
22:59 prodigel yep
23:00 Vampire0 prodigel, are you sure the additional commits are in paths (branches, tags, trunk, project) that you have in your git-svn clone?
23:00 jast that sounds like it'd be tricky to get figured out, then
23:00 Vampire0 prodigel, if I have a git-svn clone of /project1/trunk and there is a commit 2001 in /project2, it is expected that the commit 2001 is not found in the git-svn clone
23:00 prodigel it says it's up to date. I've tried creating a new remote for the same url + branch pair
23:00 prodigel same stuff happens
23:01 jast look at the original SVN commits near where your clone stopped updating, see if anything has suspicious large-scale copy operations
23:02 prodigel @jast you lost me there ...
23:02 sea-gull joined #git
23:02 sea-gull_ joined #git
23:02 jast also check if 'git branch -a' outputs any suspicious branch names (e.g. foo@123)
23:03 invisbl joined #git
23:03 prodigel there are 3 commits missing, If I'm trying to merge my changes and dcommit I get a huge number of conflicting files
23:03 prodigel I've seen it before, my conclusion working with git-svn is never try to merge into a non-update local branch
23:04 aidalgol joined #git
23:04 jast last time I looked at git-svn in more depth, it really didn't like merges
23:04 prodigel are there better ways of dealing with merges?
23:04 prodigel rebasing?
23:04 prodigel honestly, I never  tried ...
23:05 TbobbyZ_ joined #git
23:05 prodigel for me git-svn is a bit magical ... didn't bother understanding much as long as it worked... and not it's not doing it
23:05 jast I'm probably not up-to-date on git-svn. as I recall, there is a way to create SVN-friendly merges with it but back then it wasn't very comfortable
23:05 gugah joined #git
23:06 prodigel what would be a recommended flow then?
23:06 prodigel if I'm asking studid stuff just poke me :D
23:07 fission6 joined #git
23:08 jast not at all, I'm just trying to avoid giving you severely outdated information
23:08 prodigel To me it feels like something got 'stuck'
23:09 prodigel those 3 missing revisions
23:09 jast did you have a look at the output of 'git branch -a' yet?
23:09 prodigel it's a bit lacustre honestly
23:09 jast sometimes when some unusual operations happen on the SVN side, git-svn creates a new branch and puts the new commits there
23:10 prodigel when I set up the same repo before (years ago) it had way more branches
23:10 prodigel but I can't recall if I want for stdlayout then and only one branch now ...
23:10 foreal joined #git
23:10 prodigel legacy code ... (surprise surprise)
23:10 jast big surprise
23:10 diogenese joined #git
23:11 prodigel git branch -a gives me only the remotes I declared in .git/config
23:11 alexandre9099_ joined #git
23:11 prodigel Going for a new clone would literally take days :(
23:13 jast do you have some way of looking at the history of the original SVN repo? see if there's a copy operation in any of the last few commits
23:13 hotpancakes joined #git
23:13 prodigel I'm actively doing a svn clone in a different folder
23:14 prodigel and I have the web interface where I  can see branches/revision numbers for each
23:14 cagomez joined #git
23:14 jast yeah, this kind of information is sometimes tricky to tease out of web interfaces
23:14 prodigel but I have no idea how long that svn clone will take, first time doing it (desperation)
23:14 jast in an svn checkout you can probably use 'svn log'
23:15 jast actually try 'svn log <url of svn repo> | less' to have a look at the history
23:16 prodigel hmmm
23:16 prodigel I get that same last revision number as in the git svn repo
23:16 gableroux joined #git
23:17 jast well, this is straight from the SVN server...
23:17 prodigel from the svn clone
23:17 prodigel waiting for output from the svn url
23:17 prodigel got it ...
23:17 jast so way can blame svn. cool. ;)
23:17 prodigel and it's the same
23:17 prodigel awesome!
23:17 prodigel magic, I tell you!
23:18 prodigel so ... what gives then?
23:18 jast blackest magicks
23:18 prodigel web interface is 3 commits ahead of svn log
23:18 jast I have no idea, I'm not an svn sorcerer
23:18 safe joined #git
23:18 prodigel got damnit!
23:18 prodigel well, thanks for the effort
23:19 prodigel I'm gonna f**ing mail them the changed files
23:19 jast underwhelming result, though
23:20 treehug88 joined #git
23:20 jast I recommend telex
23:21 guampa joined #git
23:23 scoobertron joined #git
23:24 Vampire0 prodigel, can you show !repro for what you did to query the SVN?
23:24 gitinfo prodigel: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
23:24 jast you're braver than me, apparently
23:24 romank joined #git
23:25 robertparkerx joined #git
23:27 moei joined #git
23:30 svm_invictvs joined #git
23:32 Cabanossi joined #git
23:32 bilal joined #git
23:32 kexmex joined #git
23:33 prodigel @Vampire0, sorry man, Europe time here, gotta sleep. I'll get back to you if ze overlords are not willing to give me useful feedback
23:33 prodigel Nevertheless thank you all for trying to help
23:33 nd joined #git
23:34 jast Europe time here, too
23:34 johnflux_ joined #git
23:34 bilal joined #git
23:34 masuberu joined #git
23:35 jast oh, and you're welcome, of course
23:36 prodigel joined #git
23:36 prodigel ok, I'll give it 10 more minutes
23:36 prodigel svn update finished
23:37 prodigel and the revision number is the same as the web interface reported one
23:37 prodigel figures ...
23:37 marianina8 joined #git
23:38 prodigel afaik I can't easily add a git remote on top of it
23:38 roelmonnens joined #git
23:38 prodigel @Vampire0 you wanted me to check something?
23:40 marianina8 joined #git
23:40 marianina8 joined #git
23:42 prodigel OK, this is madness :) snv update reports the x+3 revision number, while svn log reports just x
23:42 prodigel I'm done!
23:42 marianina8 joined #git
23:43 Vampire0 prodigel, what does svn info say?
23:43 DomeMasterYolo18 joined #git
23:44 Vampire0 prodigel, if it says Revision: x+3 and Last changted Rev: x, then we are again at my question from above
23:44 Vampire0 [01:00:41] <Vampire0> prodigel, if I have a git-svn clone of /project1/trunk and there is a commit 2001 in /project2, it is expected that the commit 2001 is not found in the git-svn clone
23:45 Vampire0 And Europe time here also
23:45 prodigel long live the old lady then :)
23:47 prodigel So ... there's no problem with the repo then?
23:47 prodigel (again) I'm losing you at project1/trunk project2
23:47 prodigel I'm using one branch only - trunk
23:47 jast well, in SVN you can have multiple projects and branches in the same repo, right?
23:48 jast and if someone commits to a different branch, the global revision number still gets incremented
23:48 jast so if someone committed to the foo branch at revision 12345, your branch will show revision 12345, too, but no change at that revision
23:48 prodigel I see .... So it's just me being stupid (not knowing how svn works)
23:48 jast to be fair, svn *is* a little... special
23:49 jast 'svn info' can show you the difference, anyway, in case you haven't looked already
23:50 tocky joined #git
23:53 druonysus joined #git
23:56 raijin joined #git
23:57 romank joined #git
23:57 bilal joined #git
23:57 duderono_ joined #git
23:58 Noodlewitt joined #git

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