Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-26

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

All times shown according to UTC.

Time Nick Message
00:00 leehambley joined #git
00:03 justanot1eruser joined #git
00:04 cyphase joined #git
00:08 mingrammer joined #git
00:08 AustinMatherne joined #git
00:09 madewokherd joined #git
00:10 fission6 joined #git
00:10 fission6 how can i see what a specific file looke dlike befoer a commmit
00:10 kadoban fission6: 'git show thecommit~1:the/file/path'
00:13 shirty joined #git
00:14 thiago joined #git
00:15 cjohnson left #git
00:18 Ravana joined #git
00:18 tesuji joined #git
00:20 mwhooker joined #git
00:21 danimal2 joined #git
00:22 Rodya_ joined #git
00:25 eka joined #git
00:26 craig_ joined #git
00:29 zacts joined #git
00:32 mellernoia-work joined #git
00:35 PresidentBiscuit joined #git
00:35 neanderslob joined #git
00:37 l4v2 joined #git
00:37 xall_ joined #git
00:38 adino joined #git
00:39 dmto joined #git
00:41 cyphase joined #git
00:44 nile joined #git
00:45 ochorocho__ joined #git
00:48 sangy joined #git
00:49 jaguarmagenta joined #git
00:53 Chill_Surf joined #git
00:54 pampeho joined #git
00:59 nettoweb joined #git
01:00 CussBot_ joined #git
01:02 mingrammer joined #git
01:03 lindenle joined #git
01:06 Gsham joined #git
01:08 stantonk joined #git
01:09 kyan joined #git
01:10 clemf joined #git
01:12 shauna joined #git
01:12 afusion joined #git
01:14 star_prone joined #git
01:14 afusion_ joined #git
01:14 mycyber joined #git
01:14 livingstn joined #git
01:18 Nysar joined #git
01:20 stantonk joined #git
01:22 Gitzilla joined #git
01:23 PabloR joined #git
01:23 xall_ joined #git
01:24 PabloR left #git
01:30 cdg joined #git
01:33 stantonk joined #git
01:34 fission6 joined #git
01:34 Sucks joined #git
01:35 jost_ joined #git
01:35 Nysar joined #git
01:36 sitaram joined #git
01:36 jeffreylevesque joined #git
01:37 jeffreylevesque so, i have a set of milestones: 1, 2, 3, 4
01:37 jeffreylevesque is it possible for me to work on milestone 1, while another person works on issues related to milestone 2?
01:37 jeffreylevesque how should the workflow be setup?
01:37 jeffreylevesque when the other person finishes issues to milestone 2, should he merge to master branch?
01:38 denimsoft joined #git
01:40 denimsoft joined #git
01:42 Rodya_ joined #git
01:46 wxg joined #git
01:48 yitz joined #git
01:48 f3r70rr35f joined #git
01:52 denimsoft joined #git
01:52 mehola joined #git
01:53 Darren_ joined #git
01:54 pks joined #git
01:55 adino joined #git
01:59 Gsham joined #git
02:01 denimsoft joined #git
02:02 fairuz joined #git
02:03 adino joined #git
02:03 lagothrix joined #git
02:04 Rodya_ joined #git
02:05 Rodya_ joined #git
02:14 denimsoft joined #git
02:15 adino joined #git
02:16 MarconM joined #git
02:16 MarconM Hi
02:16 gitinfo MarconM: 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.
02:17 MarconM I need to delete a big folder inside my .git/objects/packs/$file.pack
02:17 MarconM but if i do the normal way i lost all the commits
02:18 Goplat joined #git
02:18 zacts joined #git
02:19 JanC_ joined #git
02:19 HoierM joined #git
02:20 cqi joined #git
02:20 rewt what do you call "normal way"?
02:22 MarconM rewt: rm
02:22 MarconM git is with large pack
02:22 MarconM 34mb
02:22 rewt you're only supposed to use git commands to manipulate things inside the .git dir
02:22 MarconM yes
02:24 rewt try running `git gc --aggressive --prune=now`
02:24 Dougie187 joined #git
02:28 MarconM rewt: https://github.com/brunotougeiro/node.js.git
02:28 MarconM rewt: i did ... nothing
02:28 MarconM .pack file still big
02:29 sukra joined #git
02:29 mycyber joined #git
02:29 HoierM joined #git
02:29 bluezone joined #git
02:30 HoierM joined #git
02:30 chachasmooth joined #git
02:31 HoierM joined #git
02:32 sdaugherty 34MB doesn't sound unreasonably large to me for a repository with some history
02:34 rewt MarconM, you have 2 different copies of node-v4.4.7.tar.gz in your history; one that's 22MB, and another that's 12MB ... that's 34MB
02:35 xall_ joined #git
02:36 jaguarmagenta joined #git
02:36 rewt you could try !git-filter-branch to delete them from your history, but that would change almost all of your commits
02:36 rewt man git-filter-branch
02:36 gitinfo the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
02:37 sdaugherty ^generally a bad idea, unless you absolutely *have* to remove something
02:37 mwhooker joined #git
02:37 rewt agreed
02:38 rewt 34MB shouldn't really a big deal, unless you're using floppies to transfer the repo between computers
02:38 sdaugherty unless something ridiculously massive, or extremely sensitive is in your repo,, it's better  to live with it
02:38 sdaugherty especially if others have cloned from the repository
02:39 Nysar joined #git
02:39 clemf joined #git
02:40 sdaugherty git-filter-branch is basically rewriting history, and git's designed to break completely and scream loudly when that happens.
02:41 sdaugherty linus insisted on doing it that way for sanity and security's sake
02:41 MattMaker joined #git
02:42 MattMaker joined #git
02:42 rewt what does he know... it's not like he's done anything of significance...
02:45 texinwien_ joined #git
02:45 leehambley joined #git
02:45 Luna-Solice joined #git
02:46 Grievre I really wish git had a way to comment on existing commits without changing them
02:46 sdaugherty git doesn\t but many systems built on top of git do at least
02:47 ochorocho__ joined #git
02:48 Luna-Solice left #git
02:48 dmto joined #git
02:48 kn-928 joined #git
02:50 bremner git notes
02:50 mingrammer joined #git
02:57 xall_ joined #git
02:58 stantonk joined #git
03:04 eka joined #git
03:04 ojacobson Grievre: git help notes
03:04 ojacobson oh I see bremner's on it already
03:05 hexagoxel joined #git
03:05 UTAN_dev_ joined #git
03:05 stantonk_ joined #git
03:10 leehambley joined #git
03:11 drbean joined #git
03:12 blackwell joined #git
03:14 stantonk joined #git
03:16 gusnan joined #git
03:17 inflames joined #git
03:17 k3rn31 joined #git
03:19 blackwell joined #git
03:22 k3rn31 joined #git
03:22 kus joined #git
03:22 orbitphreak joined #git
03:29 stantonk_ joined #git
03:33 mehola joined #git
03:34 Dougie187 left #git
03:36 titanium17 joined #git
03:37 clemf joined #git
03:37 denimsoft joined #git
03:40 mwhooker joined #git
03:41 nyexpress joined #git
03:41 nyexpress hey!!!
03:42 nyexpress I accidentally commited aws keys
03:42 Literphor joined #git
03:42 nyexpress I reset hard to the previous commit and force pushed.. the bad commit is gone from history. however I can still checkout the commit when I enter it manually.. and I can still see it in github when accessing directly
03:43 ojacobson They'll be on github for an undefined period of time
03:43 ojacobson issue new keys
03:43 nyexpress I did create new keys
03:43 nyexpress and it's not just github I can still manually check it out
03:43 ojacobson Sure. The offending commits will _eventually_ be garbage-collected.
03:43 ojacobson Locally, too.
03:43 nyexpress but I also had my db path and username etc
03:43 nyexpress ah ok
03:44 nyexpress I can wait it out then. Thank you sir. weird how they linger like that
03:44 ojacobson In the interim, who cares? There are lots of minor bits of unreachable data in your repo. Every time you git-add a file twice without committing between, you get some garbage. Every rebase or git commit --amend creates some garbage.
03:44 ojacobson git operations will start triggering garbage collection when there's enough trash around to matter :)
03:45 nyexpress I just didn't want someone coming across my db url
03:45 mingrammer joined #git
03:46 mingrammer joined #git
03:48 aidalgol joined #git
03:48 fstd joined #git
03:49 cyphase joined #git
03:49 xizdaqrian joined #git
03:49 cdg joined #git
03:50 dmto joined #git
03:50 durham_ joined #git
03:53 stantonk joined #git
03:55 yitz left #git
03:59 kn-928 joined #git
04:00 fuchstronaut joined #git
04:01 UTAN_dev joined #git
04:01 sanscheese joined #git
04:03 anu0 joined #git
04:04 phaleth joined #git
04:06 meloc joined #git
04:06 dsdeiz joined #git
04:11 durham joined #git
04:13 dundee joined #git
04:15 watabou joined #git
04:18 nbdy joined #git
04:20 Pulp joined #git
04:23 afusion joined #git
04:23 tmz joined #git
04:23 thiago_ joined #git
04:24 thiago_ joined #git
04:27 xameada joined #git
04:27 Gsham joined #git
04:30 Mathiasdm joined #git
04:30 Limes_ joined #git
04:33 lamba left #git
04:34 drbean_ joined #git
04:37 nnyk_ joined #git
04:42 mwhooker joined #git
04:42 ack_inc joined #git
04:42 scarabx joined #git
04:45 xall_ joined #git
04:46 shgysk8zer0 joined #git
04:46 stantonk joined #git
04:47 piling_ joined #git
04:48 ochorocho__ joined #git
04:49 Cabanoss- joined #git
04:50 dreiss joined #git
04:50 subhojit777 joined #git
04:51 dtrott joined #git
04:51 dsdeiz_ joined #git
04:52 stantonk joined #git
04:54 shgysk8zer0 joined #git
04:54 shgysk8zer0 joined #git
04:55 shgysk8zer0 joined #git
04:57 phanimahesh joined #git
05:02 stantonk joined #git
05:03 wxg joined #git
05:03 zivester joined #git
05:05 freimatz joined #git
05:08 jceb joined #git
05:08 shgysk8zer0 joined #git
05:09 PioneerAxon joined #git
05:11 nnyk_ joined #git
05:15 scarabx left #git
05:15 k3rn31 joined #git
05:18 UTAN_dev_ joined #git
05:20 tvw joined #git
05:21 satya4ever joined #git
05:21 stantonk joined #git
05:21 emPi joined #git
05:25 Mannn joined #git
05:26 Mannn I did a git "push" to my master branch, but its not showing up the github website. What steps am I missing?
05:26 zeroed joined #git
05:30 Ediz joined #git
05:30 Mannn and I am the owner of the github repo
05:31 Ediz left #git
05:31 oich joined #git
05:33 blahdodo joined #git
05:33 thiago Mannn: can't help you with the web
05:34 thiago Mannn: but check if you pushed to the correct remote
05:34 drbean joined #git
05:35 Macaveli joined #git
05:36 Mannn so to be sure, push does go to the remote, not my local working area?
05:36 thiago huh?
05:36 thiago push goes to where you told it to push
05:36 thiago only one
05:36 thiago if you told it to push to the remote, it pushed to the remote
05:36 thiago if you told it to push to ., it went to .
05:38 danimal2 joined #git
05:38 thiago what command did you type?
05:41 thiago Mannn: still around?
05:42 orbitphreak joined #git
05:43 Mannn Well. Im using the SmartGit gui, so. Im just trying various buttons until it shows up, we'll see
05:43 thiago I can't help you with any of that
05:43 stantonk joined #git
05:44 harish_ joined #git
05:44 qt-x joined #git
05:45 ikmaak joined #git
05:45 zeroed joined #git
05:45 Repox joined #git
05:46 go1111111 joined #git
05:47 wxg joined #git
05:47 danslo joined #git
05:48 nbdy joined #git
05:49 rewt joined #git
05:54 Endarked joined #git
05:54 stonerfish joined #git
05:54 ome joined #git
05:55 gargola joined #git
05:56 settermjd joined #git
05:56 mariuscc joined #git
05:56 xaa joined #git
06:00 baako joined #git
06:01 Mannn I want to delete a file from the repository, but keep it on my hard drive. I do have a .gitignore and the file name is in there, so how do I delete it only on the remote repo
06:01 fuchstronaut joined #git
06:01 lb Mannn git rm --cached <file>
06:01 lb (+ commit + push)
06:01 cyphase joined #git
06:01 thiago what lb said
06:03 Mannn thanks m8
06:04 vanch joined #git
06:04 Endarked joined #git
06:06 vanch Hello, gitos! Why the server repo has for $ git status
06:06 vanch #       deleted:    as.java
06:06 vanch and my local repo has
06:06 vanch #       new file:    as.java ?
06:06 piattino joined #git
06:07 thiago two different repositories
06:07 ribasushi joined #git
06:07 thiago are they in the same commit?
06:08 rscata joined #git
06:09 danmulvey joined #git
06:10 vanch thiago: let me see
06:10 Hi-Angel joined #git
06:14 JeroenT joined #git
06:15 vanch thiago: yes, it's the same commit and repo is one
06:15 vanch just pushed one more file
06:16 thiago you don't push files
06:16 thiago you push commits
06:16 lb vanch since when do you have a working dir on a server repo?
06:17 vanch lb: since today i assume
06:17 thiago did you push to a third repository? Did you push directly to that server? Or did you pull in the server?
06:18 UTAN_dev joined #git
06:18 lb thiago workdir on server? non-bare? his status only tells him about workdir stuff, so $commit-sha is irrelevant in this case, isn't it?
06:19 thiago lb: well, if he's not in the same commit, then what git status shows is definitely irrelevant
06:19 drbean_ joined #git
06:19 lb vanch may explain your setup a little bit and what you did to create this situation. and what you want to achieve !repro
06:19 gitinfo [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
06:19 lb thiago point taken
06:20 Faylite joined #git
06:20 oich joined #git
06:21 star_prone joined #git
06:22 thiago vanch: still around? We need you to answer the questions we ask you if you want our help.
06:22 harish_ joined #git
06:25 vanch thiago, lb: the point is i'm trying to help a newbie with git and he's limited to communication, sorry
06:26 ack_inc joined #git
06:26 tvw joined #git
06:29 vanch idk his setup for now too
06:30 vanch and the question is also: is usage of non-bare repo is a problem on server?
06:31 subhojit777 joined #git
06:31 thiago usage? no
06:31 vanch in common
06:31 thiago pushing to it? yes
06:31 vanch thiago: well, maybe this is the issue
06:32 thiago git has printed warnings about this for 10 years. It's refused to push to the branch of a checked out non-bare repository for at least 7 years.
06:32 djb-irc joined #git
06:32 thiago so your friend must have ignored some warnings and changed the default config
06:34 vanch thiago: he says that there is no warnings X_X
06:35 thiago we still don't know what the problem is
06:35 vanch thiago: understand, anyway thx for participation
06:36 thiago anyway, don't push to a non-bare repository
06:38 vanch we'll try to test bare repo
06:38 ggeneral joined #git
06:40 vanch hm, now he says that he tried bare repo and result is the same =\
06:41 neanderslob joined #git
06:42 thiago since git status doesn't work on a bare repository, we conclude one of two things: a) it's not bare; or b) there's a third repository
06:42 redman joined #git
06:43 thiago which is it?
06:43 neanderslob_ joined #git
06:44 LiohAu joined #git
06:45 mwhooker joined #git
06:45 Alienpruts joined #git
06:45 redman_ joined #git
06:46 vanch thiago: this repo is not bare but bare has been tried before this one
06:46 thiago ok, so null result because I don't trust that it was the same conditions
06:46 grift joined #git
06:47 thiago anyway, as far as I can tell right now, there's nothing wrong
06:48 thiago it's entirely possible for two repositories to be at different commits
06:48 thiago then git status shows different things
06:48 redman_ joined #git
06:48 danslo joined #git
06:49 ochorocho__ joined #git
06:49 Fijit joined #git
06:50 red_ joined #git
06:50 Sceorem joined #git
06:53 nettoweb joined #git
06:56 Balliad joined #git
06:58 adino joined #git
06:59 neca joined #git
07:01 neanderslob joined #git
07:02 star_prone joined #git
07:06 lb the world need more cookies for helper bees
07:07 vanch thiago: thx for help, i think we'll continue with bare repo and this issue will disappear
07:08 vanch lb: too ;)
07:08 danslo joined #git
07:10 neanderslob joined #git
07:10 MrMojito joined #git
07:10 MrMojito joined #git
07:13 choki joined #git
07:13 dopesong joined #git
07:13 PCatinean joined #git
07:16 Lomex joined #git
07:16 oich joined #git
07:19 jceb joined #git
07:19 drbean joined #git
07:19 TomyWork joined #git
07:19 dminca joined #git
07:20 rchavik joined #git
07:20 p4trix joined #git
07:23 danslo joined #git
07:26 danslo joined #git
07:27 jknetl joined #git
07:28 fatmarcel joined #git
07:29 ahmedelgabri joined #git
07:34 satya4ever joined #git
07:35 kurkale6ka joined #git
07:36 auzty joined #git
07:37 Alienpruts joined #git
07:38 nnyk_ joined #git
07:38 nnyk_ joined #git
07:39 King_Hual joined #git
07:43 nilg joined #git
07:44 zacts joined #git
07:45 quenode joined #git
07:46 lb !ping
07:46 gitinfo I only respond to !reply_time
07:46 clmsy joined #git
07:47 Seveas !botsnack
07:47 gitinfo Om nom nom
07:49 GavinMagnus joined #git
07:50 izabera !reply_time
07:50 gitinfo I only respond to !ECHO-REQUEST
07:50 zarubin joined #git
07:50 izabera !ECHO-REQUEST
07:50 gitinfo I only respond to !ping
07:50 izabera !pong
07:50 gitinfo PING
07:54 nnyk_ joined #git
07:55 mischat joined #git
07:56 subhojit777 joined #git
07:56 aidalgol joined #git
07:59 Sasazuka joined #git
08:01 shennyg joined #git
08:02 cstrahan joined #git
08:02 fuchstronaut joined #git
08:06 rinwa joined #git
08:06 marcogmonteiro joined #git
08:10 Novitsh_ joined #git
08:11 lmatteis joined #git
08:13 tomog999 joined #git
08:14 bongjovi joined #git
08:15 jceb joined #git
08:15 dopesong joined #git
08:16 tvw joined #git
08:16 gfixler joined #git
08:25 naught101 joined #git
08:26 Hi-Angel joined #git
08:27 tjone270 joined #git
08:27 martinkl_ joined #git
08:29 yuhlw_ joined #git
08:31 sagerdearia joined #git
08:33 Novitsh__ joined #git
08:33 jaguarmagenta joined #git
08:34 drbean_ joined #git
08:34 waveclaw joined #git
08:35 Novitsh__ left #git
08:35 Novitsh_ joined #git
08:35 ahmedelgabri joined #git
08:35 _ikke_ jantje: I see you posted your problem to the mailing list :-)
08:37 rossome joined #git
08:37 Naeblis left #git
08:38 Angs joined #git
08:39 Lomex joined #git
08:40 mahendra_ joined #git
08:41 star_prone joined #git
08:41 Angs I am using "version 2.9.2.windows.1". I have an older version of a project and want to synch with the latest master. I do "git stash" and then "git pull origin", but I still have "error: Your local changes to the following files would be overwritten by merge:
08:42 Angs ". It is my purpose that git should overwrite all the old files. Is there an option to force git to overwrite or fix/ignore the error?
08:42 GavinMagnus joined #git
08:44 matrixa1 joined #git
08:45 tjone270 joined #git
08:46 osse Angs: git status will tell you how
08:47 rark__ joined #git
08:47 mwhooker joined #git
08:47 daumie joined #git
08:48 daumie Hello guys....
08:48 gitinfo daumie: 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.
08:50 ochorocho__ joined #git
08:51 Angs osse, it says to use "git pull", but when I do it, it aborts the process because of the "Your local changes to the following files would be overwritten by merge" error http://paste.debian.net/hidden/1a257dcf/
08:51 Angs how can I ignore or fix that error
08:52 dopesong joined #git
08:52 liuzhen joined #git
08:53 acetakwas joined #git
08:55 liuzhen joined #git
08:56 _ikke_ Were / are these files normally ignored?
08:58 PioneerAxon joined #git
09:00 Lomex joined #git
09:00 mwhooker joined #git
09:00 star_pro_ joined #git
09:01 Hi-Angel joined #git
09:01 dharrigan joined #git
09:03 t0by joined #git
09:04 leeN joined #git
09:05 SimonNa joined #git
09:10 rbern joined #git
09:11 hellekin joined #git
09:11 Novitsh_ joined #git
09:12 ahmedelgabri joined #git
09:15 zacts joined #git
09:15 hellekin hello, I stumbled upon a very weird situation: *for a single repo*, git clone over http ends one week ago, while git clone over ssh is fine.
09:15 hellekin does anyone have a clue what could be happening?
09:15 canton7 "ends one week ago"?
09:15 hellekin canton7: the repo, when cloned over http, is missing a week worth of commits
09:16 canton7 who's hosting the repo?
09:16 hellekin it's self-hosted using gitweb, and it's one among a dozen
09:16 hellekin http://neo900.org/git/ee.git is the faulty one
09:17 canton7 sounds like it might be hosted over dumb http?
09:17 lb Angs you censored some of the output of git status. read your paste line 5-8
09:18 Faylite joined #git
09:18 canton7 in a repo which is served over dumb http, the http server has no intelligence. A hook needs to be run on every push, to update various metadata files which git clients need in order to figure out what commits are available
09:18 canton7 ... and you can't push to them, for much the same reason: the http server has no idea how to handle pushes
09:18 notebox joined #git
09:19 canton7 or maybe you can push to them, can't remember
09:19 canton7 smart http is vastly preferred, anyway
09:19 daumie joined #git
09:19 hellekin canton7: the pushes are made from ssh clones... I'm looking into the web server config though...
09:19 hellekin canton7: what do you mean by dumb/smart http?
09:19 fairuz joined #git
09:20 t0by joined #git
09:20 _ikke_ hellekin: Are you sure they point to the same repositories?
09:20 canton7 _ikke_, it'll be due to a lack of update-server-info I assume
09:20 hellekin _ikke_: yes.  Hold on... I think I got it...
09:20 quenode joined #git
09:20 _ikke_ canton7: right
09:20 canton7 "smart http" is a web server which uses git-http-backend, see https://git-scm.com/book/en/v2/Git-on-the-Server-Smart-HTTP for example
09:21 hellekin canton7: thanks for the pointer.  I'm gonna test a few assumptions..
09:21 canton7 "dumb http" is a web server which doesn't use git-http-backend, and just serves files. See https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols and man git update-server-info
09:21 gitinfo the git-update-server-info manpage is available at http://jk.gs/git-update-server-info.html
09:21 Angs lb, I only removed the modified files output. Here is the full output http://paste.debian.net/hidden/8426d554/ I don't understand what exactly I need to do from the git status message. I do git pull but it still outputs error and can't perform the task.
09:21 nikitasius joined #git
09:21 NwS joined #git
09:22 lb Angs the modified files are the files that cause the conflicts. and the lines 7-9 tell you how to deal with these files
09:22 _ikke_ Angs: It confused us (me)
09:22 lb after that you can do your git pull
09:23 _ikke_ One quick (and inrevertable) way to get rid of all local modifications is git reset --hard
09:23 lb Angs in case you didn't know !pull
09:23 gitinfo pull=fetch+merge (or with flags/config also fetch+rebase). It is thus *not* the opposite of push in any sense. A good article that explains the difference between fetch and pull:  http://longair.net/blog/2009/04/16/git-fetch-and-merge/
09:23 neunon joined #git
09:23 neunon joined #git
09:23 Angs lb, does it mean that those files are not needed for the newer commit versions?
09:24 Angs _ikke_ I did git reset --hard, but it didn't help, it still shows the same error
09:24 lb Angs that's for you to decide. but right now you have modies files in your workdir, therefore git wont to the pull (because of the merge conflicts with your modifications)
09:24 lb so modified files*
09:25 Anticom joined #git
09:25 albel727 joined #git
09:26 lb so either screw your changes (git reset --hard , git clean -f  or git checkout -- might help there) or you stash/commit your changes and then instead of the fast forward merge you do a normal merge (or pull)
09:26 Angs lb, is there any way to force to overwrite them? I haven't just downloaded a project file, I don't know what was done
09:26 _ikke_ Angs: What does git status say now?
09:27 Angs _ikke_ here is the output
09:27 dsdeiz joined #git
09:27 _ikke_ git merge has no force option. You have to make sure your working tree is clean before you can merge
09:27 Angs http://paste.debian.net/785307/
09:28 neca joined #git
09:28 lb Angs still line 12
09:28 dopesong joined #git
09:28 lb should if copy it here?
09:28 lb (use "git checkout -- <file>..." to discard changes in working directory)
09:28 _ikke_ lb: git reset --hard would have get rid of those
09:28 _ikke_ most of them at least
09:28 _ikke_ $ git reset --hard
09:28 _ikke_ HEAD is now at 63ddba9 Merge pull request #1169 from feshie/pr-warnings-fix
09:29 lb _ikke_ MINGW -> windows -> EOL problem?
09:29 _ikke_ yes, I was thinking about that
09:29 Zarthus git cares for EOLs?
09:29 _ikke_ git can care about them if you tell it to (which for windows it does by default)
09:30 Zarthus right.
09:30 lb Zarthus which is why you e.g. can see changes in a fresh cloned repo
09:31 lb depending on your config about eol
09:32 _ikke_ When that happens, it means someone messed up and comitted mixed EOL
09:32 hellekin canton7: here's what I gathered... The info/refs stopped being updated after a branch was merged into master on July 20th.  More commits came after on the same and subsequent days.  The NginX server redirects /git to HTTPS (so there might be a condition where internal requests break the git update-server-info).  Running git update-server-info from the repo updated the ref successfully.
09:33 canton7 hellekin, you have to edit one of the hooks so that git update-server-info is run on *every push* to the rpeo
09:33 _ikke_ git does not run that command itself
09:33 canton7 (I forget which hook it is - the man page will tell you, and the sample hook contains a call to update-server-info)
09:34 _ikke_ post-receive hook being the most likely
09:34 _ikke_ post-update
09:34 _ikke_ has it
09:34 _ikke_ exec git update-server-info
09:36 dopesong joined #git
09:37 Codfection joined #git
09:37 Novitsh_ joined #git
09:39 quenode joined #git
09:39 lb Angs if you don't care about your changes, maybe throwing away the local repo and doing a fresh clone is an option for you?
09:39 hellekin thank you!  I suppose all repositories exported to HTTP should have this or they will fail sooner or later.  Interestingly it happened in very specific conditions: different user, merging to master.  All other repos never had this issue so far.  Thanks for the help and the fix!
09:39 k3rn31 joined #git
09:39 lb even though if you have mixed EOL commit in the repo, your problem wont be gone, just postponed
09:41 dopesong joined #git
09:41 wxg joined #git
09:41 canton7 hellekin, all *dumb http* repositories, yes. Almost all http repositories are smart http, which doesn't have this problem
09:42 rasto joined #git
09:45 Angs lb, I received my project from texas instruments that they ported a github project into IAR, when I replace the files with fresh clone, I am having problem with the compiler. I wanted to try to update the code with git pull, but I don't know what they did so that I always have an error. I think I will just keep the current version of the project. Thanks for the help
09:45 lb Angs but check for !eol
09:45 gitinfo The option/attribute to use when you need to care about different line-endings in your file: https://help.github.com/articles/dealing-with-line-endings/
09:46 lb Angs if that's the problem, dos2unix will help with that
09:46 lb `dos2unix`
09:48 ryez joined #git
09:49 phanimahesh joined #git
09:49 Angs lb, thanks. Is it enough to run "git config --global core.autocrlf true" ?
09:50 _ikke_ it would be false
09:50 _ikke_ not true
09:50 lb Angs if there is something wrong right now, use dos2unix (or unix2dos whatever your desired destination is) to fix the current situation. for the future you can use the config option.
09:51 Angs thank you lb, _ikke_
09:52 hellekin canton7: thanks for the precision
09:52 lb _ikke_ the github tut speaks of setting it to true for windows users.... depends on the desired state i guess
09:52 settermjd joined #git
09:53 jast IMO autocrlf is a terrible misfeature
09:54 _ikke_ lb: Right, but if it's causing problems, it obviously already is enabled
09:54 lb right -.-
09:54 lb both of you
09:55 jast honestly, the best option would have been to default to text for all files and force people to set attributes for binary files
09:56 jast or make auto the default :(
09:56 spudowiar joined #git
09:57 Zarthus windows needs to get rid of \r already :P
09:58 _ikke_ and OSX needs to switch to
09:58 _ikke_ \\n
09:58 sdothum joined #git
09:59 PioneerAxon joined #git
09:59 phanimahesh joined #git
10:02 g5pw _ikke_ OSX uses \n AFAIK
10:02 mwhooker joined #git
10:02 _ikke_ It uses \r
10:02 _ikke_ Oh
10:02 fuchstronaut joined #git
10:02 _ikke_ They switched
10:03 _ikke_ ignore me then
10:04 hellekin \o
10:04 hellekin left #git
10:04 g5pw yup, since OSX actually
10:05 g5pw Mac OS 9 had \r
10:06 lb everybody else should embrace the true \r
10:07 ryez what is "true \r"? (late to the party)
10:07 jast fools, \a is the only way
10:07 jast weird line endings
10:07 Zarthus _ikke_: \r is legacy osx, like 10 years ago
10:08 _ikke_ Zarthus: Yeah, I found out
10:08 Zarthus only windows is lagging behind
10:08 Zarthus it still interprets \n fine in most software, but tools like notepad.exe still don't work properly
10:09 _ikke_ Yeah, but most editors still use \r\n by default
10:09 Sceorem joined #git
10:11 rbern joined #git
10:11 lb software like *.exe still don't work proberly
10:13 fahadash joined #git
10:15 irco joined #git
10:16 Macaveli joined #git
10:16 qsx Zarthus: not legacy os x.  only mac os classic.  os x is a unix and always had \n
10:21 tvw joined #git
10:21 moei joined #git
10:29 spudowiar joined #git
10:29 yoan joined #git
10:37 livingstn joined #git
10:41 achadwick joined #git
10:42 JeroenT joined #git
10:43 dsdeiz joined #git
10:43 WizJin joined #git
10:43 flopsec joined #git
10:44 ahmedelgabri joined #git
10:47 pcre joined #git
10:49 freimatz joined #git
10:50 danslo joined #git
10:50 ochorocho__ joined #git
10:56 cdown joined #git
10:57 Novitsh_ joined #git
11:02 ams__ joined #git
11:03 dopesong joined #git
11:03 rbern joined #git
11:03 mwhooker joined #git
11:05 Urbany joined #git
11:06 GavinMagnus joined #git
11:06 GavinMagnus left #git
11:07 LiohAu joined #git
11:07 Lvjasha joined #git
11:10 ThomasLocke joined #git
11:10 ThomasLocke joined #git
11:16 dopesong joined #git
11:16 rnsanchez joined #git
11:17 ojdo joined #git
11:17 GavinMagnus joined #git
11:18 HoierM joined #git
11:20 wrouesnel2 joined #git
11:23 arand joined #git
11:24 mweshi joined #git
11:24 hellcook joined #git
11:24 hellcook Hi
11:25 mweshi joined #git
11:27 mweshi joined #git
11:27 dopesong_ joined #git
11:28 _ikke_ ohai
11:29 mweshi joined #git
11:30 lb !hi
11:30 gitinfo [!welcome] Welcome to #git, a place full of helpful gits. If you have a question,  feel free to just go ahead and ask—somebody should answer shortly.  For more info on this channel, see http://jk.gs/git/  Take backups (type !backup to learn how) before taking advice.
11:30 mweshi joined #git
11:30 nnyk_ joined #git
11:31 johnmilton joined #git
11:31 Lomex joined #git
11:32 Sasazuka joined #git
11:32 mweshi joined #git
11:34 mweshi joined #git
11:36 Lvjasha joined #git
11:36 drbean joined #git
11:38 stonerfish joined #git
11:38 Lomex joined #git
11:39 satbyy joined #git
11:42 JeroenT joined #git
11:44 StarWarsFan joined #git
11:44 StarWarsFan hi@all
11:44 gitinfo StarWarsFan: 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.
11:45 StarWarsFan i have a very strange issue with git cherry picking
11:45 StarWarsFan and at the moment no idea where the problem is
11:45 StarWarsFan in the beginning the following situation:
11:45 StarWarsFan i have a clone which is up2date, no changes, nothing to commit or push
11:46 StarWarsFan now i add a remote, fetch it's content and cherry-pick a commit from this remote
11:46 StarWarsFan the problem is as follows:
11:46 neca joined #git
11:47 StarWarsFan the commit contains changes on files, which where removed on the current clone sometime ago
11:47 StarWarsFan so for these files i got the message "deleted by us: <file>"
11:47 StarWarsFan so far, so good
11:47 StarWarsFan but now the problem:
11:47 StarWarsFan there are a lot of modifications on _other_ files now!
11:48 StarWarsFan and i have no idea, where these modifications came from
11:48 StarWarsFan any ideas on how to dig into this or what could be the problem?
11:48 _ikke_ and git diff <commit>~1 <commit> does not show those changes?
11:48 _ikke_ (where <commit> is the cherry-picked commit)
11:49 StarWarsFan exactly
11:50 StarWarsFan tested with git 2.1.4 on babun (cygwin, windows) and 2.8.2 (centos)
11:50 Lvjasha joined #git
11:52 MadHatter42 joined #git
11:52 _ikke_ What kind of changes are these?
11:52 mcqr joined #git
11:52 StarWarsFan content on .classpath files is changed
11:52 M-shine joined #git
11:53 StarWarsFan ...
11:53 StarWarsFan -   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
11:53 StarWarsFan +   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
11:53 StarWarsFan ...
11:54 StarWarsFan the desired commit contains only such changes on round about 25 such files
11:55 StarWarsFan the content of these files is identical
11:55 StarWarsFan but the files which the commit will modify do no longer exist on the current clone
11:55 StarWarsFan but other .classpath files where modified with these changes
11:56 StarWarsFan let me count the amount...
11:56 _ikke_ if you do git log --all -p <modified file>, do you see a commit that introduces this change?
11:56 griffindy joined #git
11:57 Sceorem joined #git
11:57 synthroid joined #git
11:57 StarWarsFan no
12:00 cbreak StarWarsFan: git show commit shows what changed in the commit, and what you'd cherry-pick
12:01 cbreak (where commit is the hash of the commit you want)
12:01 cbreak cherry-pick should not get you any changes other than those
12:01 cbreak StarWarsFan: are you sure you haven't opened some dumb GUI program that changed all those files
12:02 StarWarsFan yes i'm sure because it happens on our CI and i reproduced it on my local system
12:02 StarWarsFan and no, i do not use gui tools ;-)
12:02 wxg joined #git
12:03 fuchstronaut joined #git
12:03 anu1 joined #git
12:03 StarWarsFan that's exactly why i'm here. i have no further idea why this happens
12:04 cbreak so git show doesn't show the changes?
12:04 StarWarsFan right
12:04 cbreak do they show up as conflicting in git status after cherry-pick?
12:04 StarWarsFan no, they show up as "modified"
12:05 StarWarsFan the cherry-pick itself fails because of the modified files, which do no longer exist on the clone
12:05 mwhooker joined #git
12:05 StarWarsFan that's ok so far
12:05 StarWarsFan but the changes on files which are not modified by the cherry-picked-commit, that's the problem
12:06 Macaveli joined #git
12:07 StarWarsFan before the cherry-pick:
12:07 StarWarsFan { rcs-dbahn-result } master » git status
12:07 StarWarsFan On branch master
12:07 StarWarsFan Your branch is up-to-date with 'origin/master'.
12:07 StarWarsFan It took 2.48 seconds to enumerate untracked files. 'status -uno'
12:07 StarWarsFan may speed it up, but you have to be careful not to forget to add
12:07 StarWarsFan new files yourself (see 'git help status').
12:07 StarWarsFan nothing to commit, working directory clean
12:07 StarWarsFan the cherry-pick:
12:08 StarWarsFan { rcs-dbahn-result } master » git cherry-pick -Xtheirs --no-commit 37789eb1f6a30b85eec9b76160a47da01d66e4bf
12:08 StarWarsFan error: could not apply 37789eb... RCSPF-27642: LTA StandardVMType auf Java 8 umstellen. PAIR: RWEI
12:08 StarWarsFan hint: after resolving the conflicts, mark the corrected paths
12:08 StarWarsFan hint: with 'git add <paths>' or 'git rm <paths>'
12:08 StarWarsFan and now git status gives me the following:
12:08 cbreak StarWarsFan: it shouldn't fail
12:08 cbreak if it fails, then there should be conflicts
12:09 StarWarsFan { rcs-dbahn-result } master » git status
12:09 StarWarsFan On branch master
12:09 StarWarsFan Your branch is up-to-date with 'origin/master'.
12:09 StarWarsFan Changes to be committed:
12:09 StarWarsFan (use "git reset HEAD <file>..." to unstage)
12:09 StarWarsFan modified:   ch.sbb.rcsd.server.function.betriebslagekern.test/.classpath
12:09 StarWarsFan ... ~30 other files here
12:09 StarWarsFan modified:   de.db.idis.server.transfer/.classpath
12:09 StarWarsFan Unmerged paths:
12:09 StarWarsFan (use "git reset HEAD <file>..." to unstage)
12:09 StarWarsFan (use "git add/rm <file>..." as appropriate to mark resolution)
12:09 StarWarsFan deleted by us:   ch.sbb.lta.archiv/.classpath
12:09 StarWarsFan ... ~20 other files here
12:09 StarWarsFan deleted by us:   ch.sbb.lta.preprocessor.test/.classpath
12:09 StarWarsFan It took 2.42 seconds to enumerate untracked files. 'status -uno'
12:09 StarWarsFan may speed it up, but you have to be careful not to forget to add
12:09 StarWarsFan new files yourself (see 'git help status').
12:09 StarWarsFan { rcs-dbahn-result } master »
12:10 StarWarsFan everything on "Changes to be committed" is wrong, everything on "Unmerged paths" is right
12:10 _ikke_ Those changes need to come from somewhere though
12:11 canton7 StarWarsFan, it's easier to read if you use a pastebin :)
12:11 StarWarsFan blocked by company firewall :-(
12:12 _ikke_ gist.github.com too?
12:12 Twirl joined #git
12:12 tomtom52 left #git
12:13 xkr47 just register totallylegit.space and use that :)
12:14 dopesong joined #git
12:14 PioneerAxon joined #git
12:15 vuoto joined #git
12:15 crose joined #git
12:16 rwb joined #git
12:17 dopesong_ joined #git
12:17 M-mistake joined #git
12:17 M-meznak joined #git
12:18 dopeson__ joined #git
12:19 wrouesnel2 joined #git
12:19 StarWarsFan got it:
12:19 StarWarsFan https://gist.github.com/anonymous/38dee81077776eda1452cc7cbf75954e
12:20 drbean_ joined #git
12:21 StarWarsFan the commit contains all the changes on "unmerged paths", everything else is wrong
12:21 jceb joined #git
12:21 holodoc joined #git
12:22 rgrinberg joined #git
12:22 qt-x joined #git
12:22 rgrinberg joined #git
12:24 MTecknology left #git
12:24 SourTrout joined #git
12:26 StarWarsFan any ideas?
12:28 cbreak StarWarsFan: git show --stat 37789eb1f6a30b85eec9b76160a47da01d66e4bf
12:29 lb vomitb.in is also cool
12:29 StarWarsFan cbreak: refresh the git page
12:29 StarWarsFan cbreak: refresh the gist page
12:30 dopesong joined #git
12:31 cbreak is the commit you want to cherry-pick a merge?
12:31 StarWarsFan interesting: the amount of files on the cherrypick is the same as the amount of modified files
12:32 StarWarsFan but a subset of them are the wrong files
12:32 StarWarsFan cbreak: no, it's not a merge
12:33 cbreak StarWarsFan: maybe the rename detection screwed up
12:33 cbreak are the files really similar?
12:33 StarWarsFan yes
12:33 cbreak if so, git might think they are the same file, but moved
12:33 vanch left #git
12:33 StarWarsFan they are all the same because the whole project is build with at once
12:34 StarWarsFan -with
12:34 jimi_ joined #git
12:34 cbreak so you have dozens of copies of the same file?
12:35 StarWarsFan find . -name .classpath | wc -l
12:35 StarWarsFan 552
12:36 StarWarsFan and on the repo from which i want to cherry pick:
12:36 cbreak not sure how to disable rename detection
12:36 cbreak maybe -M100%
12:36 StarWarsFan 830
12:37 Rodya_ joined #git
12:37 darkpassenger joined #git
12:38 darkpassenger Hi, I've got several commits (including pulling master into my branch locally, before committing) and I'd like to keep all my changes but reduce the number of pushed commits (i dont mind forcing it) what do ?
12:39 darkpassenger colleagues suggest smartgit but im more comfy with the command line
12:39 cbreak darkpassenger: git rebase -i @{u}
12:39 cbreak you can squash commits
12:39 darkpassenger literally @{u} ?
12:39 cbreak it'll also rebase onto your upstream, so the merges will vanish
12:39 LeMike joined #git
12:39 cbreak yes
12:39 cbreak you can write an upstream branch too if you want
12:40 cbreak i.e. master
12:40 LionsMane joined #git
12:40 darkpassenger so being on my branch, i simply go with git rebase -i @{u} ?
12:40 darkpassenger what does it mean ?
12:40 darkpassenger im sorry , noob here
12:41 _ikke_ git rebase -i -> interactive rebase
12:41 _ikke_ @{u] -> remote tracking branch for the current branch
12:41 cbreak if you want to rebase on master, use master instead of @{u}
12:41 sagerdearia joined #git
12:41 darkpassenger so then i only have to commit and push ?
12:41 cbreak no
12:42 cbreak if you type that, you'll get to fill out a schedule
12:42 darkpassenger what's a schedule?
12:42 cbreak you'll see
12:42 yqt joined #git
12:42 _ikke_ git calls it a todo list
12:43 darkpassenger what does it imply
12:43 cbreak you'll see
12:43 darkpassenger dont want to mess my code up :/
12:43 cbreak then tag it
12:43 cbreak make sure everything is committed
12:43 cbreak so if something is not as you want, reset back to the tag
12:44 Alienpruts joined #git
12:45 dopesong joined #git
12:45 darkpassenger the todo list is to select the commits i want to squash ?
12:45 spudowiar joined #git
12:46 cbreak it selects what to do with them
12:46 cbreak pick means "take the commit as it is"
12:46 cbreak deleting the line means "drop the commit"
12:46 cbreak changing pick to something else does something else with the commit
12:46 cbreak i.e. squash squashes it into the previous commit
12:47 darkpassenger if you pick all the commits you'll end up having the same thing you have now, right ?
12:47 darkpassenger so i'll have to squash
12:48 martinkl_ joined #git
12:49 darkpassenger it makes me nervous lol
12:49 sanketdg joined #git
12:50 dimi1947 joined #git
12:50 darkpassenger so is git rebase -i @{u} the same as git rebase -i origin/branch_name~#commits branch_name ?
12:51 fmcgeough joined #git
12:51 ochorocho__ joined #git
12:52 StarWarsFan cbreak: makes no difference if i use "-M100%" on the cherry pick :-(
12:52 StarWarsFan result is the same
12:54 osse StarWarsFan: -M100% means that git will require files to be (near) identical
12:54 osse not that it's very lenient
12:55 osse oh, that was the intention. never mind
12:55 averell joined #git
12:55 cbreak osse: intention was to turn it off
12:55 cbreak but I don't know how to do that
12:56 plasticle joined #git
12:57 osse it's off by default, isn't it?
12:57 osse maybe --no-find-renames. I think git implicitly accepts a --no-foo for all --foo
12:57 StarWarsFan http://web.mit.edu/jhawk/mnt/spo/git/git-doc/git-log.html says:
12:57 StarWarsFan The default similarity index is 50%.
12:58 JeroenT joined #git
12:58 sobersabre joined #git
12:58 StarWarsFan osse: i will try --no-find-renames
12:59 p4trick joined #git
12:59 StarWarsFan osse: hm, seems to be an unknown suboption to git cherrypick
13:01 dtrott joined #git
13:01 p4trick joined #git
13:03 crater2150 joined #git
13:06 mwhooker joined #git
13:08 yuhlw_ joined #git
13:08 p4trix joined #git
13:09 airdisa joined #git
13:09 Gsham joined #git
13:10 bongjovi joined #git
13:10 CodeCruncher joined #git
13:10 darkpassenger ok
13:10 ExoUNX joined #git
13:10 darkpassenger @{u} says theres no upstream set
13:11 darkpassenger i guess this is for a branch
13:11 darkpassenger not for master
13:12 zivester joined #git
13:12 ExoUNX joined #git
13:13 mikecmpbll joined #git
13:15 osse darkpassenger: @{u} by itself = HEAD@{u} = the upstream of the current branch, whatever that may be
13:15 Schrostfutz joined #git
13:15 Schrostfutz Hi, I might have accidentally run sed on a git repository. Is there a way to check the repositories integrity?
13:15 grawity git fsck; git status
13:16 grawity well, mostly git fsck
13:16 nettoweb joined #git
13:16 osse that's what you get for using find . instead of git ls-files amirite!!!
13:17 Schrostfutz osse: I used find . -type f -exec sed -i 's/foo/bar/g' {} \;
13:17 Schrostfutz grawity: fsck reports 3 "dangling blob"s
13:18 kyan joined #git
13:18 grawity probably leftovers of a `git commit --amend`; ignore those
13:18 osse Schrostfutz: you might have gotten lucky
13:18 LionsMane joined #git
13:19 theelous3 joined #git
13:19 Schrostfutz grawity: okay. So I can be sure everything is okay? Because the sed modified my source files, I tried it also with a print and it matched objects inside the .git directory
13:20 osse lucky = nothing inside .git had "foo" in it
13:20 theelous3 ello ello. I cloned a repo using "git clone 'url'", made my changes, and I'm trying to figure out how to pull request
13:21 osse https://help.github.com/articles/using-pull-requests/
13:21 theelous3 do I have to create a repo on my own git first?
13:21 osse yes
13:21 theelous3 alrighty :)
13:21 theelous3 just wasn't sure if I could skip that part
13:21 theelous3 ty
13:21 osse well... *technically* you can host it somewhere else, anywhere the maintainer can see it, and then send him an email and request him to pull
13:27 spriz joined #git
13:27 lb well but that's not what a PR in guthub terms means :D "if it's not clickable in the browser and overthrown with JS 'n shit it doesn't deserve to exist'
13:27 jeffreylevesque joined #git
13:31 fairuz joined #git
13:31 rnsanchez_ joined #git
13:32 leeN joined #git
13:34 stantonk joined #git
13:34 k3rn31 joined #git
13:35 arand joined #git
13:36 spudowiar joined #git
13:38 jaafar joined #git
13:39 Gsham joined #git
13:39 WizJin joined #git
13:39 flopsec joined #git
13:39 xpk joined #git
13:40 Urbany joined #git
13:40 Lomex joined #git
13:41 rominronin joined #git
13:43 SourTrou_ joined #git
13:43 spriz joined #git
13:45 danslo joined #git
13:45 tabrez joined #git
13:47 fuchstronaut joined #git
13:48 fuchstronaut joined #git
13:49 wxg joined #git
13:49 stantonk joined #git
13:50 Dougie187 joined #git
13:51 phaleth joined #git
13:52 dtrott left #git
13:53 xergiopd joined #git
13:55 Gsham joined #git
13:55 xergiopd hi all, may I ask a question about a git hook?
13:56 HedgeMage ask!
13:56 HedgeMage err, !ask
13:56 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.
13:56 HedgeMage That ^^^ never ask to ask on IRC, just come out with what you need help with, in detail :)
13:56 HedgeMage It makes support-givers' lives much easier.
13:57 spudowiar HedgeMage: what if we're on #ask
13:57 spudowiar :P
13:57 HedgeMage spudowiar: You're difficult. ;)
13:57 spudowiar I am
13:57 HedgeMage spudowiar: That's okay, difficult is part of your charm. :)
13:57 spudowiar I know
13:58 * HedgeMage wonders whether xergiopd knows that NOT asking a question will cause the channel to continue to be subjected to this banter of questionable wittiness.
13:58 spudowiar HedgeMage: want incite into my brain...?
13:58 spudowiar https://twitter.com/spudowiar/status/757274274952544256
13:58 spudowiar https://twitter.com/spudowiar/status/757635723252105216
13:58 settermjd joined #git
13:59 HedgeMage lol
13:59 xergiopd ok thx, this is my question :) is it possible to check in a hook what action was made? example, a have a post-merge hook that i want to do something only on merge action, but atm it trigger on pull request and the next merge request. btw I only need to check what action was made, is there a variable?
13:59 spudowiar damn, we have to like.. be helpful
14:00 spudowiar xergiopd: when you say "pull request"..? you mean GitHub pull request?
14:00 * spudowiar hopes not :)
14:01 spudowiar HedgeMage: thx4folloe
14:01 spudowiar *follow
14:01 spudowiar damn you have many followers
14:01 HedgeMage xergiopd: The easiest way to find out if a hook was run is to cause the hook script itself to log or otherwise notify you.  Are you talking about GitHub, or a regular server, or something else?
14:01 HedgeMage spudowiar: Yeah, we don't know what's wrong with them. ;)
14:01 fuchstronaut joined #git
14:01 spudowiar lol
14:02 naf hi, i have a question...: let's say i have a team using git for version control and one person on the team deletes a directory within the project and pushes that. Then, another team member pulls those changes and pushes his/her changes up, including the directory that the other team member deleted... this is a problem
14:02 naf is there some kind of best practice for this rather than telling everybody to clone the next version of the repo rather than pull?
14:03 HedgeMage brb, phone
14:03 selckin fairly sure this should just work
14:03 alcohol famous last words?
14:04 spudowiar naf: it will probably just have a merge conflict
14:04 spudowiar naf: then the guy who tried to push his changes up will have to deal with that
14:04 xergiopd yes, before merge two branches i need a pull request, im talking about a regular server. the hook trigger and its ok, but i need to know if there is a way to check what action was made, something like this to know the branch name [branch_name=$(git rev-parse --symbolic --abbrev-ref $refname)]
14:05 Darcidride joined #git
14:05 GodGinrai joined #git
14:06 satbyy joined #git
14:06 drbean joined #git
14:07 FuzzySockets joined #git
14:07 mwhooker joined #git
14:08 courrier joined #git
14:09 ramsub07 joined #git
14:10 ramsub07 hello, while opening a PR to upstream/master from origin/mybranch, what is a head fork  and what is a base fork ?
14:12 HedgeMage naf: so it sounds like either the team member who deleted the directory did an 'rm' instead of 'git rm', so it wasn't actually deleted, or the team member who re-introduced it made a mistake while resolving the merge that should have happened when they pulled.
14:13 ResidentBiscuit joined #git
14:13 HedgeMage naf: There are some tools that can simplify the latter bit for new git users, but the former is just a matter of training...it helps if you go through the history and find out which failure mode happened.
14:13 leehambley joined #git
14:15 d^sh joined #git
14:15 naf ohhhhhh right
14:15 naf git rm rather than rm
14:15 naf thank you
14:15 HedgeMage np
14:16 stoopkid joined #git
14:17 neca joined #git
14:17 WizJin joined #git
14:23 jstein_ joined #git
14:24 crose joined #git
14:24 bsanford joined #git
14:25 Alienpruts joined #git
14:27 notebox joined #git
14:29 HedgeMage xergiopd: You can write lines into your hook script to log anything you want, and there's a list of variables available in the man pages, if that's what you are asking.
14:30 HedgeMage xergiopd: But I'm not 100% sure I parsed your question effecctively.
14:30 NeverDie joined #git
14:31 The_Phoenix joined #git
14:32 Gonzo89 joined #git
14:35 starkhalo joined #git
14:37 Schrostfutz joined #git
14:37 charginghawk joined #git
14:38 xergiopd ok im trying to check if $action is pull or merge but with no result ^_^'
14:38 star_prone joined #git
14:38 JeroenT joined #git
14:38 charginghawk via git hooks, is it possible to make it so you can only create tags off of master?
14:38 King_Hual joined #git
14:38 King_Hual joined #git
14:39 xergiopd and i didn't find a git variable like "GIT_ACTION"
14:40 dmto joined #git
14:47 stantonk joined #git
14:47 fission6 joined #git
14:50 mikecmpbll joined #git
14:51 stantonk joined #git
14:52 moritz xergiopd: shouldn't you instead check if the merge is a fast-forward merge or not?
14:52 ochorocho__ joined #git
14:53 tvw joined #git
14:53 xergiopd no, btw merge or pull is my personal example, in general is there a way to store in a variable the action like merge pull push...?
14:54 RedneckDonut joined #git
14:55 moritz I don't know; but you shouldn't base behavior on the action that the user called
14:55 moritz that destroys composability
14:57 [cust] joined #git
14:57 ack_inc joined #git
14:59 sangy joined #git
14:59 chigang_ joined #git
15:00 axl_ joined #git
15:02 diegoviola joined #git
15:02 govg joined #git
15:02 kyan joined #git
15:05 xergiopd ok thx HedgeMage and moritz
15:05 HedgeMage np
15:05 xergiopd bb
15:05 Jellyg00se joined #git
15:08 BlackPanx joined #git
15:09 fahadash joined #git
15:09 armyriad joined #git
15:09 RedneckDonut joined #git
15:11 afiskon joined #git
15:12 clemf joined #git
15:12 InfoTest joined #git
15:15 patarr joined #git
15:15 Alienpruts joined #git
15:17 MACscr joined #git
15:18 MACscr joined #git
15:19 thiago joined #git
15:20 IWishIKnew joined #git
15:21 stealthii joined #git
15:22 stealthii when creating multiple 'fixups', the second one - should I mark it as a fixup to the previous fixup, or the original commit?
15:22 kbs joined #git
15:23 chll_ joined #git
15:23 tyreld joined #git
15:23 selckin think both will work
15:23 kedare joined #git
15:24 zivester joined #git
15:25 Slush- joined #git
15:25 dreiss joined #git
15:26 subhojit777 joined #git
15:26 madewokherd joined #git
15:29 iota_pi joined #git
15:31 ash_workz joined #git
15:33 dtrott joined #git
15:35 spaceone can i commit directly into a new branch?
15:35 bipolar joined #git
15:36 GodGinrai spaceone: you mean make changes on master and then commit them, but on a brand new branch?
15:36 selckin you swap branches without commiting and then "directly" commit into it, or i don't understand the questiion
15:36 clemf joined #git
15:37 perlpilot maybe he means, stay on branch A, but commit to branch B?
15:37 GodGinrai perlpilot: that's what I was suggesting
15:37 perlpilot GodGinrai: ah, indeed.  I didn't quite read it that way.
15:37 selckin then swap back after
15:38 perlpilot spaceone: more information is required for you to get a good answer :)
15:38 GodGinrai selckin: generally, you should not swap branches with unstashed changes
15:38 selckin GodGinrai: bullshit
15:39 GodGinrai that's how you dirty other branches
15:39 GodGinrai because you forget you have modifications
15:39 selckin define dirty
15:39 ahmedelgabri joined #git
15:39 selckin lol
15:39 selckin how will stashing help
15:39 perlpilot selckin: it helps only in hiding the modifications
15:40 GodGinrai because when you switch from branch A to B after stashing, you will get B as you expect it
15:40 Slush- joined #git
15:40 GodGinrai instead of with changes that you carried over from your work on A
15:40 perlpilot but ... if that's what you're actually trying to do (commit your changes to a different branch), then I don't see the problem.
15:40 selckin the whole point is to forward the changes
15:41 yaiyan joined #git
15:41 GodGinrai perlpilot: if he made the changes on one branch, then why would he want the other files in the branch to be different?  The correct way would be `git stash; git stash branch newbranch; git commit -a`
15:42 selckin you're wrong
15:42 perlpilot GodGinrai: What does "made the changes on one branch" mean here?  You make changes in your working dir.  They aren't "on a branch" until you commit.  And that's what we're talking about here last time I checked
15:43 GodGinrai perlpilot: let's say you have branch A, with files Aa, Ab, and Ac
15:43 GodGinrai and branch B with files Aa, Ab', and Ac
15:43 spaceone GodGinrai: perlpilot: i work a lot on different bugs at the same time. currently i always stash changes but this in not maintainable anymore
15:43 GodGinrai where ' represents a different file
15:43 GodGinrai now, you have made changes on A
15:43 spaceone so i git add --patch . some things and want to commit them into a new branch
15:44 GodGinrai so you have Aa, Ab, and Ac'
15:44 GodGinrai selckin: is suggesting is to checkout B
15:44 GodGinrai which will give you Aa, Ab', Ac'
15:44 GodGinrai and commit
15:44 GodGinrai which is different than Aa, Ab, Ac'
15:45 clemf joined #git
15:45 [cust] joined #git
15:45 pR0Ps joined #git
15:45 perlpilot so ... you're worried about committing the non-changes?
15:46 GodGinrai spaceone: if you're doing a complex commit like that, it might be easier to make the commit, then `git branch newbranch`, then `git reset HEAD~1`
15:46 EvilPenguin joined #git
15:46 oich joined #git
15:46 weckl joined #git
15:46 GodGinrai perlpilot: no, I'm worried about committing changes on a fundamentally different branch
15:47 Ravana joined #git
15:47 leehambley joined #git
15:48 cdg joined #git
15:48 danslo joined #git
15:48 ahmedelgabri joined #git
15:48 perlpilot GodGinrai: the only changes in your example were to Ac -> Ac'.  It doesn't matter that Ab is different in branch A vs branch B as that didn't change (in either branch).
15:48 elfuego joined #git
15:49 spaceone perlpilot: GodGinrai: alright, i will stick to git ci; git cob foo; git co master; git rebase -i HEAD~1 + remove the last commit
15:49 perlpilot GodGinrai: When you said "<GodGinrai> which will give you Aa, Ab', Ac'", in my head I was thinking, "yes, exactly as intended"
15:49 elfuego is there a way to ignore certain file when pulling from upstream? my origin and upstream package has a package.json file that keep conflicting when I pull from upstream.
15:50 GodGinrai perlpilot: Ac could have code that relies on Ab.  If you commit changes in branch B expecting Ab to work like it did in branch A, then you are committing untested changes
15:50 Slush- joined #git
15:51 gargola joined #git
15:51 perlpilot GodGinrai: sure, but "expecting Ab to work like it did in branch A" was never established.  That's something you have to be aware of from the beginning
15:51 GodGinrai spaceone: that'll probably work
15:51 spaceone yes, but it takes a lot of time ...
15:52 PabloR joined #git
15:52 GodGinrai perlpilot: But remember that spaceone asked how to commit into a *new* branch, not a different one.  So it wasn't implied that he would need to be aware of this, because he wasn't expecting different files.
15:52 synthroid joined #git
15:53 MattMaker joined #git
15:53 GodGinrai spaceone: `git branch newbranch` removes the need of having to checkout a new branch and then checkout master again.
15:54 spaceone jeah :)
15:54 spaceone ok, i'm on holidays now. bye :)
15:55 synthroi_ joined #git
15:56 LeBlaaanc joined #git
15:56 lindenle joined #git
15:57 choki joined #git
15:57 fairuz joined #git
15:57 Darren_ joined #git
15:59 Gsham joined #git
15:59 synthroid joined #git
15:59 Electrometro joined #git
16:00 Faylite joined #git
16:04 daumie254 joined #git
16:05 cdown_ joined #git
16:05 Silenced_v2 joined #git
16:06 diogenese joined #git
16:06 drbean_ joined #git
16:07 stantonk joined #git
16:09 Alienpruts joined #git
16:09 jknetl joined #git
16:10 f3r70rr35f joined #git
16:11 mwhooker joined #git
16:11 zacts joined #git
16:11 elfuego joined #git
16:15 vassagus joined #git
16:15 skul joined #git
16:19 Silenced_v2 joined #git
16:20 pcre joined #git
16:21 Gitzilla joined #git
16:22 robotroll joined #git
16:23 gajus a person made a PR against my repository
16:24 gajus can push changes against the branch?
16:24 gajus (to update the PR)
16:24 bb010g joined #git
16:25 gajus ie. does that branch reside on my repository or the person's who is making the PR?
16:26 synthroi_ joined #git
16:26 Jellyg00se joined #git
16:27 durham joined #git
16:28 blackwind_123 joined #git
16:28 rinwa joined #git
16:28 HoierM joined #git
16:28 elfuego joined #git
16:29 GavinMagnus left #git
16:29 shinnya joined #git
16:29 PabloR New to git here. I’m reading that `git branch --track <newBranch> <origin/branch>` adds a local branch that tracks a remote branch. And that `git checkout -b <newBranch> <origin/branch>` creates a new local branch based off a remote branch. To me sounds like they do the same thing, both create a new local branch, one tracking and the other based off of a remote branch. What's the difference?
16:29 jimi_ joined #git
16:30 ckubrak joined #git
16:30 kbs gajus: github I assume? their branch is in their copy of your repository, and they can only update that branch, not a branch within your repository.
16:30 PabloR And I got voice privilege by mistake. How do I get rid of it?
16:31 gajus uh
16:31 gajus but I can raise a PR against their's branch
16:31 gajus that will do
16:31 ansimation joined #git
16:31 kbs gajus: sorry, I don't understand your question
16:32 kbs probably will also have better luck in #github for github specific items
16:33 fuchstronaut joined #git
16:33 PabloR left #git
16:33 PabloR joined #git
16:35 ckubrak Hi guys, I can't push because "hint: Updates were rejected because the remote contains work that you do" but I've already deleted all files from the Repo with git -rm, commit and push
16:36 aep-shoutlet joined #git
16:36 Codfection joined #git
16:37 silverdust left #git
16:37 st0opkid joined #git
16:37 harish_ joined #git
16:38 ajf- joined #git
16:38 SteffanW joined #git
16:39 kbs git uses commit history, rather than files to know what's different. so a completely empty repo can have different commit ids, depending on how it became empty; and you'll still need to share that history before you can push to it (unless you force, etc)
16:40 zarel joined #git
16:41 ckubrak kbs: how can I delete git commit history for only one repo?
16:41 kbs if it's not shared with anyone else, you shoud be able to force push - look up man page on git-push --force
16:42 Glooomy joined #git
16:43 LionsMane joined #git
16:45 rgrinberg joined #git
16:47 emPi joined #git
16:47 daumie joined #git
16:48 daumie joined #git
16:48 danslo joined #git
16:48 vassagus joined #git
16:49 rinwa_ joined #git
16:49 daumie joined #git
16:50 vassagus joined #git
16:51 PabloR Anybody on my question on what's the difference between the 2 commands?
16:52 durham joined #git
16:53 liuzhen joined #git
16:53 ResidentBiscuit PabloR: The first command just creates the branch. The second command creates it and checks it out
16:53 ochorocho__ joined #git
16:53 _ikke_ PabloR: Another difference is that the first sets up tracking information, and the last not
16:53 vassagus joined #git
16:54 WayToDoor joined #git
16:54 ResidentBiscuit I thought both setup tracking?
16:54 kyan joined #git
16:55 PabloR ResidentBiscuit _ikke_ So if I follow the 1st command with a checkout would be similar to the 2nd command except for the tracking info?
16:55 _ikke_ PabloR: checkout also know --track
16:55 kadoban joined #git
16:55 _ikke_ knows
16:56 bipolar joined #git
16:56 mingrammer joined #git
16:56 eijk joined #git
16:57 PabloR Let see if I got it. 1st command followed by checkout is then exactly the same as the 2nd command?
16:58 ckubrak kbs: Thanks, I've read the docs and it worked
16:58 _ikke_ PabloR: git branch --track <new_branch> <remote/branch> && git checkout <new_branch> === git checkout -b --track <new_branch> <remote/branch>
16:58 eijk joined #git
16:59 durham joined #git
17:00 PabloR thanks guys
17:00 durham joined #git
17:01 yoan joined #git
17:01 johnmilton joined #git
17:03 dreiss joined #git
17:04 Literphor joined #git
17:04 crose joined #git
17:05 adino joined #git
17:05 drbean joined #git
17:05 chrisshattuck joined #git
17:06 choki joined #git
17:07 TomyLobo joined #git
17:09 eijk_ joined #git
17:09 vassagus joined #git
17:09 jeffreylevesque_ joined #git
17:10 rinwa__ joined #git
17:11 texinwien_ joined #git
17:11 sagerdearia joined #git
17:12 mwhooker joined #git
17:13 Orion3k joined #git
17:14 EduardoMartins joined #git
17:15 yoan_ joined #git
17:15 jeffreylevesque_ joined #git
17:16 BryzNSTY joined #git
17:17 reynhout joined #git
17:19 johnmilton joined #git
17:20 orbitphreak joined #git
17:21 quesera joined #git
17:22 dhollinger joined #git
17:24 aguimaraes1986 joined #git
17:24 charginghawk joined #git
17:24 quesera Hello, I have a simple (possibly dumb) question. On a new branch, I create a few files. The new files do not show up in "git status" or "git diff" while still on the new branch, but if I switch back to master, they are visible there. Do I misunderstand branching that badly?
17:24 vassagus joined #git
17:26 k3rn31 joined #git
17:26 cdown joined #git
17:27 hoe` left #git
17:27 _ikke_ Are they ignored on that branch by chance?
17:28 IWishIKnew joined #git
17:28 rinwa_ joined #git
17:29 vassagus joined #git
17:30 quesera _ikke_, Hmm, yes that explains at least part of it (new files added were extracted from a tar, and the .gitignore came along with it)
17:30 mostlybadfly joined #git
17:30 sto0pkid joined #git
17:30 quesera thanks, I feel a bit less crazy now. :)
17:31 ulkesh joined #git
17:32 _ikke_ :-)
17:32 _ikke_ What part does it not explain then?
17:33 vassagus joined #git
17:33 Angs joined #git
17:34 quesera Well, I'm creating a new repo, with the intent that all code lives on branches. I do the init, and then an initial commit with a README. Then I make the new branch and switch to it. Then untar the existing source and commit that. All good so far...
17:35 quesera Then when I switch back to master, there are two visible new directories (from the tar). They are also in the branch, but the bleed to master surprised me. The other 30 or so directories are not visible in master and are not ignored.
17:35 _ikke_ As long as things are not comitted, they do not belong to any branch
17:35 drbean_ joined #git
17:35 quesera I see, so they show up in master even if added while in the branch?
17:36 f3r70rr36f joined #git
17:37 Motoko joined #git
17:37 ulkesh joined #git
17:37 troglotit joined #git
17:37 vassagus joined #git
17:38 RedneckDonut joined #git
17:38 kadoban quesera: git doesn't track directories, it only tracks files in directories. And if something isn't tracked, it's not on any branch what-so-ever, it's not associated with them at all.
17:38 quesera I did commit the full expanded tar file, but now that I think of it it's possible that the .gitignore was matching a subdir or regex that didn't show up when I grepped the file. I think that would explain all of my confusion. I thought there was nothing special about master, it was just a default label
17:39 kadoban Also !float could be going on, possibly? It's hard to tell.
17:39 gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
17:39 kadoban quesera: There is indeed nothing special about master except it being the default default branch.
17:39 quesera kadoban, ah, OK. So it's not "safe" to jump between branches willy-nilly? Is that the floating condition?
17:40 Hello71 !tree
17:40 gitinfo [!subtree] The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo.
17:40 Hello71 nope
17:40 Hello71 !working
17:40 gitinfo [!doesntwork] Sorry to hear it doesn't work, but how about some details? At this point we don't even know whether it did nothing, spit out an error message, or abducted your pet unicorn in a flying saucer. That makes it hard to troubleshoot – unicorn abduction requires a completely different solution than an error message, for instance. So, please be specific...
17:40 * Hello71 grumbles
17:40 kadoban quesera: I mean it's safe to change branches, it'll yell at you if it would lose work. But it might not be matching your model of what you think should be going on?
17:41 hahuang61 joined #git
17:41 Hello71 read !index
17:41 gitinfo The index (or cache, or staging area) is one of git's most central concepts. Read http://git-scm.com/book/en/Getting-Started-Git-Basics "The Three States", and e.g. http://tomayko.com/writings/the-thing-about-git for some cool things it can help you do.
17:41 quesera kadoban, OK, that's fair. :) I was expecting uncommitted changes to sit in the branch I left them
17:41 Noldorin joined #git
17:41 vassagus joined #git
17:42 Silenced joined #git
17:42 Silenced joined #git
17:42 kadoban quesera: Right, uncommited changes aren't on a branch at all, so that'd be why.
17:42 quesera kadoban: OK, mental model recalibrating.. Thanks for your help.
17:42 sarbs joined #git
17:43 kadoban 'welcome. And yeah I remember that being really confusing at first too, so it's not just you.
17:43 Lvjasha joined #git
17:44 eijk_ joined #git
17:44 thiago_ joined #git
17:45 quesera kadoban: branches don't seem like an obscure corner of git, but I'm a little ashamed to say that I've been using git productively for about ten years without internalizing that distinction. :) Thank you again!
17:46 vassagus joined #git
17:47 Lomex joined #git
17:49 kulelu88 joined #git
17:49 kulelu88 joined #git
17:49 yitz joined #git
17:49 jstimm joined #git
17:49 yitz Is there a way to preview what diff a `git pull` would do?
17:49 vassagus joined #git
17:50 GodGinrai yitz: `git fetch; git diff HEAD origin/branch`
17:50 yitz Thanks
17:50 GodGinrai np
17:52 vassagus joined #git
17:53 vuoto joined #git
17:54 Arban joined #git
17:54 lindenle joined #git
17:57 romerocesar joined #git
17:58 RedShift joined #git
17:58 RedneckDonut joined #git
17:59 dreiss joined #git
17:59 pwnz0r joined #git
17:59 _ikke_ yitz: git pull = git fetch + git merge (by default)
17:59 vassagus joined #git
18:00 jstimm joined #git
18:01 yitz _ikke_: Thanks. I googled pull vs fetch :)
18:02 stantonk joined #git
18:03 mweshi joined #git
18:03 dopesong joined #git
18:03 burtons_ joined #git
18:05 elastix joined #git
18:05 mweshi joined #git
18:06 Literphor joined #git
18:06 paul424 joined #git
18:07 subsonic joined #git
18:07 fission6 joined #git
18:08 subsonic I have a submodule that is pointing to a hash,  how can i see which branch that hash was on?
18:08 kulelu88 joined #git
18:08 sbeller subsonic: git tag --contains for tags
18:09 sbeller git branch --contains exists as well
18:09 optraz joined #git
18:10 mwhooker joined #git
18:10 subsonic sbeller: so `git tag --contains 2.1.0` where 2.1.0 is the tag?
18:10 lb subsonic git branch --contains <sha>
18:11 sbeller yeah the sha1 is the argument
18:11 subsonic what's interesting is the submodule was set to a tag, but when you go back into the submodule it just shows the sha
18:12 sbeller that's by design as sha1s cannot change. tags (and certainly branches) can be changed at a later time
18:12 emPi joined #git
18:12 subsonic ahh, good point
18:12 sbeller so you would not know if it was tampered with (good or bad)
18:13 subsonic git branch --contains 3575f1b
18:13 subsonic * (detached from 3575f1b)
18:13 subsonic master
18:13 subsonic So that means it was part of master?
18:14 mattwildig joined #git
18:15 zhodge joined #git
18:17 jwmann joined #git
18:18 Sucks joined #git
18:19 skalpin does anyone know of a good article that helps guys move from tfs to git?
18:19 axl_ left #git
18:19 l4v2 joined #git
18:22 Sucks joined #git
18:22 ochorocho__ joined #git
18:23 SwiftMatt joined #git
18:23 star_prone joined #git
18:24 lindenle joined #git
18:24 _ikke_ First google hit: https://github.com/git-tfs/git-tfs/blob/master/doc/usecases/migrate_tfs_to_git.md
18:24 fairuz joined #git
18:25 kaldoran joined #git
18:25 cyphase joined #git
18:26 kfunk joined #git
18:26 Sasazuka joined #git
18:29 lindenle joined #git
18:32 skalpin no
18:32 perlpilot no?
18:32 skalpin I want something that helps people understand distributed source control
18:32 skalpin not a tool to migrate repositories
18:32 settermjd joined #git
18:32 codezomb joined #git
18:33 skalpin my developers don't get git and I keep getting git questions like "how do I check this in?"
18:33 perlpilot skalpin: then they don't necessarily need to understand TFS -> git, just git.  Maybe have them read the progit book?
18:33 perlpilot skalpin: maybe have them watch "git for ages 4 and up"?
18:33 skalpin is that a video? hahaha
18:33 codezomb joined #git
18:34 MattMaker joined #git
18:34 fuchstronaut joined #git
18:34 lindenle joined #git
18:34 acetakwas joined #git
18:35 Cooler216 joined #git
18:38 lindenle joined #git
18:40 _ikke_ !books
18:40 gitinfo [!book] There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
18:40 _ikke_ !video
18:40 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 (Jesica Kerr: Git basics, descriptional)
18:42 MattMaker joined #git
18:52 liuzhen joined #git
18:53 fmcgeough joined #git
18:53 _riz_ joined #git
18:55 _riz_ am I right in thinking files created by "git format-patch" should apply directly with "git am"?   I'm getting an error I don't understand from a patch that does actually apply with "git apply"
18:55 Silenced_v2 joined #git
18:55 Silenced_v2 joined #git
18:56 _riz_ bah. it introduced whitespace changes. Grrr.  I wonder how that happened
18:56 _riz_ left #git
18:57 barajasfab joined #git
19:01 circ-user-eCksJ joined #git
19:04 stoopkid joined #git
19:05 vassagus joined #git
19:06 rgrinberg joined #git
19:06 st0opkid joined #git
19:06 Literphor joined #git
19:07 TinkerTyper joined #git
19:08 sto0pkid joined #git
19:08 fission6 joined #git
19:12 dmto joined #git
19:12 griffindy joined #git
19:13 LiohAu joined #git
19:13 vassagus joined #git
19:14 l4v2 say I have four files and I want to give each of them their own -m what is a easy way to do this?
19:15 yitz for i in a b c d; do git add "$i"; commit -m "$i"; done
19:16 grawity you can do `git commit [-m <message>] <filename...>`
19:16 l4v2 thanks grawity and yitz
19:18 tjone270_ joined #git
19:18 Walex joined #git
19:19 SwiftMatt joined #git
19:20 tjone270__ joined #git
19:21 GenZai joined #git
19:22 star_prone joined #git
19:23 gtt joined #git
19:24 jknetl joined #git
19:24 dmto joined #git
19:24 dtrott joined #git
19:25 shinnya joined #git
19:25 _ikke_ 5
19:25 Darren_ joined #git
19:26 vuoto joined #git
19:27 LeBlaaanc joined #git
19:27 burtons joined #git
19:27 dmto joined #git
19:27 piling joined #git
19:28 harish_ joined #git
19:28 Darren_ joined #git
19:31 gtt left #git
19:32 gtt joined #git
19:32 Literphor joined #git
19:33 gtt left #git
19:34 dmto joined #git
19:34 vuoto joined #git
19:36 dsdeiz joined #git
19:36 dsdeiz joined #git
19:36 drbean joined #git
19:36 dreiss joined #git
19:36 shader joined #git
19:39 jason237 joined #git
19:43 buhocfoch joined #git
19:44 PioneerAxon joined #git
19:44 nwkj86 joined #git
19:45 jstimm joined #git
19:45 cfoch joined #git
19:45 Mannn joined #git
19:46 cfoch if I change a file name and I commit, will "git blame" will keep the author of all the lines? or will it tell  every line was modified by I ?
19:47 grawity the lines themselves were not modified, so
19:47 grawity I think it's supposed to follow renames, if both files are "similar enough"
19:47 Finnoloid joined #git
19:48 nnyk_ joined #git
19:49 kadoban You specify when you look up history how hard you want git to look for renames and whatever.
19:50 mingrammer joined #git
19:52 sapiens_vector joined #git
19:52 Gitzilla joined #git
19:53 vuoto joined #git
19:55 dsdeiz_ joined #git
19:56 RustyShackleford joined #git
19:57 axl__ joined #git
19:57 Gsham joined #git
19:58 meinteil joined #git
19:58 meinteil WHat happens if you do "git add ." when you have stuff to remove? stuff that says deleted
19:58 meinteil will it be the same as "git rm ."?
19:59 sagerdearia joined #git
19:59 kadoban meinteil: Did you try it?
19:59 kadoban meinteil: Also look at -A
19:59 bunniez joined #git
19:59 GodGinrai no, because `git rm .` would remove everything in the parent directory
20:00 GodGinrai s/parent/current
20:00 akiva joined #git
20:00 jason237 joined #git
20:01 bunniez hello, i have a situation where two repo's on my machine both have a remote with the same url, which is an ssh remote with the same user (that is, both remotes start with ssh://user@....), and on one repo, it asks me for a password for user on pull/push, but on the other it does not ask. it is not SUPPOSED to ask because i have the key for that user in my home directory. can anyone recommend troubleshooting steps to figure out why one of the repo'
20:05 netj joined #git
20:05 nilg joined #git
20:06 vassagus joined #git
20:07 kadoban bunniez: Are you using the usual ssh-agent? Like do you run 'ssh-add' once when you log in or so?
20:08 kadoban bunniez: Also ... check that the URLs are *exactly* the same I guess. Otherwise ... I mean there's not really much possibility for those to act differently.
20:09 dking_desktop joined #git
20:09 vuoto joined #git
20:10 stantonk joined #git
20:10 tgunr joined #git
20:10 vuoto joined #git
20:11 vuoto joined #git
20:11 stantonk joined #git
20:12 kyan joined #git
20:14 Literphor joined #git
20:15 netj joined #git
20:17 mwhooker joined #git
20:18 Gsham joined #git
20:18 Kicer86 joined #git
20:18 fstd joined #git
20:20 p4trix joined #git
20:21 dstarh joined #git
20:26 griffindy joined #git
20:27 fuchstronaut joined #git
20:28 eijk joined #git
20:28 Limes_ joined #git
20:28 vuoto_ joined #git
20:28 bket joined #git
20:30 dopesong joined #git
20:30 christoph joined #git
20:30 ochorocho__ joined #git
20:31 eijk joined #git
20:32 autoboxer joined #git
20:34 sangy joined #git
20:34 mwlang joined #git
20:34 bunniez kadoban, thx the URLs are *exactly* the same as you say, and i'm afraid i don't know what you mean about the ssh-add. the linux server that i ssh to is administered by someone else. on the repo that does not prompt me for password, i've been pullin and pushin just fine for a while without having to use any ssh commands
20:35 mwlang I accidentally merged a feature branch to master that I meant to merge to my develop branch.  How do I reset the master branch back?  Nothing was auto-committed since there were lots of conflicts.
20:36 _ikke_ git merge --abort
20:36 vuoto joined #git
20:37 mwlang _ikke_: ah, there we go.  that solved it.  thanks
20:37 _ikke_ 6yw
20:38 GodGinrai mwlang: quick, get him to answer 5 more questions!
20:38 GodGinrai :P
20:38 fstd joined #git
20:39 _ikke_ lol
20:39 mwlang GodGinrai: :-D
20:39 GodGinrai bunniez: I'd check the git config for each repo and see if there is any difference.
20:39 GodEater joined #git
20:39 GodEater joined #git
20:41 yitz What's the correct way to fetch the commit at HEAD ?
20:42 _ikke_ !HEAD
20:42 gitinfo HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is *not* something that exists separately for every branch. It also is *not* necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)
20:42 _ikke_ git fetch <remote> will fetch everything from the remote
20:42 fairuz joined #git
20:42 yitz What's the correct way to tell what commit HEAD is refering to?
20:42 GodGinrai yitz: are you trying to just figure out what the most recent commit on your branch is?
20:43 GodGinrai yitz: `git show HEAD`
20:43 vuoto joined #git
20:43 perlpilot yitz: maybe `git rev-parse HEAD` if you just need the SHA1
20:44 RustyShackleford joined #git
20:45 mingrammer joined #git
20:46 yitz GodGinrai: Yes. Thank you
20:46 GodGinrai np :)
20:48 MattMaker joined #git
20:50 Gsham joined #git
20:50 zeroed joined #git
20:51 waveclaw joined #git
20:51 aidalgol joined #git
20:52 RedneckDonut joined #git
20:54 m0viefreak joined #git
20:55 sagerdearia joined #git
20:58 vuoto joined #git
20:59 starkhalo joined #git
21:01 leehambley joined #git
21:01 mwhooker joined #git
21:03 ajf- joined #git
21:03 kyan joined #git
21:04 Gsham joined #git
21:10 ghoti joined #git
21:12 mikecmpbll joined #git
21:14 star_prone joined #git
21:16 k3rn31 joined #git
21:16 arescorpio joined #git
21:16 star_prone joined #git
21:17 paul424 joined #git
21:18 spudowiar joined #git
21:18 WaReZ joined #git
21:18 stantonk joined #git
21:22 texinwien_ joined #git
21:22 Sucks joined #git
21:24 fairuz joined #git
21:25 NeXTSUN joined #git
21:25 Sucks joined #git
21:26 stantonk joined #git
21:26 dmarr joined #git
21:26 atrus joined #git
21:26 burtons joined #git
21:26 SleePy joined #git
21:26 SleePy joined #git
21:27 SegFaultAX joined #git
21:27 Wind0r joined #git
21:28 fuchstronaut joined #git
21:30 adino joined #git
21:31 ochorocho__ joined #git
21:35 starkhalo joined #git
21:35 zaccanasta joined #git
21:35 spudowiar joined #git
21:36 thoraxe joined #git
21:37 zaccanasta i cloned a project that's at version 16.11.70, I'd like to build it at version 16.04.2
21:38 osse zaccanasta: 'git tag', find the tag that corresponds to your chosen version, 'git checkout {thatthing}', then build
21:38 zaccanasta there's a tag v16.04.2 so i did: git checkout -b new v16.04.2
21:38 nnyk joined #git
21:38 shader left #git
21:38 zaccanasta so "new" branch is at 16.04.2, isn't it?
21:38 osse yes
21:39 mingrammer joined #git
21:39 zaccanasta but i see version 16.11.70
21:39 osse see it where?
21:40 zaccanasta infact after building it there's a library ending with .so.16.11.70
21:40 _ikke_ Do you need to run some configure or build steps first?
21:41 _ikke_ zaccanasta: what does git describe return?
21:41 zaccanasta the correct tag: v16.04.2
21:41 zaccanasta it uses cmake
21:42 osse maybe there's some faulty thing that makes it use the output of 'git tag' or something
21:42 osse the above checkout command is definitely correct. after that git is sort of out of the picture
21:42 zaccanasta and there's a version.in.h
21:42 osse (unless git status says differently)
21:42 osse yeah maybe that's not properly cleaned or something
21:42 SourTrout joined #git
21:43 zaccanasta i guess i'll start from an empty build again
21:44 Dougie187 left #git
21:44 zaccanasta even starting from scratch cmake creates a version.h with 16.11.70 in it
21:45 osse what does git status say
21:46 zaccanasta i'm on branch new, i've modified few files and added few others
21:46 zaccanasta let me check if that version number is hardcoded in the files i modified
21:46 ajf- joined #git
21:47 osse if you recognize the changed you've made and they're sane then cmake might be at fault
21:48 wxg joined #git
21:48 zaccanasta yeah my fault, i brought with me the modified file
21:49 mwhooker joined #git
21:49 zaccanasta so if i checkout -- thatfile git will bring the v16.04.2 version
21:50 zaccanasta yeah good, sorry guys
21:52 ulkesh joined #git
21:55 Mannn joined #git
21:59 rolha joined #git
22:01 sinisa joined #git
22:07 drbean_ joined #git
22:09 disi joined #git
22:09 sinisa left #git
22:10 lindenle joined #git
22:10 dmto joined #git
22:11 Vgr_ joined #git
22:11 zacts joined #git
22:11 sagerdearia joined #git
22:14 leeN joined #git
22:15 joki joined #git
22:17 MattMaker joined #git
22:18 LeBlaaanc joined #git
22:20 MattMaker joined #git
22:20 ulkesh joined #git
22:20 King_Hual joined #git
22:20 King_Hual joined #git
22:20 meinteil WHat happens if you do "git add ." when you have stuff to remove? stuff that says deleted. is it the same result as "git rm filepath"?
22:21 drbean joined #git
22:22 jeffreylevesque joined #git
22:24 netj joined #git
22:25 kadoban meinteil: You asked forever ago ... it'd take you like 12 seconds to try it and see. Did you look up the option I suggested, and what it does?
22:25 kbs meinteil: should be, try it and see I guess :)
22:26 MattMaker joined #git
22:29 Pyrogerg joined #git
22:29 ulkesh joined #git
22:33 cyphase joined #git
22:35 elfuego joined #git
22:35 mingrammer joined #git
22:35 romerocesar joined #git
22:35 d5sx43 joined #git
22:37 adino joined #git
22:37 elfuego joined #git
22:40 githogori joined #git
22:41 t0by joined #git
22:42 IWishIKnew joined #git
22:42 Atlantic777 joined #git
22:42 Atlantic777 joined #git
22:42 starkhalo joined #git
22:43 jeffreylevesque joined #git
22:45 madewokherd joined #git
22:46 stantonk joined #git
22:46 ajf- joined #git
22:46 Nethereal joined #git
22:47 Nethereal hey, i have a local copy of a repository - i've moved a bunch of files into newly created subdirs, deleted some, and changed some other things. whats the command to push all my changes back to the repo on github?
22:49 causasui joined #git
22:49 causasui joined #git
22:51 steveoh joined #git
22:51 steveoh i committed some a sensitive file to my local git
22:51 steveoh along with like 20 other files. how can i remove that one file from the commit?
22:51 f3r70rr35f joined #git
22:52 yitz I think you can git rm and git commit --amend ... but I'm not positive
22:52 steveoh its like 10 commits back in my history
22:53 kbs steveoh: you may find git-filter-branch useful (I learnt about this only recently, so not super familiar with it but seems the most appropriate)
22:53 PresidentBiscuit joined #git
22:53 Nethereal how can i resynch a whole local git to the master on github?
22:54 steveoh i'm trying filter branch kbs but i can't get the path to the file correctly for it to pick it up
22:54 steveoh do you remember how you set your file
22:54 _ikke_ Nethereal: Just a matter of pushing the right branches
22:54 steveoh the path to it
22:54 Nethereal not quite sure i follow
22:55 Nethereal i have 1 master , no branches, i just git add files as i create them
22:55 Nethereal now ive moved a bunch of stuff into various subdirs
22:55 _ikke_ Did you commit those changes?
22:55 King_Hual joined #git
22:55 Nethereal no
22:55 _ikke_ Then you should
22:56 Nethereal how do i 'commit' the fact that i moved a file into a subfolder?
22:56 red_ joined #git
22:56 _ikke_ Basically remove it from the old dir, and add it to the new dir
22:57 Nethereal i've basically completely reorganized my project in my local copy of the master
22:57 Nethereal i just want to push everything back in an overwrite fashion
22:57 bremner why overwrite? just push the commits
22:57 a3Dman joined #git
22:57 Nethereal when i push, nothing changes
22:58 Nethereal the files remain in the root of the git master
22:58 _ikke_ Nethereal: You first need to commit
22:58 Nethereal i did commit...
22:58 steveoh i think i had my slashes the wrong way kbs
22:58 _ikke_ Nethereal: What does git status say?
22:59 Nethereal i have a bunch of "Changes not staged for commit"
22:59 Nethereal and some untracked files
22:59 _ikke_ Then stage those changes and add the untracked files you want to commit
22:59 snowkidind joined #git
22:59 Nethereal if i add a folder, does it automatically add all subfiles?
23:00 _ikke_ yes
23:00 kbs steveoh: glad you found the solution :)
23:01 mwhooker joined #git
23:02 rolha joined #git
23:04 tgunr joined #git
23:06 Nethereal thanks for the hints guys
23:06 Nethereal all sorted now, and learned a little more about git
23:06 Nethereal much appreciated
23:06 Nethereal (_ikke_, bremner)
23:08 _ikke_ yw
23:09 jstimm joined #git
23:09 javajoe joined #git
23:11 ash_workz joined #git
23:14 Mannn joined #git
23:15 inflames joined #git
23:16 diegoviola joined #git
23:17 vassagus joined #git
23:17 _ikke_ reedit of pro git 2nd edition: https://drive.google.com/open?id=0B-Llso12P94-Ujg5Z1dhWUhhMm8
23:18 _ikke_ (unofficial)
23:19 Gitzilla joined #git
23:20 diegoviola joined #git
23:20 f3r70rr35f joined #git
23:20 inflames joined #git
23:22 kbs _ikke_: How is that different from the v2 at https://git-scm.com/book/en/v2 ?
23:23 ffabi joined #git
23:23 _ikke_ "There are too many to summarize. Some are of the type that the proofreader should have caught, and others are my attempt to clarify things."
23:25 kbs Oh, interesting, thanks. (the 2nd edition name in both caught me by surprise.)
23:26 disi joined #git
23:26 kbs oh, it's parsed "re-edit" - that makes more sense to me now, d'oh
23:27 ajf- joined #git
23:27 _ikke_ :-)
23:29 fuchstronaut joined #git
23:29 Derperperd joined #git
23:30 mingrammer joined #git
23:31 ajf- joined #git
23:33 mellernoia joined #git
23:33 ochorocho__ joined #git
23:36 shgysk8zer0 joined #git
23:36 drbean_ joined #git
23:42 naught101 joined #git
23:43 JeremyD joined #git
23:43 JeremyD joined #git
23:44 stantonk joined #git
23:47 PioneerAxon joined #git
23:50 mwhooker joined #git
23:51 SleePy joined #git
23:51 SleePy joined #git
23:52 infernix joined #git
23:53 drbean joined #git
23:53 SourTrout joined #git
23:58 Rodya_ joined #git
23:59 jimi_ joined #git

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