Fun on #git

* sammyg has quit (Remote host closed the connection)
* sammyg (~sammyg@unaffiliated/sammyg) has joined
* overlord_tm (~andraz@89-212-104-188.dynamic.t-2.net) has joined
<Contessa> yes buggaboosanchez
<Contessa> I recommend using rebase -i
* Murr has quit (Remote host closed the connection)
* ahrs has quit (Remote host closed the connection)
<Contessa> so that you can specify exactly which commits will end up in your moved branch
* Murr (~Murr@212-51-143-40.fiber7.init7.net) has joined
<buggaboosanchez> I found this: https://stackoverflow.com/questions/5471174/move-branch-pointer-to-different-commit-without-checkout  but I don't know if it's the same question  being asked
* ahrs (~quassel@gateway/vpn/privateinternetaccess/ahrs) has joined
<buggaboosanchez> And I have no familiarity with using the rebase command in git (sooo newb)
* sammyg has quit (Client Quit)
<buggaboosanchez> I would use that ^ linked article as a guide  but not sure if it's the same
* test123456 has quit (Quit: Leaving)
<Contessa> Since you want to rebase Branch B off of Branch A, make sure you are in Branch B
<Contessa> then type:
<Contessa> git rebase -i BranchA
<Contessa> You will get a screen listing each commit that will be based off of Branch A's HEAD, with the earliest at the top and the latest at the bottom
<buggaboosanchez> Contessa: thx
<Contessa> np :-)
<Contessa> If you want to remove commits, comment them out. There should be a list of instructions at the bottom of the screen when in interactive mode.
* tribly has quit (Quit: WeeChat 1.9)
* aax has quit (Ping timeout: 248 seconds)
<buggaboosanchez> -i  (interactive mode). cool
<buggaboosanchez> Contessa: What happens if I don't include the -i flag?  Does it just automatically run through the whole thing and do it?
<Contessa> it's the equivalent of using -i and not changing anything
* Phanes has quit (Quit: This is not a ragequit.)
<Contessa> so yes
<buggaboosanchez> I know I want the whole thing - thx
<Contessa> but rebase -i allows you to see what you will do before doing it, and lets you do a whole lot more (renaming commits, reordering, skipping commits, squashing commits, editing commits, etc.)
<Contessa> if anything goes wrong, you can always use 'git reflog' to see your history and reset to an earlier state.
* chachasmooth has quit (Ping timeout: 240 seconds)
<buggaboosanchez> Am I supposed to get an output: "Current branch Branch_B is up to date."  ?
<buggaboosanchez> I mean, is that right, or does it indicate an error?
<Contessa> what command did you run?
* overlord_tm has quit (Ping timeout: 260 seconds)
<dminuoso> Is there a way to rebase interactive with two branches at the same time?
<Contessa> what do you mean dminuoso ? Rebase two branches onto a common parent?
* chachasmooth (~chachasmo@unaffiliated/chachasmooth) has joined
<buggaboosanchez> I did git checkout Branch_B (so I was on the branch I wanted to move from master to a different branch. Then I did git rebase Branch_A (the branch I want Branch_B to ultimately be attached to / branched off of). I got that output after that.
<dminuoso> Contessa, I want to play lego with two branches basically. cherry pick a sequence of commits from one branch, squash and move to the head of another.
<dminuoso> basically the rebase interactive editor with 2 branches at the same time.
<Contessa> buggaboosanchez, check to see if your commit log is correct using 'git log --decorate --graph --oneline'
<Contessa> dminuoso, would you be in one of the branches at the time?
<Contessa> if so, then you can do that with git rebase -i
<dminuoso> Contessa, how do I get access to the other branch?
<Contessa> dminuoso, let's say you're in branch A. You want to squash its commits into one commit and move that onto branch B?
* dsantiago (~dsantiago@cpe-104-175-193-69.socal.res.rr.com) has joined
<Contessa> if so, check out branch A and type 'git rebase -i branchB'
* fstd_ (~fstd@unaffiliated/fisted) has joined
* fstd has quit (Read error: No route to host)
* fstd_ is now known as fstd
<Contessa> in there, leave the top commit untouched. Change subsequent commits from 'pick' to 'squash'
<buggaboosanchez> Contessa: Looks accurate to the best of my recollection. But I may have screwed something up deleting a branch earlier or something.  It isn't an important repo - just fiddling / learning
<Contessa> alright :-)
<minibar> cis there a global option which can enable --committer-date-is-author-date for every rebase?
<Contessa> btw, git rebase -i is one of my favourite commands. It's my git swiss army knife
* Phanes (Phanes@2600:3c02::f03c:91ff:fe92:354e) has joined
* Phanes has quit (Changing host)
* Phanes (Phanes@surro/founder/phanes) has joined
<Contessa> minibar, do you mean updating the author date of the commit to the commit date?
* BenderRodriguez (~Foxhoundz@unaffiliated/foxhoundz) has joined
<minibar> Contessa prevent the commit date to be changed by rebasing
* oxymoron93 (935b012c@gateway/web/cgi-irc/kiwiirc.com/ip.147.91.1.44) has joined
<minibar> keep it the same as the author date
<dminuoso> Contessa, I was hoping for something along the lines of https://gist.github.com/anonymous/b9021184fd3b6270ad5c3d95157ea10f
* mizu_no_oto (~textual@c-24-60-15-130.hsd1.ma.comcast.net) has joined
<dminuoso> Contessa, I dont know how to describe other than "I want to play lego with multiple branches"
<Contessa> lol yeah, I see what you mean
<Contessa> I haven't seen such an option before in git rebase. Let me look through the docs for it
<buggaboosanchez> You can't create multiple branches wiht a single statement?  eg: git branch branch-1 branch-2 ... branch-n
<Contessa> minibar, I think that functionality is baked into git. I don't know if there is such a configuration
<buggaboosanchez> Is there another way to create branches where you can do that?
* jeffreylevesque_ (~chatzilla@pool-108-45-74-97.washdc.fios.verizon.net) has joined
<minibar> Contessa the git-rebase has the --committer-date-is-author-date option
* glaeqen has quit (Remote host closed the connection)
<Contessa> ooh
* nivag_ (~gavin@SA5-nat-97.anu.edu.au) has joined
<Contessa> btw dminuoso I don't think you can do it in one step
* jeffreylevesque has quit (Ping timeout: 260 seconds)
<dminuoso> Contessa, just figuring out the order in which to do things would be very... interesting.
<Contessa> minibar, it looks like that option does what you want it to do
<Contessa> It's also present in 'git am'
<Contessa> https://git-scm.com/docs/git-am
<minibar> Contessa would like it to make it default
<Contessa> looking through the docs
* mizu_no_oto has quit (Quit: Computer has gone to sleep.)
<Contessa> minibar, looks like there is an environment variable that does this, as mentioned here: https://stackoverflow.com/questions/28536980/git-change-commit-date-to-author-date
<Contessa> can you test it out and see if it works?
* mizu_no_oto (~textual@c-24-60-15-130.hsd1.ma.comcast.net) has joined
<buggaboosanchez> It's too hard to learn a for loop in bash that works. This is what keeps me in the dark ages when it comes to programming
<Contessa> bash scripting is annoying :P
<dminuoso> Contessa, something like that would be the holy grail of git. I mean git rebase interactive is extremely great already, its probably one of my most frequently used things in git.
<buggaboosanchez> If I woulda just exectue the command 3 times I'd be done 10 times by now and no stress cause I already know how to do that. If I engage learning how to automate the process I'm here under mass pressure trying to understand something I have no clue about and 3 days later I might be able to execute one successful command. Grr
<buggaboosanchez> story of my life
* n1amr (~n1amr@41.47.5.91) has joined
<Contessa> buggaboosanchez, have you learned any other programming languages?
* Brain (~brain@cpc4-mfld16-2-0-cust466.13-1.cable.virginm.net) has joined
<dminuoso> Contessa, I mean most of git is just about manipulating commits to obtain some desired shape - and git rebase -i is exactly what. Something along this lines ought to have been been discussed before
<buggaboosanchez> Contessa: C then C++ (and I'll never go to C again). Then just piddled with a few web langs and with bash
<buggaboosanchez> nothing spectacular
* aard has quit (Read error: Connection reset by peer)
<buggaboosanchez> The form of the logic is different between bash and C++  With bash it's for <some var> in < idk what >
<Contessa> buggaboosanchez, you should be able to write a C++ program that calls the shell
<buggaboosanchez> ^ nothing like C++ for loop at all
<Contessa> so that you can iterate over git commands
<Contessa> I think there's a 'shell' method in one of the standard C libraries
<buggaboosanchez> C++ is a compiled lang, that would be cumbersome
* YuGiOhJCJ has quit (Quit: YuGiOhJCJ)
<Contessa> dminuoso, totally
<buggaboosanchez> right on
* Mutter (~Mutter@99-59-232-184.lightspeed.irvnca.sbcglobal.net) has joined
* Mutter has quit (Client Quit)
* highkix has quit (Ping timeout: 252 seconds)
<dminuoso> buggaboosanchez, C++ then Haskell (and Ill never go to C++ again).
* SkyPatrol (~SkyPatrol@dsl51B6F885.fixip.t-online.hu) has joined
<Contessa> Haskell is <3
* n1amr (~n1amr@41.47.5.91) has left
<dminuoso> All those things that deeply pissed me off in C++ were done right in Haskell as far as I can tell, though Im still very fresh. :)
<Contessa> but for such a simple script, the language isn't really that important. It's just a few lines really
<Contessa> call it 'git-multibranch' or something
* Oatmeal has quit (Ping timeout: 260 seconds)
* SkyPatrol_ has quit (Ping timeout: 240 seconds)
* glad has quit (Remote host closed the connection)
* fstd has quit (Read error: No route to host)
* fstd (~fstd@unaffiliated/fisted) has joined
* coco has quit (Quit: WeeChat 1.9)
* Phylock has quit (Ping timeout: 240 seconds)
* King_Hual has quit (Ping timeout: 240 seconds)
* a3Dman has quit (Ping timeout: 240 seconds)
* robinb (~robinb@2400:2412:6e0:4000:7977:6e8c:5fed:d5dd) has joined
* ZyX-I has quit (Ping timeout: 246 seconds)
* FlyingJester (~kashyyyk@2602:306:31c4:2820:6890:4925:697d:7654) has joined
<FlyingJester> So, I'm having a problem where `git push origin branch` does nothing at all (doesn't even print anything). I don't think I'm in detached head mode, but I have no idea what is happening.
* chachasmooth has quit (Ping timeout: 240 seconds)
* chriys (~chriys@96.127.232.172) has joined
* robinb has quit (Ping timeout: 252 seconds)
* ahr3n (~textual@113.172.2.234) has joined
* chachasmooth (~chachasmo@unaffiliated/chachasmooth) has joined
* a3Dman (~3Dman@unaffiliated/a3dman) has joined
* upperdeck has quit (Ping timeout: 248 seconds)
* chriys has quit (Ping timeout: 260 seconds)
* dsantiago has quit (Quit: Computer has gone to sleep.)
<Contessa> FlyingJester, what do you see when you type 'git remote show origin'?
* dege has quit (Quit: Damage is done, this is fun)
<FlyingJester> Contessa: Nothing at all.
<FlyingJester> My config, if it helps... https://gist.github.com/FlyingJester/330a22f948cd2aa8a69f2ea97b243865
<Contessa> FlyingJester, I'm guessing you have your real email there instead of <LOL>, right?
<FlyingJester> Yeah.
<Contessa> can you run 'git fetch' FlyingJester ?
<FlyingJester> I have, and nothing is printed.
* funkytwig (~funkytwig@cpc124780-aztw29-2-0-cust179.18-1.cable.virginm.net) has joined
<Contessa> FlyingJester, what if you go to another directory, create a repository that is hosted online
<Contessa> and try to push/fetch to that?
<FlyingJester> I have another repo that works fine with this git setup, is that what you mean?
* upperdeck (~upperdeck@n218103180187.netvigator.com) has joined
<Contessa> yeah, just checking if it's global or repo-specific
<Contessa> FlyingJester, has this always happened or did it start recently?
<FlyingJester> Well, I do have my config local for both repos.
<FlyingJester> I've not used this repo since I reinstalled git on this machine.
<funkytwig> Hi, ive just lost a days work.  I added files, did a commit and a push (in develop) then checkout master and merge develop.  Now everythnig I did is gone.  Any ideas?
<Contessa> what git version are you running?
* fstd has quit (Read error: Connection reset by peer)
* fstd (~fstd@unaffiliated/fisted) has joined
<funkytwig> 2.7.4
<Contessa> funkytwig, I guess you were on some 'branchA' and then checked out master?
<Contessa> if so, do you see this branch when you run 'git branch'?
<funkytwig> Contessa, I was in develop, did a commit and a push, then checkout master
<Contessa> do you see the commit remotely?
<funkytwig> Contessa, sorry, dont follow
* gugah (~gugah@181.28.219.193) has joined
* gugah has quit (Max SendQ exceeded)
<oxymoron93> if you did the commit, then there is no way you lost your changes
<Contessa> Can you access the online version of the repository funkytwig ?
<Contessa> exactly oxy. It must be online
* gugah (~gugah@181.28.219.193) has joined
<funkytwig> Contessa, yes, let me have another look at bitbucket but fairly sure it is all gonr
<Contessa> just thinking aloud, but someone could have force-pushed
<funkytwig> Contessa, it says last update 21 houred ago
<Contessa> is that yours?
<funkytwig> let me gist the git history
<Contessa> also, that's the develop branch?
<Contessa> Make sure you're looking at develop, not master
<funkytwig> Contessa, the overview for the whole depository says last update 31 hours ago
<Contessa> 31 or 21?
<Contessa> funkytwig,  actually, what do you see when you run this command locally? 'git log develop --decorate --graph --oneline'
<funkytwig> sorry, meant 21
<Contessa> do you see your changes there?
* piremi (~jimmy@220.116.161.106) has joined
<buggaboosanchez> I keep getting myself into this situation and not learning how to fix it. I rename a file with the bash command 'mv" and git says there's a new untracked file. .  Can I just reflect the name change in the commit message and that's good enough?
<funkytwig> no
<buggaboosanchez> funkytwig: What do you do?
<Contessa> buggaboosanchez, 'git mv'
<buggaboosanchez> Contessa: Yes I should have thought to do it properly.
<buggaboosanchez> I got this ( I thhink )
<Contessa> git should be able to handle it even using 'mv' though
<Contessa> just add the untracked file
<Contessa> and make sure everything looks good in the staging area
<Contessa> funkytwig, let's just go over your workflow again
<Contessa> You were on develop
<Contessa> you commit some changes
<Contessa> so now you have several commits or so on develop (or maybe just one)
<Contessa> You push this change to remote using 'git push origin develop'
<funkytwig> Yes, just let me check the sistory
<funkytwig> Yes, just let me check the history
<Contessa> You then check out master using 'git checkout master', then run 'git merge develop'.
<Contessa> ok
<buggaboosanchez> I'm gonna delete the file (since it's just an empty file - initially committed) , make the new properly named one , and reflect it all in my commit messages
<funkytwig>  1783  git commit -m "fix missing files"
<funkytwig>  1784  git push
<funkytwig>  1785  git status
<funkytwig>  1786  git checkout master
<funkytwig>  1787  git merge develop
<funkytwig>  1788  git status
<funkytwig>  1789  git push
<oxymoron93> funkytwig use paste tool next time :)
<Contessa> funkytwig, were those files staged at the time?
<funkytwig> OK, sorry
<Contessa> for line 1783
* Tobbi (~Tobbi@supertux/tobbi) has joined
<funkytwig> Contessa, yes, I added all the stuff
<oxymoron93> would commit pass without staged file/s?
<buggaboosanchez> If a change isn't staged then what that change is can be changed without affecting the status of git status - right? I mean, "change" is ambiguous to git prior to staging?
<Contessa> and you cannot see your commit on your local copy of develop funkytwig ?
<Contessa> git log develop
* Cabanossi has quit (Ping timeout: 276 seconds)
<funkytwig> Contessa, how do I check that
<Contessa> type 'git log develop'
* Cabanossi (~Cabanossi@pC19F2D04.dip0.t-ipconnect.de) has joined
<buggaboosanchez> Holy shit - I'm digging myself a hole with this thing.  I do bash command "rm" on the file and git status comes back clean - what?
<Contessa> what did you have in your working area/staging area before buggaboosanchez ?
<buggaboosanchez> there is a difference git ought to be picking up (where once there was a file [with the old name] there now is no file at all)
* a3Dman has quit (Ping timeout: 240 seconds)
<Contessa> buggaboosanchez, so you started off with some 'fileA' in your repo
<funkytwig> Contessa, no, the comit is not mentioned, even though I can see it in linux history
<Contessa> do you have the old commit id funkytwig ?
<funkytwig> Contessa, how do I get that?
<Contessa> do you see it in your console history funkytwig ?
<buggaboosanchez> I had a single file in a directory under the main repo dir. I had forgotten to add the .cpp ending.  I used bash command "mv" to change the file and git status picked it up as a new file. I went and used bash command "rm" to delete the file and git status comes back clean. That's where I'm at atm
* dfee (~dfee@cpe-70-95-143-62.san.res.rr.com) has joined
* fstd has quit (Read error: Connection reset by peer)
* fstd (~fstd@unaffiliated/fisted) has joined
<Contessa> but it doesn't see the old file even though it's been deleted, right buggaboosanchez ?
<Contessa> try 'git checkout path/to/file'
* dermoth has quit (Ping timeout: 268 seconds)
* dermoth (~dermoth@gateway/tor-sasl/dermoth) has joined
<buggaboosanchez> Contessa: That seems like a reasonable assessment
<buggaboosanchez> Seems like that could cause something like this
<Contessa> does it work?
<buggaboosanchez> let me see
<funkytwig> Contessa, it looks like I have host of the important stuff in aptana but this is really freaking my out.
<Contessa> funkytwig, are you sure you didn't do anything other than those commands?
<Contessa> Are you in the correct repository?
<funkytwig> Contessa, that was the console histoey I pasted earlier
<Contessa> you didn't switch directories or anything?
<funkytwig> let be gits history | grep git
<buggaboosanchez> Contessa: Let me make sure we are clear on this. Right now there is no file (I deleted it). For me to do git checkout <path to file> would be exactly "git checkout ./"  (because I'm in the dir and is linux)
<buggaboosanchez> Is that ^ right to do?
<Contessa> I think so, not sure
<buggaboosanchez> cant get any worse :)
<Contessa> you're sure you don't have the file set to --skip-worktree or ignored?
* dfee has quit (Ping timeout: 240 seconds)
<buggaboosanchez> I borked my repo
<buggaboosanchez> That doesn't work Contessa
<Contessa> git ls-files -v | grep ^S
<Contessa> what do you see buggaboosanchez ?
<buggaboosanchez> Contessa: There is no output
<funkytwig> Contessa, https://gist.github.com/funkytwig/8d232f63e49df198a7ca88a097c2c2ae
* dsantiago (~dsantiago@cpe-104-175-193-69.socal.res.rr.com) has joined
* roelmonnens (~roelmonne@ptr-4oprt7byx60cw3bepvs.18120a2.ip6.access.telenet.be) has joined
<buggaboosanchez> Contessa: This is a newly created repo and that was the second of two files created in it
<Contessa> you don't even see it in viewtest funkytwig ?
<Contessa> no .gitignore either, right buggaboosanchez ?
<hlieberman> I've got a weird git problem that I can't figure out.  I'm trying to merge tag XYZ into branch foo, aggressively discarding all changes on the branch foo in favor of those on XYZ. I would expect `git merge XYZ -s recursive -X theirs && git diff XYZ` to return no output... but there are lots of changes.
<hlieberman> Any ideas?
<buggaboosanchez> Contessa: Hadn't created on (I have in the past, just not yet on this one)
* a3Dman (~3Dman@unaffiliated/a3dman) has joined
<Contessa> buggaboosanchez, do you see the file if you run 'git log --raw'?
* om_henners has quit (Quit: ZNC 1.6.5 - http://znc.in)
* om_henners (~om_henner@203-174-131-138.mel.static-ipl.aapt.com.au) has joined
<buggaboosanchez> Contessa: I don't think I ever initially committed that empty file. I must have noticed the file extension was missing, started mutating stuff outside git, and wondered git status was saying what it was each time
* roelmonnens has quit (Ping timeout: 255 seconds)
<Contessa> if it was never committed, then git doesn't keep track of it
<buggaboosanchez> I'm so new to git I don't think of the connection at all
<Contessa> The only way for git to keep track of something is for you to commit it
<buggaboosanchez> Contessa: thanks for helping me see what's up
<Contessa> np :-)
<buggaboosanchez> Doh!
* Brain has quit (Ping timeout: 240 seconds)
<Contessa> funkytwig, what is your push configured to use? 'simple'?
* finalbeta has quit (Ping timeout: 264 seconds)
* Oatmeal (~Suzeanne@gateway/vpn/privateinternetaccess/suzeanne) has joined
<funkytwig> Contessa, ok, its in viewtest
* mizu_no_oto has quit (Quit: Computer has gone to sleep.)
<Contessa> awesome
* funkytwig jumping up and down yelling yes
* chachasmooth has quit (Ping timeout: 252 seconds)
<Contessa> XD
<funkytwig> Contessa, never before has awesome felt so understated, thanks for your help.
<Contessa> np :-)
<funkytwig> Contessa, is hter a way for me to add my branch to my pronmpt
<Contessa> what do you mean by your prompt?
<funkytwig> Y
<Contessa> Do you want to add your change to develop?
* chachasmooth (~chachasmo@unaffiliated/chachasmooth) has joined
<funkytwig> Yes, and master, but i'me going to do a tar backup first;).
<Contessa> just do 'git push -u origin viewtest'
<buggaboosanchez> I can't be in a sub dir and issue "git branch" to get a list of branches?  ( It errors out )
<Contessa> that way your viewtest branch is online
<funkytwig> Contessa, thought I had alreay checked viewtest
* preyalone has quit (Quit: Connection closed for inactivity)
<buggaboosanchez> I had to back out 3 levels and then issue the command before it would work
<Contessa> for merging into develop, it depends on your company policy
* MutantMahesh (~msankhala@unaffiliated/msankhala) has joined
<Contessa> you may need to create a pull request, or you could do it directly with 'git rebase develop; git checkout develop; git merge viewtest'
<Contessa> funkytwig, ^^^
* askb (~askb@60-240-105-249.static.tpgi.com.au) has joined
<Contessa> buggaboosanchez, that's strange
<MutantMahesh> Is there single command to checkout new local branch and create remote tracking branch at the same time?
<Contessa> but I don't usually work with git in a subdirectory
<buggaboosanchez> Contessa: tell me about it
* bronson (~bronson@50-1-98-33.dsl.dynamic.fusionbroadband.com) has joined
<Contessa> MutantMahesh, you can create a local branch that tracks an existing remote branch with 'git checkout -b branchname -t remotebranch'
<funkytwig> Contessa, thanks, so if I do 'git push -u origin viewtest' it puts the branch in bitbucket?
<Contessa> but to create a remote branch you have to push first
* mizu_no_oto (~textual@c-24-60-15-130.hsd1.ma.comcast.net) has joined
<Contessa> yes funkytwig
<MutantMahesh> @Contessa Thanks make sense.
<Contessa> :-)
<buggaboosanchez> wtf! Am I being hacked?!  The entire "code" directory is missing (which is where that file was located that I was talking about earlier
<Contessa> what branches do you have buggaboosanchez ?
<Contessa> 'git branch'
<buggaboosanchez> I'm sure it has something to do with the way I'm using git (branching stuff) and I don't understand something about it.
<Contessa> Branching allows you to have different working directory states
<Contessa> so you can have directories that appear and disappear out of nowhere depending on the branch you're in
* Cabanossi has quit (Ping timeout: 246 seconds)
<buggaboosanchez> Contessa: Idk how to represent the answer to that. There's 3 right off master (testing development and docs) then off of develpment there are several linearlly branch on branch
<oxymoron93> represent with pastebin
<Contessa> buggaboosanchez, try 'git branch -v'
<buggaboosanchez> Contessa: It shouldn't delete a dir though right? (git doesn't track dirs)
* dsdeiz has quit (Read error: Connection reset by peer)
 buggaboosanchez bremner babilen BackEndCoder bailon bambams barq barteks2x bathtub_shark batrick Baughn bauruine bbhoss bcc bdesmet beaky beerdrop belak BenderRodriguez Bengi Bercik bergice_ berndj beuker biancat bibek22 Bigcheese bigjazzsound binary106 BinGOs bipolar bitmod bittyx_ bjoe2k4_ bket bl0m1 BlackPanx blackwell bladdezz blahdodo BlessJah Blkt bluepixel blueyed blunaxela Bobdude Bock bodie_ Bombe bond BooK bordeaux_facile boshhead boxrick Brando753-o_O_o briankc brokensyntax bronson bs bsanford bttf butterthebuddha bwn byte512 BytesBacon
<Contessa> It can buggaboosanchez
* bronson has quit (Ping timeout: 248 seconds)
<Contessa> and checking out the branch will restore it
* Cabanossi (~Cabanossi@pC19F2D04.dip0.t-ipconnect.de) has joined
<funkytwig> Contessa, were you saying I need to do another push.  bitbucket says last update very recently but branch not showing ip.
<Contessa> funkytwig, refresh bitbucket and look through the branches on bitbucket
* natechan (~natechan@2602:306:ce68:4290:f520:bbec:6752:e21c) has joined
<buggaboosanchez> Contessa: Contessa, it can what? Git can track dirs? Dirs can be deleted by git?  Or both and ??
<funkytwig> Contessa, just saw you said i have to push FIRST but I did not;(
<oxymoron93> any content can be tracked by git
<Contessa> buggaboosanchez, git tracks files and their filepaths.
<buggaboosanchez> Contessa: hold on I see what you saying
<Contessa> funkytwig, do you see it after you push?
* mizu_no_oto has quit (Quit: Computer has gone to sleep.)
<buggaboosanchez> Contessa: Well I'll be a ....   wow!  It does do that!
* robinb (~robinb@2400:2412:6e0:4000:7977:6e8c:5fed:d5dd) has joined
<Contessa> it's like magic :P
<funkytwig> Contessa, shall I do another push
* neightchan (~natechan@2602:306:ce68:4290:1dd2:5715:68dd:e8bf) has joined
<oxymoron93> no need for that
<Contessa> you don't see viewtest even after pushing viewtest funkytwig ?
<buggaboosanchez> Did git change?  (afaik) The issue of having git track dirs has come up from time to time throughout it's existance.  This looks like that. Is it?
* feodoran_ (~quassel@p4FD27F52.dip0.t-ipconnect.de) has joined
* feodoran is now known as Guest54549
<Contessa> buggaboosanchez, git is just tracking the files afaik. So if fileA is in ./code/ then git sees it as ./code/fileA
* feodoran_ is now known as feodoran
<buggaboosanchez> but If I merge that branch then I bet the changes show up in the branch i merged into  :)
* ShalokShalom has quit (Ping timeout: 260 seconds)
<funkytwig> I did git push -u origin viewtest and the last updated time changed but cant see branch
* dsdeiz (~dsdeiz@49.151.121.114) has joined
* dsdeiz has quit (Changing host)
* dsdeiz (~dsdeiz@drupal.org/user/447770/view) has joined
<Contessa> yes buggaboosanchez
<Contessa> you cannot see the branch in Bitbucket funkytwig ?
<funkytwig> Contessa, no
<Contessa> are you able to see develop in Bitbucket funkytwig ?
<buggaboosanchez> well this is blowing git wide open for me (like file management 20 yrs ago when someone said just the right / needed thing that blew it open for me)
* thiago (~thiago@kde/thiago) has joined
<Contessa> at its core, git is really simple but really powerful
* webdev007 (~webdev007@45.72.241.78) has joined
* natechan has quit (Ping timeout: 246 seconds)
<Contessa> it's all about DAGs :P
* jost__ has quit (Remote host closed the connection)
* Guest54549 has quit (Ping timeout: 248 seconds)
<funkytwig> Contessa, viewtest in bitbucket now, guess it take a little time for there website to update
<Contessa> awesome
<Contessa> funkytwig, this is personal or corporate development?
* robinb has quit (Ping timeout: 255 seconds)
<Contessa> if it's corporate then you need to consult their policies on merging into develop and master
<FlyingJester> Interesting. So, I did a new checkout, and everything worked until I made a commit, and now I have the same issue again.
<funkytwig> Contessa, so should I checkout to develop, merge, push, then checkout to master,merge,  push
* SkyPatrol_ (~SkyPatrol@netacc-gpn-7-138-113.pool.telenor.hu) has joined
<FlyingJester> It's interesting that `git push origin branch` says nothing, since I do not have a password saved.
<funkytwig> Contessa, ime currently only developing lovably, nothing gone live
 funkytwig fuchstronaut Furai fury fury_ fuzzmz
<Contessa> yes funkytwig
<Contessa> FlyingJester, do you mean a clone?
<Contessa> or a checkout?
<FlyingJester> Yeah, sorry, a new clone.
<Contessa> do your local git commands word? e.g. 'git log'
<Contessa> *work
* SkyPatrol has quit (Ping timeout: 240 seconds)
<FlyingJester> Yes, git log works.
<oxymoron93> what happened with git commit ?
<FlyingJester> git fetch, pull, diff, etc all just do nothing at all.
<Contessa> even diff?
* mizu_no_oto (~textual@c-24-60-15-130.hsd1.ma.comcast.net) has joined
<FlyingJester> Yeah, even diff does nothing at all.
<Contessa> FlyingJester, have you tried diffing against wildly different commits?
* Ardethian\ has quit (Read error: Connection reset by peer)
<Contessa> e.g. git diff HEAD~20
<funkytwig> Contessa, to answer your previous question personal
<FlyingJester> Ah, sorry, I had forgotten how git diff works :X Yeah, git diff works properly.
<Contessa> awesome :-)
* Ardethian\ (~tkore@unaffiliated/ardethian) has joined
<Contessa> let me check the docs
<Contessa> FlyingJester, are you using SSH or HTTP or HTTPS?
* Murr has quit (Remote host closed the connection)
<Contessa> also, what if you try `git fetch -v`?
* Murr (~Murr@212-51-143-40.fiber7.init7.net) has joined
<FlyingJester> Interestingly, git remote show does show 'origin', which makes sense given the results of config, but then prints nothing for `git show remote origin`. Trying a nonsense remote, like `git remote show asdf` does say that it's not valid.
<FlyingJester> I'm using https
<FlyingJester> `git fetch -v` also prints nothing at all.
<buggaboosanchez> what happens after someone does git reset HEAD^  in order to undo the last commit? I mean what happens to the data stored in memory? Does it get freed ever? And by what? My OS, or by git?
<Contessa> Does the command halt immediately or does it take time FlyingJester ?
<Contessa> buggaboosanchez, it eventually gets freed when you run `git gc`
<FlyingJester> Contessa It's basically instant. Way faster than doing a git fetch on the other local repo I have that works.
* mikecmpbll has quit (Quit: inabit. zz.)
<Contessa> wait, give me that config again FlyingJester
<funkytwig> Contessa, OK, ive got the changes in develop online, so when I go to master do I merge develop (guess if I merged viewtest it would do same thing)
* YuGiOhJCJ (~YuGiOhJCJ@gateway/tor-sasl/yugiohjcj) has joined
<Contessa> Yes funkytwig
<FlyingJester> Contessa: https://gist.github.com/FlyingJester/3888930d8c1ca880d678538f266b44d0
<FlyingJester> All options are local, nothing in system or global.
<buggaboosanchez> Contessa: Read - git gc does bookkeeping / housekeeping stuff
<FlyingJester> And no saved passwords or usernames.
<Contessa> gc = garbage collection buggaboosanchez
<Contessa> FlyingJester, I'm just looking at the URLs in there
<buggaboosanchez> Contessa: It runs automatically?
* jnewt_ has quit (Quit: Leaving)
<Contessa> it can buggaboosanchez but it will tell you
<Contessa> FlyingJester, what if you clone using ssh?
<funkytwig> Contessa, hit my first merge conflict, this is exiting;)
<Contessa> :P
<FlyingJester> I haven't edited them on this clone, it's what I cloned using (and that worked, as well as a single push). And I compared it with the working repo, it didn't look suspicious to me.
<FlyingJester> Contessa: Aren't ssh clones read only?
<Contessa> funkytwig, that's why I like to rebase my branch on top of what I'm going to be merging it into first, to avoid having too many conflicts.
<Contessa> nope FlyingJester
<FlyingJester> Well, ok then. I'll give it a try
* jcstach_ (~jcstach@pool-100-14-220-47.phlapa.fios.verizon.net) has joined
<buggaboosanchez> Contessa: cool stuff man
* jpcrs (~jpcrs@189.62.2.245) has joined
<Contessa> buggaboosanchez, you can also recreate a deleted branch by using the commit id before it's garbage collected
* brent__ (~brent@c-73-202-92-62.hsd1.ca.comcast.net) has joined
<funkytwig> Contessa, no biggie, looking at file and it seems obvious.  So I need to alter file, commit and do merge again
<oxymoron93> no merge, just git add and git commit
<Contessa> you're in the CONFLICT stage, right? So you just need to make your change, run 'git add' then commit
<Contessa> ^^^
<funkytwig> Contessa, yes
<FlyingJester> Contessa: I'm getting a "cannot read from remote repository", but I'm not really sure it's related to this issue directly.
<Contessa> that's on an SSH clone attempt FlyingJester ?
<FlyingJester> Contessa: Yes. Works fine with https.
<Contessa> do you have any SSH keys configured with your repo FlyingJester ?
* SkyPatrol (~SkyPatrol@dsl51B6F885.fixip.t-online.hu) has joined
<Contessa> actually, let me try to clone it via ssh
<FlyingJester> Probably not...and that would explain it, wouldn't it.
<Contessa> it shouldn't need one
* SkyPatrol_ has quit (Ping timeout: 240 seconds)
* brent__ has quit (Ping timeout: 248 seconds)
<Contessa> I got a permission denied error FlyingJester
<FlyingJester> Interesting.
* dc_99 has quit (Ping timeout: 255 seconds)
<Contessa> https://prnt.sc/ggppvr
<FlyingJester> Same thing I get :S
<Contessa> Look into your Github settings FlyingJester
<Contessa> see if you can find anything related to SSH in there?
* mostlybadfly (uid10066@gateway/web/irccloud.com/x-rjlxbizgxamkjwlu) has joined
<FlyingJester> is "deploy keys" related?
<FlyingJester> Or do I need to add myself as a collaborator?
* eb0t has quit (Quit: WeeChat 1.4)
<Contessa> don't you already own the repo?
<Contessa> you shouldn't need to add yourself
<FlyingJester> I do own it, but the collaborator list is empty. Nothing seems unusual, so unless I need to do something with "deploy keys" I'm not sure what I would change.
<funkytwig> Contessa, all done, thanks for you help I FRIGGING LOVE IRC, will look up rebase
<Contessa> np!
<oxymoron93> this channel rocks yes, rebase rocks too imo
<FlyingJester> I mean, it looks like deplot keys is just adding SSH keys.
<Contessa> FlyingJester, let me look into the github docs
<Contessa> FlyingJester, https://help.github.com/articles/error-permission-denied-publickey/
* dsantiago has quit (Quit: Computer has gone to sleep.)
<FlyingJester> Interesting, ssh -T git@github.com prints "Permission denied (publickey)."
* cagedwisdom has quit (Ping timeout: 264 seconds)
* text1 (~safe@unaffiliated/safe) has joined
<FlyingJester> I think I just don't have ssh set up properly on this machine (no public key), I haven't used it since I reinstalled Cygwin.
<Contessa> hmm, maybe. I'm on a Windows machine too so I can't verify
* safe has quit (Ping timeout: 260 seconds)
* nivag_ has quit (Ping timeout: 248 seconds)