Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-25

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

All times shown according to UTC.

Time Nick Message
00:01 kerrick joined #git
00:01 j416 here's one (the?) reason that it is possible to sign commits https://git-blame.blogspot.se/2011/11/helping-kernel-workflow.html
00:02 j416 unfortunately, kbs left, perhaps he will find this message, or not.
00:02 j416 anyway, it's there for the record if anyone has interest.
00:04 kerrick joined #git
00:05 rubyonrailed joined #git
00:05 arahael joined #git
00:06 ffabi joined #git
00:07 armyriad joined #git
00:08 mehola joined #git
00:09 Doginal joined #git
00:12 fornax joined #git
00:13 rominronin joined #git
00:13 Somelauw joined #git
00:13 iron74 joined #git
00:13 Somelauw How can I do 'git help init.templatedir'?
00:14 kerrick joined #git
00:14 Somelauw oh, i see, i just do git help init
00:15 Doginal hey, I have a branch that I have push upstream, and then I think I made the misktate of checking out a new branch from the original branch (not master) and have pushed that upstream, if i merge the latest branch, will git automatically know that first branch/commits have been merged?
00:17 arescorpio joined #git
00:20 cdg joined #git
00:22 Eugene I can't come up with a witty Brexit pun
00:22 Eugene brex-git?
00:24 rewt what? they'll stop using git too?
00:26 Somelauw Brexcommit
00:27 Somelauw Brerrypick
00:30 mangolisk_ joined #git
00:31 romerocesar joined #git
00:31 mingrammer joined #git
00:35 englishstudent joined #git
00:35 tenc joined #git
00:36 wagle joined #git
00:45 jaguarmagenta joined #git
00:47 Rikairchy joined #git
00:49 dmto joined #git
00:50 fstd_ joined #git
00:54 kerrick joined #git
00:56 k3rn31 joined #git
00:58 SimonNa joined #git
01:01 romerocesar joined #git
01:02 jeffreylevesque joined #git
01:04 dopesong joined #git
01:05 dopesong_ joined #git
01:06 thiago joined #git
01:08 ntonjeta joined #git
01:09 ahmedelgabri joined #git
01:10 docnvk joined #git
01:12 rgrinberg joined #git
01:13 kerrick joined #git
01:14 rominronin joined #git
01:15 shinnya joined #git
01:15 dopesong joined #git
01:19 _rnsanchez_ joined #git
01:23 nick123 joined #git
01:26 xaviergmail joined #git
01:29 tenc joined #git
01:29 taylorm joined #git
01:29 Lynxium joined #git
01:34 taylorm joined #git
01:35 kerrick joined #git
01:37 ejb joined #git
01:38 livingstn joined #git
01:40 boombatower joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and plumbing advice | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Remember to keep your porcelain clean
01:49 eletuchy_ joined #git
01:50 pks joined #git
01:52 eletuchy joined #git
01:54 rubyonrailed joined #git
01:55 eletuchy_ joined #git
01:57 eletuch__ joined #git
02:00 b1tchcakes joined #git
02:01 eletuchy joined #git
02:03 duarteper joined #git
02:03 eletuchy_ joined #git
02:03 mehola joined #git
02:04 duarteper hi
02:04 gitinfo duarteper: 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:04 dunpeal joined #git
02:05 d0nn1e joined #git
02:07 eletuchy joined #git
02:10 eletuchy_ joined #git
02:11 livingstn joined #git
02:12 eletuch__ joined #git
02:13 ImJune joined #git
02:14 Dougie187 joined #git
02:14 eletuchy joined #git
02:15 rominronin joined #git
02:17 ciroecn joined #git
02:17 bdb-me joined #git
02:17 eletuchy_ joined #git
02:18 lalilulelo joined #git
02:22 eletuchy joined #git
02:24 kerrick joined #git
02:24 sanketdg joined #git
02:24 allcentury joined #git
02:24 eletuch__ joined #git
02:28 eletuchy joined #git
02:30 samson joined #git
02:32 eletuchy_ joined #git
02:34 cyphase joined #git
02:34 Literphor joined #git
02:35 ruskie joined #git
02:36 eletuchy joined #git
02:37 hexagoxel joined #git
02:38 eletuchy_ joined #git
02:40 kerrick joined #git
02:41 boudicca joined #git
02:42 mrat joined #git
02:43 hombero joined #git
02:46 justanotheruser joined #git
02:46 jaguarmagenta joined #git
02:46 cyphase joined #git
02:48 chachasmooth joined #git
02:49 elementalest joined #git
02:49 xaviergmail joined #git
02:53 taylorm joined #git
02:54 FuzzySockets joined #git
02:58 taylorm joined #git
02:58 Guest26 joined #git
02:58 Guest26 left #git
02:59 cyphase joined #git
03:00 kerrick joined #git
03:00 kbs joined #git
03:00 eletuchy joined #git
03:03 LeBlaaanc joined #git
03:03 taylorm joined #git
03:07 hahuang61 joined #git
03:07 Goplat joined #git
03:08 taylorm joined #git
03:09 ahmedelgabri joined #git
03:13 taylorm joined #git
03:14 Rikairchy joined #git
03:14 cyphase joined #git
03:15 tristanp joined #git
03:16 rominronin joined #git
03:16 srcerer_ joined #git
03:18 taylorm joined #git
03:18 SpeakerToMeat joined #git
03:20 nivag When I tried to compile git, after doimng a git pull, I got:
03:20 nivag ERROR: Can't create 'blib/lib/auto'
03:20 nivag Do not have write permissions on 'blib/lib/auto'
03:21 k3rn31 joined #git
03:21 gigq joined #git
03:21 nivag never had that error before, & have been compiling git since before 2.7
03:23 kasper93_ joined #git
03:23 taylorm joined #git
03:24 nick123 joined #git
03:25 ome joined #git
03:28 Sucks joined #git
03:28 taylorm joined #git
03:32 Dougie187 left #git
03:33 taylorm joined #git
03:34 Literphor joined #git
03:37 githogori joined #git
03:37 hhee joined #git
03:38 taylorm joined #git
03:39 xorox90 joined #git
03:39 xall joined #git
03:41 hk238 joined #git
03:43 xaviergmail joined #git
03:43 taylorm joined #git
03:46 mischat joined #git
03:46 dmto joined #git
03:48 inflames joined #git
03:48 taylorm joined #git
03:49 cyphase joined #git
03:49 SwiftMatt joined #git
03:49 xorox90 joined #git
03:51 nellicus_ joined #git
03:51 m1dnight1 joined #git
03:53 lownin joined #git
03:53 taylorm joined #git
03:55 rubyonrailed joined #git
03:56 Literphor joined #git
03:57 m1dnight_ joined #git
03:58 taylorm joined #git
03:59 Lyqyd joined #git
04:03 taylorm joined #git
04:06 xorox90 joined #git
04:07 m1dnight_ joined #git
04:07 hahuang61 joined #git
04:08 adino joined #git
04:08 taylorm joined #git
04:09 romerocesar joined #git
04:10 Literphor joined #git
04:13 taylorm joined #git
04:13 netj joined #git
04:17 rominronin joined #git
04:18 taylorm joined #git
04:20 newlifer_ joined #git
04:21 Literphor joined #git
04:23 allcentury joined #git
04:23 taylorm joined #git
04:26 LeBlaaanc joined #git
04:28 ki0 joined #git
04:28 hombero_ joined #git
04:28 taylorm joined #git
04:28 eletuchy joined #git
04:29 githogori joined #git
04:31 LeBlaaan_ joined #git
04:32 Codfection joined #git
04:33 taylorm joined #git
04:34 davisonio joined #git
04:34 LeBlaaanc joined #git
04:34 jungsubk joined #git
04:37 piattino joined #git
04:38 taylorm joined #git
04:38 LeBlaaanc joined #git
04:40 thiago nivag: have you checked the write permissions on that dir, by the user you're using?
04:43 taylorm joined #git
04:47 jaguarmagenta joined #git
04:48 taylorm joined #git
04:49 hombero joined #git
04:50 nivag thiago, they've not been changed - I'm the only using the box  (Fedora 23 fully up-to-date)
04:53 taylorm joined #git
04:54 romerocesar_ joined #git
04:54 nivag thiago, Hmm... checked, they had got changed to root
04:54 xorox90 joined #git
04:54 hahuang61 joined #git
04:55 phaleth joined #git
04:57 xorox9079 joined #git
04:57 nivag thiago, must have been when I executed   'make install install-doc install-html'   as root, as part my bash script, was not expecting script to change permissions like that!!!
04:58 nivag thiago, thanks for suggesting that I check!!!
04:58 taylorm joined #git
04:58 Cabanossi joined #git
04:59 Sonderblade joined #git
05:01 njbair joined #git
05:03 robotroll joined #git
05:03 taylorm joined #git
05:05 jimjim joined #git
05:06 jimjim left #git
05:10 romerocesar joined #git
05:10 ahmedelgabri joined #git
05:10 xorox9079 joined #git
05:11 ki0 joined #git
05:12 Electrometro joined #git
05:15 davisonio joined #git
05:18 rominronin joined #git
05:19 Guest26 joined #git
05:20 sauvin joined #git
05:25 nick123 joined #git
05:27 mkelly joined #git
05:29 cyphase joined #git
05:31 mkelly_ joined #git
05:38 feignix joined #git
05:40 xaviergmail joined #git
05:40 howdoi joined #git
05:42 jetpack_joe joined #git
05:43 fracting1 joined #git
05:44 DistantStar joined #git
05:46 fracting1 joined #git
05:47 DistantStar joined #git
05:49 fracting1 joined #git
05:50 subhojit777 joined #git
05:50 fracting joined #git
05:54 fracting joined #git
05:54 Guest26 left #git
05:55 jason237 joined #git
05:56 rubyonrailed joined #git
05:57 hhee joined #git
05:57 fracting joined #git
05:58 david joined #git
05:59 zumba_addict joined #git
06:01 fracting joined #git
06:03 fracting joined #git
06:04 UTAN_dev joined #git
06:05 taylorm joined #git
06:06 fracting joined #git
06:08 fracting joined #git
06:10 anddam left #git
06:10 uranellus joined #git
06:10 uranellus joined #git
06:10 psprint joined #git
06:10 psprint Hello. What other special characters besides _, /, - are popular in git branch names?
06:11 fracting joined #git
06:12 dopesong joined #git
06:13 fracting joined #git
06:17 eletuchy joined #git
06:17 fracting joined #git
06:18 SwiftMatt joined #git
06:19 rominronin joined #git
06:20 englishstudent joined #git
06:20 fracting joined #git
06:23 fracting joined #git
06:23 Sleepy63 joined #git
06:24 allcentury joined #git
06:26 Literphor joined #git
06:26 fracting joined #git
06:27 dopesong joined #git
06:28 Rynomster joined #git
06:28 a_thakur joined #git
06:28 xall joined #git
06:29 fracting joined #git
06:30 romerocesar joined #git
06:32 fracting joined #git
06:33 allcentury joined #git
06:33 ki0 joined #git
06:33 englishstudent joined #git
06:34 piattino joined #git
06:35 Eugene Generically, anything that's a valid filename character. git tries not to care.
06:35 fracting joined #git
06:35 davisonio joined #git
06:35 Eugene man gitrepository-layout may have some info
06:35 gitinfo the gitrepository-layout manpage is available at http://jk.gs/gitrepository-layout.html
06:35 elastix joined #git
06:37 timthowtdi joined #git
06:37 fracting joined #git
06:40 fracting joined #git
06:41 timthowtdi joined #git
06:43 fracting joined #git
06:45 fracting joined #git
06:48 jaguarmagenta joined #git
06:48 fracting joined #git
06:48 mkelly joined #git
06:49 eletuchy joined #git
06:51 TomyLobo joined #git
06:51 fracting joined #git
06:52 eletuchy_ joined #git
06:54 fracting joined #git
06:54 Literphor joined #git
06:54 JanC joined #git
06:54 t0by joined #git
06:56 fracting joined #git
06:56 eletuchy joined #git
06:58 eletuch__ joined #git
06:59 mehola joined #git
06:59 fracting joined #git
07:01 allcentury joined #git
07:02 fracting joined #git
07:02 emPi joined #git
07:03 ramsub07 joined #git
07:04 fracting joined #git
07:06 eletuchy joined #git
07:06 fracting joined #git
07:08 eletuchy_ joined #git
07:08 tax_ joined #git
07:09 fracting joined #git
07:09 jknetl joined #git
07:09 Sucks joined #git
07:10 eletuch__ joined #git
07:11 mehola joined #git
07:11 ahmedelgabri joined #git
07:14 SwiftMatt joined #git
07:14 vuoto joined #git
07:14 Oebele joined #git
07:15 Sucks joined #git
07:17 mariuscc joined #git
07:17 zeemz joined #git
07:19 eletuchy joined #git
07:20 rominronin joined #git
07:20 phaleth joined #git
07:23 circ-user-Oetft joined #git
07:25 raijin joined #git
07:26 dreiss joined #git
07:26 nick123 joined #git
07:26 sagerdearia joined #git
07:27 romerocesar joined #git
07:29 Sucks joined #git
07:31 xall joined #git
07:31 italoacasas joined #git
07:33 ki0 joined #git
07:34 Literphor joined #git
07:45 eletuchy_ joined #git
07:45 Sucks joined #git
07:46 eijk_ joined #git
07:47 boudiccas joined #git
07:47 hahuang61 joined #git
07:47 multi_io joined #git
07:48 phaleth joined #git
07:48 eletuchy joined #git
07:48 romerocesar joined #git
07:49 sanketdg joined #git
07:50 sanketdg joined #git
07:51 eletuchy_ joined #git
07:52 wrouesnel1 joined #git
07:53 przemoc joined #git
07:53 przemoc joined #git
07:55 King_Hual joined #git
07:56 lindenle joined #git
07:57 eletuchy joined #git
07:57 fornax joined #git
07:58 dbkaplun joined #git
07:58 dbkaplun Any way to clone into a folder other than .?
07:58 rubyonrailed joined #git
07:59 dbkaplun like `export oldpath=$(pwd); cd other/path; git clone git://repo; cd $oldpath`
07:59 subhojit777 joined #git
08:01 ahmedelgabri joined #git
08:01 bremner dbkaplun: man git clone, see usage summary at the top
08:01 gitinfo dbkaplun: the git-clone manpage is available at http://jk.gs/git-clone.html
08:01 dopesong joined #git
08:02 cdown_ joined #git
08:02 bremner <directory> is the argument you want
08:02 allcentury joined #git
08:04 dbkaplun yeah except if <directory> doesn't exist the repo is cloned with <directory> as the name instead of erroring out or making <directory> cloning the repo with its own name into it
08:04 muthu joined #git
08:07 przemoc joined #git
08:10 ahmedelgabri joined #git
08:11 King_Hual joined #git
08:12 binaryplease1 joined #git
08:14 spudowiar TIL you can git clone into the current folder without using '.' :)
08:19 GandalfTheWizard joined #git
08:19 romerocesar joined #git
08:19 jost joined #git
08:20 dopesong joined #git
08:21 rominronin joined #git
08:24 toogley joined #git
08:26 nivag joined #git
08:26 vuoto joined #git
08:26 FrontPsych joined #git
08:26 xall joined #git
08:29 stuh84 joined #git
08:32 cyphase joined #git
08:33 heroux joined #git
08:35 mehola joined #git
08:37 nivag_ joined #git
08:37 dopesong joined #git
08:40 dopesong_ joined #git
08:44 m0viefreak joined #git
08:44 ahr3n joined #git
08:47 hahuang61 joined #git
08:47 allcentury joined #git
08:48 leehambley joined #git
08:48 jaguarmagenta joined #git
08:50 cyphase joined #git
08:54 mariuscc joined #git
08:56 mehola joined #git
09:00 toogley joined #git
09:03 ynanm joined #git
09:06 romerocesar joined #git
09:07 nonconvergent joined #git
09:11 inflames joined #git
09:11 eijk_ joined #git
09:14 fscala joined #git
09:15 davidbz joined #git
09:15 eletuchy_ joined #git
09:18 j416 spudowiar: what does that mean?
09:20 leehambley joined #git
09:22 rominronin joined #git
09:23 fujinuma joined #git
09:23 fujinuma what is the difference between git ls-files and git diff --name-only --cached
09:24 cdown_ joined #git
09:25 spudowiar j416: <dbkaplun> like `export oldpath=$(pwd); cd other/path; git clone git://repo; cd $oldpath`
09:26 j416 spudowiar: seems like a (in lack of better word) stupid way to do it; why would you do it like this?
09:26 spudowiar j416: I wouldn't, it was a quote
09:26 taylorm_ joined #git
09:26 j416 I see
09:26 spudowiar j416: that's why it had '<dbkaplun>'
09:27 j416 ah, I didn't see the scrollback
09:27 spudowiar heh
09:27 j416 :D
09:27 nick123 joined #git
09:27 eijk_ joined #git
09:28 dopesong joined #git
09:28 dbkaplun anyone know an answer to my question?
09:30 allcentury joined #git
09:31 fujinuma git ls-files --modified and git diff --name-only --cached
09:31 fujinuma what is the difference between those two?
09:32 inflames joined #git
09:32 dbkaplun Happy Saturday everyone
09:33 j416 fujinuma: one is a listing, the other is a diff
09:33 fujinuma j416: if I'm going to write a git hook which one is better to use?
09:33 j416 fujinuma: that depends on what the hook does, naturally
09:34 ramsub07 joined #git
09:34 _ngz_ngzz joined #git
09:35 fujinuma j416: it gets the LoC of each staged file and displays an error message if the number is larger than 500
09:35 j416 fujinuma: sounds like a strange hook to have in the first place
09:36 j416 fujinuma: assuming you are using it to control the size of commits, diff is what you want not ls-files
09:36 dopesong joined #git
09:36 fujinuma j416: why? I just need the number of lines in each staged file.
09:36 osse dbkaplun: git clone has no short hand for that. write the full name: git clone .. other/path/repo
09:36 j416 fujinuma: why would you error if LoC is > 500 ?
09:37 arahael What's the easiest way for me to change every commit's email address?
09:37 arahael All 8 commits. ;)
09:37 sdothum joined #git
09:37 j416 arahael: --env-filter for git-filter-branch
09:37 arahael I tried interactive rebsae, but I can't qute get to the root commit.
09:37 j416 arahael: man git-filter-branch
09:37 gitinfo arahael: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
09:38 mariuscc joined #git
09:38 arahael j416: I guess that's it.  Thanks.
09:38 fujinuma fujinuma: there's a convention in a company that each commit should not be grater than 500 lines.
09:38 fujinuma j416: there's a convention in a company that each commit should not be grater than 500 lines.
09:38 DistantStar left #git
09:38 j416 fujinuma: that's a stupid convention, I would not follow it
09:38 j416 fujinuma: what if you commit a vendored thing that's 505 lines long
09:39 fujinuma j416: I don't know. I'm just a freelancer :)
09:39 j416 fujinuma: the thought to keep commits small is nice and all, but it's not general enough to make it into a hard rule
09:40 j416 fujinuma: if you have a good reason to make a commit with more than 500 LoC, you should probably do it
09:40 j416 fujinuma: if you don't have a reason to, then I don't see why you would even end up in the situation
09:40 j416 fujinuma: use brain, not hook
09:40 fujinuma j416: there are more stupid rules in this world that should not be follow :D
09:40 j416 fujinuma: so why do you follow
09:41 fujinuma j416: I don't. I just write the hook for someone else.
09:41 j416 so that they can make the mistake?
09:41 arahael fujinuma: There is a reason people call these things "conventions" and not "rules".
09:41 fujinuma arahael: yeah, that's right. but in some situations conventions become rules.
09:42 j416 and rules are meant to be broken when it makes sense, which kind of make them conventions
09:42 arahael fujinuma: At which point you should clarify the rule.
09:43 dopesong joined #git
09:43 arahael Yikes.  Github is slow.
09:43 fujinuma alright, thank you for helping me. even that's an stupid *convention* I'm a freelancer and I do what one asked me to do.
09:44 arahael fujinuma: In the event of stupidity, delegate it.
09:44 fujinuma arahael: here life is hard and I should make money :|
09:44 fornax joined #git
09:45 arahael fujinuma: Say "I have implemented the changes required, however it depends on a 501 vendored file. Your rules say I can't commit it. What should I do?"
09:45 arahael 501 *line* vendored file.
09:45 j416 arahael: w
09:45 j416 arahael: lol.
09:45 arahael fujinuma: On the other hand, if it's a *convention*, then I'd just commit it with a *good* reason why you felt it was neccessary to break the convention
09:46 Arban joined #git
09:47 fujinuma arahael: I've already said that I don't care about the convention maybe they change it someday or increase the number.
09:47 j416 fujinuma: some technical aspects as to why it's stupid and hard to implement it: what constitutes a LoC? Does it only include modified lines? Added lines also? How about deleted lines?
09:48 hahuang61 joined #git
09:48 fujinuma fujinuma: there's no explanation about deleted lines or what ever. just every staged file's LoC. that's it
09:48 FrameFever joined #git
09:48 fujinuma j416: there's no explanation about deleted lines or what ever. just every staged file's LoC. that's it
09:48 eletuchy joined #git
09:48 j416 fujinuma: right, get that defined
09:48 FrameFever can I rebase also, when I already pushed my changed to origin?
09:49 FrameFever I have a branch, which needs to be updated
09:49 j416 FrameFever: if you are ok with chancing history on the remote, yes
09:49 j416 changing* even
09:49 fujinuma j416: OK, thanks for your time.
09:49 FrameFever what would be the other solution?
09:49 j416 fujinuma: `git diff --cached --shortstat` will get you the data you need at least.
09:49 j416 fujinuma: then just parse that in whatever way you see fit
09:50 j416 fujinuma: I don't know if there is a more script-friendly output for this
09:50 toogley joined #git
09:51 toogley joined #git
09:52 j416 fujinuma: actually, `git diff --cached --numstat` may be nicer
09:52 j416 fujinuma: depends on what error info you need
09:52 fujinuma j416: yeah, that's better.
09:52 j416 fujinuma: (i.e. show what file cause it to go over 500)
09:52 j416 FrameFever: other solution to what?
09:53 GandalfTheWizard joined #git
09:54 FrameFever j416: update my branch with the newest changes of the master branch
09:54 j416 FrameFever: rebase is a good way to go about it
09:56 nonconvergent joined #git
09:57 ntonjeta joined #git
09:58 jason237 joined #git
09:58 glauxosdever joined #git
09:58 toogley joined #git
09:58 snips joined #git
09:59 rubyonrailed joined #git
09:59 toogley joined #git
10:00 ochorocho__ joined #git
10:03 Fijit joined #git
10:05 eijk_ joined #git
10:05 fornax joined #git
10:05 Tryop88 joined #git
10:06 clearlybaffled joined #git
10:06 des_consolado left #git
10:08 FrontPsych joined #git
10:08 glauxosdever Hello. I'm wondering. My git repo has 5 commits, but 115 objects.
10:08 glauxosdever Why is that?
10:08 j416 glauxosdever: https://git-scm.com/book/en/v2/Git-Internals-Git-Objects
10:10 glauxosdever Oh, every file is an object?
10:10 mdw joined #git
10:10 glauxosdever https://git-scm.com/book/en/v2/book/10-git-internals/images/data-model-2.png
10:10 j416 glauxosdever: every file, every directory tree, every commit, every tag
10:11 rgrinberg joined #git
10:11 j416 glauxosdever: being content-addressed, two different files with the same content create one object, not two.
10:12 nnyk joined #git
10:12 eijk_ joined #git
10:13 zarel joined #git
10:13 glauxosdever When I clone a repo and the objects are packed, git count-objects doesn't say how many objects exist.
10:13 snips joined #git
10:14 j416 glauxosdever: it counts loose objects, as the man page states
10:14 j416 glauxosdever: try git count-objects -v
10:15 glauxosdever Ok. Then it's the same count for both the manually created repo and the cloned one.
10:15 j416 sounds reasonablw
10:15 j416 e
10:16 glauxosdever I have just seen for myself too that unreachable objects are not cloned. Is it possible for them in some way to get cloned (maybe with some other command)?
10:17 j416 glauxosdever: no
10:17 glauxosdever Ok. :-)
10:17 glauxosdever Then I wasted one hour yesterday and 20 minutes today trying to clean up the repo from these unreachable objects.
10:18 glauxosdever Thank you very much, anyway.
10:18 j416 glauxosdever: git gc --prune=now
10:19 glauxosdever Ok, it's not needed anymore, since they are not duplicated upon cloning.
10:19 j416 just thought maybe you wanted to know
10:19 j416 although, above is not complete
10:20 j416 objects can be referenced from more places than a branch
10:20 j416 glauxosdever: not to worry though, they'll get cleaned up eventually. you can ignore them.
10:20 glauxosdever My concern was whether they are duplicated upon cloning. Since they are not, then it's ok. :-)
10:21 snips joined #git
10:21 j416 o/
10:22 snips joined #git
10:23 RominRonin joined #git
10:23 jbitdrop joined #git
10:23 rominron_ joined #git
10:25 feignix joined #git
10:25 snips joined #git
10:26 davisonio joined #git
10:26 soLucien joined #git
10:27 soLucien hello guys ! Is it possible to download a folder from a git repo without cloning the whole thing ?
10:28 allcentury joined #git
10:28 soLucien as in : i have a git repo with few folders at the root level : src/ test/ and another folder
10:28 soLucien called template
10:28 soLucien i want to DOWNLOAD the template folder without cloning the whole repo
10:28 soLucien whenever i start a new project
10:28 soLucien is it possible ?
10:29 soLucien git clone will download all the code , including src and test
10:29 dr_lepper joined #git
10:30 soLucien (i can acheive the same effect by clone/fetch, then deleting the .git directory, but i am wondering whether GIT provides a way of doing it)
10:31 snips joined #git
10:32 dopesong joined #git
10:33 j416 soLucien: git-archive
10:34 soLucien git-archive /template ?
10:34 j416 soLucien: that's one step along the way yes
10:34 j416 soLucien: man git-archive
10:34 gitinfo soLucien: the git-archive manpage is available at http://jk.gs/git-archive.html
10:35 soLucien sweet
10:35 soLucien thanks a lot !
10:36 paul424 joined #git
10:36 snips_ joined #git
10:36 kasper93_ joined #git
10:38 _ikke_ Does not work with github though
10:38 soLucien i want to use it with TFS
10:38 j416 _ikke_: good to know, thanks
10:38 soLucien i have my own git server, in my company
10:38 soLucien so i believe that should work
10:39 snips_ joined #git
10:39 soLucien another thing : so let's assume i have a project on my private git server
10:39 soLucien and i want to add it to github as well
10:39 soLucien or accept contributions as well
10:39 soLucien from github
10:39 j416 soLucien: for example, git archive --remote=path/or/url/to/repo master README.md
10:40 j416 soLucien: then you need to keep them in sync somehow.
10:40 soLucien and also people form my company commit things to the private git repo
10:40 j416 soLucien: there is no built-in way to automatically sync, you will need to do this manually or script it.
10:40 ramsub08 joined #git
10:40 soLucien would then be synced to github
10:40 soLucien ok
10:41 soLucien so git is not distributed in the sese of hosting
10:41 soLucien if you are hosting the code in multiple locations, you have to make sure the locations are synced manually
10:42 soLucien using the git push/pull/fetch
10:45 ramsub07 joined #git
10:46 LarArT joined #git
10:48 keltvek joined #git
10:49 hahuang61 joined #git
10:49 jaguarmagenta joined #git
10:51 j416 soLucien: yes.
10:53 arahael soLucien: They are kept in sync "automatically" if you change your perspective...  To that of people fetching code and being able to see all the history of said change.
10:54 aard_ joined #git
10:54 italoacasas joined #git
10:57 sarbs joined #git
11:00 sdothum joined #git
11:02 xaa joined #git
11:02 nnyk joined #git
11:08 irco joined #git
11:10 dopesong joined #git
11:10 eletuchy joined #git
11:11 jason237 joined #git
11:14 ojdo joined #git
11:17 dopesong joined #git
11:18 dopesong joined #git
11:22 feignix joined #git
11:23 venmx joined #git
11:24 dan2k3k4 joined #git
11:25 rominron_ joined #git
11:28 nick123 joined #git
11:29 digidog joined #git
11:29 paul424 joined #git
11:31 sentriz joined #git
11:33 paws_ joined #git
11:33 FuzzySockets joined #git
11:39 paws_ hello! I have a question. I have a github repository and I'm working for a company that wants me to basically continue developing this repository. We created a fork, as usual, for the company.  To keep things confined I thought it could be a good idea to merge things first in the fork, and when we are finished with the project, or at least milestones then
11:39 paws_ merge this in the original repository.  I'm now rethinking this because it looks like unnecessary extra work, it's not possible to make the fork private anyway and "merging" from the fork's master to the original master doesn't look straight forward. Ideas / feedback?
11:41 jhass well this looks like a policy discussion you should have with your company tbh
11:41 Diogenes_ joined #git
11:41 jhass I see no clear technical drawbacks nor advantages to either approach
11:42 a_thakur joined #git
11:43 paws_ but if there are no advantages  of working with the fork it looks like the worser option, since it's more work to merge this back to the original repository
11:44 jhass perhaps, if you keep it conflict free (regularly merge upstream or simply do not change upstream at all) it's work of half a minute though
11:44 dan2k3k4 joined #git
11:44 paws_ to discuss with the company I'd need clarity about the advantages / disadvantages of each, which is the reason I'm asking :)
11:45 allcentury joined #git
11:45 barteks2x joined #git
11:46 jhass there may be some in the specific case, but as I see it that requires some more intimate knowledge of your existing workflows and the project in question
11:46 paws_ but what is better about working separately in a fork. If it's going to be public anyway. My repository is also not very active - the only work being done currently is what I'm doing in this fork.
11:46 jhass in the general abstract case I see no difference
11:46 dopesong joined #git
11:46 jhass there's nothing better on the technical level in general. There's also nothing really worse. Hence I call it a policy decision
11:47 paws_ ok and moving to a technical question, what is the easiest way to move the commits from the fork's master to the original repository master?
11:47 jhass add both as a remote of your local repo
11:48 jhass say upstream and fork
11:48 jhass git pull fork master; git pull upstream master; git push upstream master;
11:49 paws_ okay, that should be straight forward.
11:49 jhass yes, very
11:49 jhass hence I call it not a technical issue
11:49 sobersabre_ joined #git
11:49 hahuang61 joined #git
11:50 romerocesar joined #git
11:50 fornax joined #git
11:50 paws_ thanks jhass!
11:53 rahtgaz joined #git
11:53 rahtgaz joined #git
11:57 dopesong joined #git
11:59 lindenle joined #git
12:00 rubyonrailed joined #git
12:00 cyan__ joined #git
12:01 Myrl-saki joined #git
12:04 FuzzySockets joined #git
12:05 PCatinean joined #git
12:06 eletuchy joined #git
12:06 robotroll joined #git
12:07 nonconvergent joined #git
12:09 Pulp joined #git
12:10 King_Hual joined #git
12:12 NeverDie joined #git
12:13 davisonio joined #git
12:15 averagejeoux joined #git
12:18 NeverDie_ joined #git
12:19 Tim-SEM joined #git
12:21 dopesong joined #git
12:21 liquidjamm joined #git
12:22 dopesong joined #git
12:26 rominronin joined #git
12:26 dopesong_ joined #git
12:30 romerocesar joined #git
12:30 Oebele joined #git
12:36 tesuji joined #git
12:41 Repox joined #git
12:42 tesuji joined #git
12:42 ToBeCloud joined #git
12:43 dan2k3k4 joined #git
12:46 dopesong joined #git
12:47 ozette joined #git
12:48 docnvk joined #git
12:50 jaguarmagenta joined #git
12:50 hahuang61 joined #git
12:51 ozette are there any prebuilt previous git releases for os x 10.7?
12:51 ozette the latest release gives a segfault
12:52 cbreak ozette: xcode contains git
12:53 tabrez joined #git
12:53 rbern joined #git
12:55 flaguy48 joined #git
12:56 ozette trying to install git with someone, we can't install xcode on os x 10.7 because the app complains we don't have the latest version
12:56 ozette app store*
12:57 dan2k3k4 joined #git
12:58 cbreak you should be able to get older xcode on the dev page
12:58 cbreak or install the command line dev tools
12:59 cbreak also consider updating, only an idiot would still use 10.7 since it's no longer maintained with security patches
12:59 eletuchy joined #git
13:00 cbreak http://osxdaily.com/2014/02/12/install-command-line-tools-mac-os-x/
13:01 FuzzySockets joined #git
13:01 refried_ joined #git
13:05 dreiss joined #git
13:06 NeverDie joined #git
13:07 dan2k3k4 joined #git
13:08 hlysig joined #git
13:14 kasper93_ joined #git
13:15 happy-dude joined #git
13:15 toogley joined #git
13:16 dopesong joined #git
13:17 davisonio joined #git
13:20 dopesong_ joined #git
13:23 sq-one joined #git
13:25 Corneliu joined #git
13:26 dopesong joined #git
13:26 fscala joined #git
13:27 rominronin joined #git
13:29 nick123 joined #git
13:32 FuzzySockets joined #git
13:33 dopesong joined #git
13:33 Brain_ joined #git
13:36 aruns joined #git
13:36 aruns Hi, having an issue with a local repo.
13:36 aruns Running Ubuntu 14.04.
13:36 aruns Running Git 2.8.3
13:37 aruns Ran a Git clone on a GitHub repo I set up.
13:37 aruns I have created a virtual host in Apache for the repo.
13:37 LarArT joined #git
13:37 aruns And mapped it to my local machine address in /etc/hosts
13:37 aruns But it is coming up with the default Apache configuration index.html page
13:38 aruns Rather than the index.html I created in my local repo.
13:38 aruns So ran chmod 755 -R /var/www/test-site/ on it
13:38 aruns But still coming up with the default Apache configuration page.
13:39 raijin joined #git
13:39 ki0 joined #git
13:40 astrofog joined #git
13:40 cdown_ joined #git
13:40 hlysig joined #git
13:41 hlysig joined #git
13:41 canton7 aruns, ... git repositories are not automatically browsable using a web browser
13:41 canton7 you use the 'git' command-line tool to interact with them
13:42 aruns canton7: I have cloned it for local testing.
13:42 canton7 does the repo you cloned have an index.html in it?
13:42 aruns canton7: Yes.
13:42 aruns But the Apache2 web server is still serving up the Apache2 Ubuntu default configuration page.
13:43 aruns Rather than the index.html in the repo.
13:43 aruns I think it may be a permissions issue.
13:43 aruns But I have tried chmod 755
13:43 aruns And that did not work.
13:43 aruns I have also added my user account to www-data group.
13:43 Lu_ joined #git
13:44 osse as long as the file is actually on disk (ie. it's not a bare clone of a repo with an index.html in it) this is an apache problem
13:44 sobersabre joined #git
13:44 moritz I've recently seen a trick where "git diff" gave normal, line-based diffs, but still hilighted change words (or even characters) in color
13:44 dopesong joined #git
13:45 rsukla joined #git
13:45 moritz anybody know what I mean, and have a link for how it's done?
13:45 ccha5 joined #git
13:45 javster_ joined #git
13:45 osse moritz: probably this https://github.com/so-fancy/diff-so-fancy
13:45 synthmea1 joined #git
13:45 kasper93_ joined #git
13:46 moritz osse: thanks
13:46 mepholic1 joined #git
13:46 moritz not the same as I meant, but still achieves what I want
13:46 osse ohhh
13:46 aruns osse: Yes, the index.html is under /var/www/test-site/public_html/index.html
13:46 osse moritz:  Git itself can  do this now from 2.9
13:46 {AS}_ joined #git
13:46 cust_ joined #git
13:46 devhost_ joined #git
13:46 moritz http://blogs.atlassian.com/2013/06/git-diff/
13:47 kjnilsson_ joined #git
13:47 evanc_ joined #git
13:47 daxroc_ joined #git
13:47 bttf_ joined #git
13:47 pizzaops_ joined #git
13:47 kwmiebach_ joined #git
13:48 osse no i'm wrong
13:48 addshore_ joined #git
13:48 ElGrandeAmigo joined #git
13:48 cerberii_ joined #git
13:48 noahsussman_ joined #git
13:48 ggherdov_ joined #git
13:48 mhinz_ joined #git
13:48 yena_ joined #git
13:48 hypera1r joined #git
13:48 scarcry_ joined #git
13:48 BinGOs_ joined #git
13:48 Oebele_ joined #git
13:48 rawtaz_ joined #git
13:48 bambams_ joined #git
13:48 bambams_ joined #git
13:48 torbjorn_ joined #git
13:48 wanders joined #git
13:48 harmfulb1tes joined #git
13:49 koro_ joined #git
13:49 moritz and on Ubunutu, /usr/share/doc/git/contrib/diff-highlight/diff-highlight is shipped in the "git" package, but not with the executable bit set
13:49 moritz argl
13:49 tjbp_ joined #git
13:49 gr_wity joined #git
13:49 optraz_ joined #git
13:49 Seveas_ joined #git
13:49 tfnico_ joined #git
13:50 chimerac- joined #git
13:50 jdfriedrikson joined #git
13:50 SirFunk_ joined #git
13:50 hfp__work joined #git
13:50 leonarth_ joined #git
13:50 dykomii joined #git
13:50 aruns I have tried to change permissions for the specific dev site.
13:50 aruns But still serving up default page.
13:51 dwmw2_gone joined #git
13:51 aruns Could it be a GitHub issue?
13:51 ionelmc_ joined #git
13:51 Cerise joined #git
13:51 Awesomecase joined #git
13:51 ws2k3_ joined #git
13:51 Olipro_ joined #git
13:51 McNozes_ joined #git
13:51 nebg joined #git
13:51 Cerise joined #git
13:51 Awesomecase joined #git
13:51 mda1_ joined #git
13:51 kennon_ joined #git
13:51 Jeroen joined #git
13:51 hahuang61 joined #git
13:51 devhoag joined #git
13:51 Hogofwar joined #git
13:51 as_g5pw joined #git
13:51 rancyd joined #git
13:51 angular_mike joined #git
13:51 SenpaiSilver joined #git
13:51 markmarkmark joined #git
13:51 MatthewAllan93 joined #git
13:51 KevinMGranger joined #git
13:51 WakiMiko joined #git
13:51 Nevik joined #git
13:51 hexagoxel joined #git
13:51 rcn joined #git
13:51 CustosLimen joined #git
13:51 led_belly joined #git
13:51 nkhoit joined #git
13:51 MacGyver joined #git
13:51 RiPer joined #git
13:51 bailon joined #git
13:51 languitar joined #git
13:52 trobotham joined #git
13:52 nellicus_ joined #git
13:52 Learath2 joined #git
13:52 albel727 joined #git
13:52 fugiman joined #git
13:52 dbkaplun joined #git
13:52 stonerfish joined #git
13:52 spaceone joined #git
13:52 roflin joined #git
13:52 ORiON-- joined #git
13:52 thejoecarroll joined #git
13:52 Novitsh joined #git
13:52 aLeSD joined #git
13:52 chrysa joined #git
13:52 ThiefMaster joined #git
13:52 rossome joined #git
13:52 TheBrayn joined #git
13:52 stux joined #git
13:52 aspiers joined #git
13:52 ahmedelgabri joined #git
13:53 guampa joined #git
13:53 M-mistake joined #git
13:53 * moritz idly wonders why none of these git config calls in https://github.com/blog/2188-git-2-9-has-been-released use --global
13:53 FunkyAss joined #git
13:53 arahael joined #git
13:53 bouncy joined #git
13:53 Nothing4You joined #git
13:54 eletuchy joined #git
13:55 Shentino joined #git
13:55 fhackdroid joined #git
13:55 JohnLea____ joined #git
13:55 Neo joined #git
13:55 tvl joined #git
13:55 DarkMukke joined #git
13:55 skasturi joined #git
13:56 mehdi_ joined #git
13:56 heroux joined #git
13:57 liquidjamm joined #git
13:57 MatthewAllan93 joined #git
13:58 osse aruns: what does github have to do with it?
13:58 osse maybe have to do  http://url-you-tried/test-site
13:59 aruns osse: I have tried test-site.dev, the address I have configured for the repo.
13:59 aruns osse: But still giving me Apache2 Ubuntu default configuration page.
13:59 bin4ry joined #git
14:00 ki0 joined #git
14:00 rubyonrailed joined #git
14:01 cdown_ joined #git
14:02 osse i don't think it's a git issue
14:02 Tratos joined #git
14:02 Domhack joined #git
14:02 settermjd joined #git
14:03 feignix joined #git
14:04 jason237 joined #git
14:05 FrameFever left #git
14:05 aruns osse: I found the issue.
14:06 aruns osse: I had a forward slash after public_html LMAO
14:07 rsukla joined #git
14:07 spudowiar joined #git
14:07 hlysig joined #git
14:11 hlysig joined #git
14:13 D-Boy joined #git
14:13 xlegoman joined #git
14:15 raininja joined #git
14:16 catbeard joined #git
14:17 hlysig joined #git
14:18 diegoviola joined #git
14:19 paul424 joined #git
14:20 jstein_ joined #git
14:27 vuoto joined #git
14:28 rominronin joined #git
14:31 fornax joined #git
14:31 zeroed joined #git
14:31 zeroed joined #git
14:33 nnyk joined #git
14:38 taylorm joined #git
14:40 Ahmed90 joined #git
14:42 toogley joined #git
14:42 dwmw2_gone joined #git
14:44 ejb joined #git
14:44 ManikM joined #git
14:46 ynanm joined #git
14:47 Noldorin joined #git
14:48 Chill_Surf joined #git
14:49 ejb joined #git
14:50 nonconvergent joined #git
14:51 cdown_ joined #git
14:51 jaguarmagenta joined #git
14:51 netj joined #git
14:51 Umeaboy joined #git
14:52 hahuang61 joined #git
14:52 fujinuma I used git diff --cached --numstat for a hook.
14:52 fujinuma but it only works if I first add the changes to stage
14:52 fujinuma then commit
14:52 fujinuma how to make that work even with git commit -am
14:53 Umeaboy No offence for saying this, but why does the git repo on github have 45 PR's even thou I see this message in the description: This is a publish-only repository and all pull requests are ignored.
14:53 Umeaboy I mean....... Why add them there if they will be ignored?
14:53 Umeaboy Just saying....
14:53 Umeaboy It seems like a vaste of time and energy.
14:54 Brain joined #git
14:55 Umeaboy Sorry if I seem negative, but it's contradictive to have such text in the description even thou I see commits being made.
14:55 hero616_ joined #git
14:55 Umeaboy PR's should be accepted as well then.
14:56 Umeaboy Right?
14:56 Umeaboy There should at least be a Testing branch.
14:56 phanimahesh joined #git
14:57 wiky joined #git
15:01 ki0 joined #git
15:02 diegoviola joined #git
15:02 diegoviola I'm trying to bisect the linux kernel, should I start with good or bad? or either works?
15:02 diegoviola I know which is good and which is bad already
15:02 diegoviola the tags I mean
15:02 raijin joined #git
15:04 _ikke_ diegoviola: Doesn't matter
15:04 hexagoxel Umeaboy: because people like being ignored, perhaps?
15:05 diegoviola _ikke_: thanks
15:05 hexagoxel Umeaboy: "commits being made" /= PR merged via github
15:07 ManikM joined #git
15:07 Umeaboy hexagoxel: Sure, but still there's 45 open commits that haven't been accepted yet.
15:07 diegoviola after git bisect start, do I need to switch to another tag or I can say git bisect good tag-foo git bisect bad tag-bar?
15:07 Umeaboy Aren't the accepted with the push command?
15:07 Umeaboy they
15:07 dopesong joined #git
15:07 _ikke_ diegoviola: the latter
15:08 diegoviola _ikke_: thanks
15:10 hexagoxel Umeaboy: which matches the description, right? no PRs will be merged (via github).
15:11 hexagoxel Umeaboy: what? merge /= push, and git merge /= hub merge
15:11 hexagoxel (if the latter exists at all..)
15:11 armyriad joined #git
15:11 diegoviola Bisecting: 8131 revisions left to test after this (roughly 13 steps)
15:11 diegoviola [6b5f04b6cf8ebab9a65d9c0026c650bb2538fd0f] Merge branch 'for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
15:11 diegoviola what should I do now?
15:11 moriko joined #git
15:12 livingstn joined #git
15:12 diegoviola ok so I guess I need to rebuild the kernel now and test it
15:12 diegoviola then mark it as good/bad?
15:13 Umeaboy OK.
15:14 ManikM_ joined #git
15:18 rubyonrailed joined #git
15:21 diegoviola git-bisect feels like something that came from the future to save me
15:21 ramsub07 joined #git
15:22 shgysk8zer0 joined #git
15:22 ki0 joined #git
15:23 dopesong joined #git
15:23 wrouesnel1 joined #git
15:23 fornax joined #git
15:24 bin4ry joined #git
15:24 bin4ry joined #git
15:24 dopesong joined #git
15:26 nnyk joined #git
15:28 acetakwas joined #git
15:29 rominronin joined #git
15:29 acetakwas joined #git
15:30 livingstn joined #git
15:30 nick123 joined #git
15:31 User458764 joined #git
15:32 acetakwas joined #git
15:32 User458764 joined #git
15:33 Dyonisos joined #git
15:33 acetakwas joined #git
15:35 kus joined #git
15:35 acetakwas joined #git
15:36 ResidentBiscuit It's a pretty sweet little tool
15:36 diegoviola yeah
15:37 diegoviola there's this bug I've been trying to track down for months now... should've done this sooner: https://bugs.freedesktop.org/show_bug.cgi?id=93844
15:37 diegoviola intel driver bug
15:41 eletuchy joined #git
15:43 McNozes joined #git
15:45 jaguarmagenta joined #git
15:45 NeverDie joined #git
15:45 rolha joined #git
15:46 d0nn1e joined #git
15:48 aavrug joined #git
15:48 NeverDie joined #git
15:51 mablae joined #git
15:52 madewokherd joined #git
15:52 hahuang61 joined #git
15:54 ShekharReddy joined #git
15:56 liquidjamm joined #git
15:57 ahmedelgabri joined #git
15:58 NeverDie joined #git
16:02 zarel joined #git
16:02 wiky joined #git
16:02 circ-user-Oetft joined #git
16:05 compeman joined #git
16:05 compeman joined #git
16:06 mmmveggies joined #git
16:09 rath joined #git
16:09 davisonio joined #git
16:14 bin4ry joined #git
16:15 rasto joined #git
16:17 tristanp_ joined #git
16:18 Domhack joined #git
16:18 tomog999_ joined #git
16:19 rubyonrailed joined #git
16:20 diegoviola roughly 9 steps in git bisect == 9 times I'll need to rebuild the kernel?
16:21 ynanm joined #git
16:21 lolmac joined #git
16:22 ki0 joined #git
16:23 CEnnis91 joined #git
16:26 diogenese joined #git
16:27 mischat joined #git
16:27 jhass roughly, yes
16:30 rominronin joined #git
16:30 diegoviola ok
16:30 xaviergmail joined #git
16:34 davisonio joined #git
16:35 texasmynsted joined #git
16:36 eletuchy joined #git
16:37 mrat joined #git
16:38 mrat joined #git
16:38 [Brain] joined #git
16:39 mrat joined #git
16:39 nidr0x joined #git
16:39 diegoviola if it takes too long I guess I can shutdown my machine and continue another time, right?
16:39 mrat joined #git
16:40 diegoviola I'm using archlinux's /proc/config.gz
16:42 axiom_1 joined #git
16:42 jhass of course, it's all persisted on disk
16:43 bket joined #git
16:43 diegoviola right
16:44 xaviergmail joined #git
16:44 diegoviola just never done the bisect before
16:45 xall joined #git
16:47 mischat joined #git
16:48 taylorm joined #git
16:48 rahtgaz joined #git
16:50 englishstudent joined #git
16:53 hahuang61 joined #git
16:57 xall_ joined #git
16:58 Goplat joined #git
16:59 diegoviola joined #git
17:00 tinajohnson___ joined #git
17:00 diegoviola I'm doing a git bisect between 4.5..4.6, I know 4.5 is broken but I'm not completely sure 4.6 is
17:00 diegoviola and now git bisect is saying 12 steps
17:00 diegoviola should I cancel the bisect and test 4.6 myself?
17:00 diegoviola if I find a bad commit, will the steps go down?
17:01 diegoviola number of steps
17:01 diegoviola 4.6.2 I know for sure is broken
17:01 diegoviola but there are no tags with 4.6.2, just 4.6
17:01 thiago joined #git
17:01 nonconvergent joined #git
17:02 diegoviola meh, I'll just know where the bisect takes me
17:02 diegoviola s/know/see/
17:02 jhass if 4.5 is broken and 4.6.2 is broken, why do you assume it got broken in between in the first place?
17:03 diegoviola sorry, 4.5 is the working one
17:03 diegoviola 4.6.2 is broken
17:05 ochorocho__ joined #git
17:07 Raging_Hog joined #git
17:12 zeemz joined #git
17:15 Siegfried joined #git
17:15 Siegfried hi all, newbie question.  Let's say I reset to some prior commit, is there a way to go back before the reset, without using reflog?
17:15 Siegfried so I have a -> b -> c, I'm at c, hard reset to a, and now I want to go back to c
17:17 ojacobson if you know the hash of c, or if it's also reachable from some other ref (branch, tag, bisect result, whatever)
17:17 nonconvergent joined #git
17:17 ochorocho__ joined #git
17:17 Siegfried ojacobson: But no other way?
17:18 Siegfried like some kind of negative reset
17:18 jhass if you didn't move HEAD since the reset it's just git reset --hard HEAD@{1}
17:18 jhass that's the same HEAD@{1} as shown in git reflog
17:18 Siegfried Okay awesome, thanks both :)
17:18 ojacobson I mean, you could use the reflog entries
17:19 ojacobson that's what they're for :)
17:19 UTAN_dev joined #git
17:19 Siegfried Yeah that's how I normally do it, was just curious.
17:21 rolha joined #git
17:22 harish joined #git
17:23 mkoskar joined #git
17:23 dopesong joined #git
17:24 dopesong_ joined #git
17:26 ahmedelgabri joined #git
17:30 davisonio joined #git
17:30 rolha joined #git
17:31 nick123 joined #git
17:31 rominronin joined #git
17:31 jason237 joined #git
17:34 kfunk joined #git
17:34 hk238 joined #git
17:34 hlysig joined #git
17:36 Lunatrius joined #git
17:38 eletuchy joined #git
17:39 fscala joined #git
17:41 romerocesar joined #git
17:41 dopesong joined #git
17:42 User458764 joined #git
17:46 dopesong joined #git
17:47 Bmw-01 joined #git
17:48 dopesong joined #git
17:50 jeffreylevesque not sure if this qualifies as a git question
17:50 jeffreylevesque i just committed a file - https://github.com/jeff1evesque/machine-learning/blob/1178d0430b78204f3c97e80155ca1611d0b2ffc4/test/hiera.yaml
17:50 dopesong joined #git
17:50 jeffreylevesque but, my corresponding travis ci doesn't know it exists - https://travis-ci.org/jeff1evesque/machine-learning/builds/140245399#L704-L710
17:50 jeffreylevesque doesn't the file have to be merged first?
17:50 fahadash joined #git
17:50 jeffreylevesque to the master branch
17:52 adino joined #git
17:53 thiago jeffreylevesque: commits only affect your local branch
17:53 thiago it never left your machine
17:53 thiago I don't see how travis-ci.org would know about it
17:53 thiago did you push the corresponding commit?
17:53 jeffreylevesque yeah
17:54 jeffreylevesque this is the push - https://github.com/jeff1evesque/machine-learning/blob/1178d0430b78204f3c97e80155ca1611d0b2ffc4/test/hiera.yaml
17:54 hahuang61 joined #git
17:56 dopesong joined #git
17:56 mdw joined #git
17:56 tilpner joined #git
17:56 dopesong_ joined #git
17:57 dopeson__ joined #git
17:58 jeffreylevesque should it know if i pushed it?
17:58 jaguarmagenta joined #git
17:58 efdetonator joined #git
17:59 dopeson__ joined #git
18:00 gsingh joined #git
18:01 RominRonin joined #git
18:01 Literphor joined #git
18:02 dopesong joined #git
18:02 xall_ joined #git
18:03 nonconvergent joined #git
18:04 efdetonator joined #git
18:04 ki0 joined #git
18:04 cyan__ joined #git
18:05 dan2k3k4 joined #git
18:05 ToBeCloud joined #git
18:06 davisonio joined #git
18:08 ahmedelgabri joined #git
18:08 aard_ joined #git
18:09 dan2k3k4 joined #git
18:09 italoacasas1 joined #git
18:10 tvw joined #git
18:12 davisonio joined #git
18:14 eletuchy joined #git
18:20 rubyonrailed joined #git
18:21 eletuchy joined #git
18:22 rolha joined #git
18:24 Siegfried left #git
18:25 eletuchy_ joined #git
18:25 peepsalot joined #git
18:25 ozette joined #git
18:26 eletuch__ joined #git
18:27 quetz joined #git
18:28 diegoaguilar joined #git
18:31 Gamecubic joined #git
18:32 rominronin joined #git
18:34 sesquipedalian joined #git
18:36 jstein_ joined #git
18:37 kasper93 joined #git
18:38 dan2k3k4 joined #git
18:40 justanotheruser joined #git
18:43 eletuchy joined #git
18:44 Literphor joined #git
18:45 feignix joined #git
18:46 romerocesar joined #git
18:46 mehola joined #git
18:46 piling joined #git
18:49 RominRonin joined #git
18:52 ShekharReddy joined #git
18:52 boudiccas left #git
18:52 romerocesar joined #git
18:53 eletuchy joined #git
18:55 hahuang61 joined #git
18:55 diegoviola joined #git
18:56 diegoviola hi
18:56 diegoviola I'm doing a bisect of the kernel
18:56 diegoviola but let's say if a commit works 99% of the time, but failed once
18:56 diegoviola should that be marked as good or bad?
18:56 diegoviola I said good but I'm not sure right now...
18:57 carell joined #git
18:58 thiago that's not a Git question
18:58 diegoviola yeah, I guess
19:02 BinGOs_ left #git
19:03 BinGOs joined #git
19:03 qsx i’d generally consider a failure a failure
19:04 qsx works AND works AND works AND works AND doesn’t work evaluates to doesn’t work
19:04 qsx however i’d make sure it’s really the bug you’re hunting
19:04 diegoviola qsx: even if the problem only happened once?
19:04 zarel joined #git
19:04 qsx diegoviola: it’s a problem, then, isn’t it?
19:04 diegoviola yes
19:05 diegoviola so how can I go back and mark that as bad?
19:06 thiago it's a problem, but not the problem
19:06 thiago we can't help you with determining whether this failure is relevant to the issue you're searching
19:06 Brain joined #git
19:07 diegoviola I mean I said 266c73b77706f2d05b4a3e70a5bb702ed35431d6 was good, but it's bad because teh error showing up there once
19:07 diegoviola I want to say this is bad now
19:07 diegoviola how can I change that in the bisect log?
19:07 thiago git bisect bad 266c73b77706f2d05b4a3e70a5bb702ed35431d6, I think
19:07 diegoviola thanks
19:11 eletuchy_ joined #git
19:13 moei joined #git
19:14 ki0 joined #git
19:14 eletuchy joined #git
19:15 qswz joined #git
19:16 qswz simple question, that I can't manage to make work: How can I go to a release branch, and there take all files from another branch (respecting the local .gitignore)
19:16 eletuch__ joined #git
19:16 cyan__ joined #git
19:18 efdetonator joined #git
19:19 thiago qswz: git checkout releasebranch; git checkout otherbranch .
19:19 thiago note the dot at the end
19:19 eletuchy joined #git
19:19 qswz ah, great
19:19 qswz thanks
19:20 qswz was stupidly looking into merges things
19:20 qswz but I want to erase like you shown
19:20 cdown_ joined #git
19:21 barteks2x joined #git
19:21 thiago you should merge
19:21 zarel joined #git
19:21 qswz with a strategy that takes only otherbranch version
19:21 eletuchy_ joined #git
19:21 thiago yes
19:22 thiago git merge -n otherbranch; git checkout otherbranch .
19:25 eletuchy joined #git
19:25 qswz wel I prefer to avoid conflicts
19:25 qswz and to stricly keep the otherbranch version
19:26 thiago hence -n
19:26 qswz With -n or --no-stat do not show a diffstat at the end of the merge.
19:26 thiago or do the reverse merge with -s ours
19:27 eletuchy_ joined #git
19:27 thiago -n is not --no-stat
19:27 thiago oh, it is
19:27 thiago I meant --no-commit
19:27 qsx there’s also -s theirs if i’m not mistaken
19:27 qswz yea, seeing that
19:27 thiago no, there's only -s ours
19:28 thiago there's no -s theirs
19:28 qsx O_o
19:28 carell joined #git
19:28 qswz -X theirs so
19:28 thiago there's -s recursive -Xtheirs
19:28 thiago not the same thing
19:28 qsx … git.
19:28 qsx man git-merge
19:28 gitinfo the git-merge manpage is available at http://jk.gs/git-merge.html
19:28 eletuch__ joined #git
19:29 diego2 joined #git
19:30 RominRonin joined #git
19:30 diegoaguilar joined #git
19:30 eijk_ joined #git
19:31 dan2k3k4 joined #git
19:31 thiago -s recursive -Xtheirs chooses "their" chunks when there are conflicts
19:31 mkelly joined #git
19:31 thiago when there aren't conflicts, it chooses either side
19:32 thiago that's not the same as an -s theirs would do
19:32 eletuchy joined #git
19:32 nick123 joined #git
19:32 rolha joined #git
19:33 rominron_ joined #git
19:34 eletuchy_ joined #git
19:34 qswz it may work well, testing
19:35 demiro joined #git
19:36 thiago git checkout -b tmp otherbranch; git merge -s ours releasebranch; git push . tmp:releasebranch
19:36 netcarver joined #git
19:37 adino joined #git
19:37 eletuchy joined #git
19:37 diego2 joined #git
19:38 romerocesar_ joined #git
19:38 Eryn_1983_FL joined #git
19:39 eletuch__ joined #git
19:40 a3Dman joined #git
19:41 eletuchy_ joined #git
19:42 Smirnov joined #git
19:44 eletuchy joined #git
19:45 qswz thiago: it's ok (didnt have a lot of files), isn't push for remote branches only?
19:46 CEnnis91 joined #git
19:46 thiago see that . ?
19:48 sbeller joined #git
19:48 eletuchy_ joined #git
19:48 qswz yes
19:48 qswz ah k
19:48 qswz it's either branch remotebranch or files branch
19:50 eletuchy joined #git
19:53 bluezone joined #git
19:55 hahuang61 joined #git
19:57 barteks2x joined #git
19:58 eletuchy_ joined #git
19:58 jaguarmagenta joined #git
19:59 demiro joined #git
20:00 ntonjeta joined #git
20:00 kbs joined #git
20:00 ntonjeta joined #git
20:02 nnyk joined #git
20:04 rubyonrailed joined #git
20:05 cdown_ joined #git
20:07 livingstn joined #git
20:07 koro_ left #git
20:07 koro joined #git
20:07 docnvk joined #git
20:07 diegoviola joined #git
20:08 diegoviola I can't longer mark 266c73b77706f2d05b4a3e70a5bb702ed35431d6 as bad
20:08 diegoviola Some good revs are not ancestor of the bad rev. git bisect cannot work properly in this case. Maybe you mistook good and bad revs?
20:08 diegoviola what can I do?
20:08 _ikke_ git bisect log + git bisect replay?
20:09 diegoviola how?
20:09 diegoviola what does replay do?
20:09 King_Hual joined #git
20:09 moritz is 266c73b77706f2d05b4a3e70a5bb702ed35431d6 actually inside the bisected range?
20:09 _ikke_ " If you discover that you made a mistake in specifying the status of a revision, you can save the output of this command to a file, edit it to remove the incorrect entries, and then issue the following commands to return to a corrected state: "
20:09 _ikke_ man git bisect
20:09 gitinfo the git-bisect manpage is available at http://jk.gs/git-bisect.html
20:09 diegoviola https://gist.github.com/diegoviola/4ff45df4cfa3fe0805553c950c9d8812
20:09 diegoviola yes
20:10 _ikke_ You can edit this, an feed it back to bisect repla
20:10 _ikke_ replat
20:10 fullstack When I do 'git remote show origin' it saids 'master  ... pushes to master ... (local out of date)'  --- but when I try to update my local copy of master... 'git pull origin master' it saids 'Already up-to-date'
20:10 fullstack I'm having a brain fart, how do I update my local copy of master from remote
20:10 diegoviola _ikke_: not sure how I can do this
20:11 _ikke_ diegoviola: Do you see the 'bad' command in the log?
20:11 clemf joined #git
20:11 diegoviola yes
20:11 i7c fullstack, maybe you don't have master checked out?
20:11 _ikke_ Save this as a file, change that line from good to bad (or visa versa)
20:11 _ikke_ and then git bisect reset, git bisect replay <file>
20:12 diegoviola _ikke_: so I save the log as a file?
20:12 _ikke_ fullstack: it means that you already fetched, but you still need to merge
20:12 _ikke_ diegoviola: yes
20:12 sbeller joined #git
20:12 jeffreylevesque is it possible to create a new branch with nothing committed locally, and push it to the upstream repo?
20:12 i7c _ikke_, shouldn't pull do that? :)
20:12 sparetire joined #git
20:13 jeffreylevesque that way if i have a milestone, i can have all it's corresponding issue be merged to that empty branch on the upstream.  Then, maybe later merge that branch to master
20:13 moritz jeffreylevesque: starting off of an existing branch? That works
20:13 _ikke_ i7c: pull only does something if there is something to fetch
20:13 Smirnov joined #git
20:13 i7c mhm
20:13 moritz jeffreylevesque: don't know if it works with an orphan branch, but it doesn't sound like you want that anyway
20:13 diegoviola _ikke_: but there are two commits with the same hash
20:13 diegoviola _ikke_: do I get rid the one at the end?
20:14 diegoviola _ikke_: https://gist.github.com/diegoviola/4ff45df4cfa3fe0805553c950c9d8812
20:14 jeffreylevesque every issue that is created corresponds to the issue number.  for example, `feature-234` corresponds to issue # 234
20:14 i7c _ikke_, if that's true, I find that behaviour kind of confusing.
20:14 _ikke_ diegoviola: yes
20:14 diegoviola _ikke_: ok
20:14 diegoviola thanks
20:14 jeffreylevesque so maybe #234 is ready to be merged to some branch, to close that issue out.  But, it's not ready to be added to master
20:15 fullstack _ikke_, I checked bitbucket, and my branch was merged on bitbucket
20:15 diegoviola _ikke_: so this is what I have: https://gist.github.com/1603c2ad419df1f1d2cd70d0920b43a0
20:15 jeffreylevesque my repo has maybe 10 milestones.  So i want ppl to be able to work on milestone 0.7, while i work on milestone 0.4
20:15 diegoviola looks fine?
20:15 jeffreylevesque so as they work on 0.7, it shouldn't be merged to master
20:15 eletuchy joined #git
20:15 jeffreylevesque bc 0.4-0.6 milestone is not finished
20:16 fullstack _ikke_, when I create a new director and git clone the repo ago.. the files are there?
20:16 _ikke_ fullstack: what does git branch -vv return
20:16 _ikke_ ?
20:17 diegoviola _ikke_: I got this: https://gist.github.com/diegoviola/8712560a07851ce26f3536735a335120
20:17 diegoviola is it ok?
20:17 diegoviola why is it saying "We are not bisecting"
20:17 i7c _ikke_, and it's not true btw. ;)
20:17 i7c _ikke_, I just checked.
20:18 i7c fetch -> got something new, pull, still merges.
20:18 _ikke_ i7c: oh, ok
20:18 _ikke_ recalled incorrectly hten
20:19 diegoviola ok it's still going
20:20 diegoviola it's bisecting linux 4.6 now
20:20 diegoviola but at the end of the bisect log I see this:
20:20 diegoviola # good: [b4cec5f66849872d2e9573bc95c2016cb8e530ec] Merge tag 'ntb-4.6' of git://github.com/jonmason/ntb
20:20 diegoviola git bisect good b4cec5f66849872d2e9573bc95c2016cb8e530ec
20:20 diegoviola I didn't say 4.6 was good yet
20:20 diegoviola is this just some default value?
20:20 gsingh joined #git
20:21 gsingh left #git
20:22 diegoviola I'll do it over again
20:24 eletuchy joined #git
20:24 Narwhaal joined #git
20:24 adino joined #git
20:25 dan2k3k4 joined #git
20:26 docnvk joined #git
20:34 mkelly joined #git
20:34 allcentury joined #git
20:35 rominronin joined #git
20:39 sanketdg joined #git
20:39 RedShift joined #git
20:40 allcentury joined #git
20:41 mdw joined #git
20:41 fullstack _ikke_, it just suddenly "worked"
20:41 fullstack I think it was lag on bitbucket
20:42 fullstack perhaps I should switch to gitlab
20:46 romerocesar joined #git
20:47 mkelly joined #git
20:47 ki0 joined #git
20:51 mkelly joined #git
20:51 kanyeezy joined #git
20:51 allcentury joined #git
20:52 mkoskar joined #git
20:56 Doginal joined #git
20:56 hahuang61 joined #git
20:57 xall joined #git
20:59 mehola_ joined #git
20:59 mkelly joined #git
20:59 romerocesar joined #git
21:00 NeverDie joined #git
21:00 ahmedelgabri joined #git
21:05 diogenese joined #git
21:07 NeverDie joined #git
21:08 allcentury joined #git
21:09 Tryop88_ joined #git
21:11 NeverDie joined #git
21:12 ozette joined #git
21:12 mehola joined #git
21:13 mkelly joined #git
21:14 docnvk joined #git
21:17 ash_workz joined #git
21:21 NeverDie_ joined #git
21:21 NeverDie_ joined #git
21:23 NeverDie_ joined #git
21:23 qswz left #git
21:24 mehola joined #git
21:25 romerocesar joined #git
21:25 Sucks joined #git
21:27 jwynn6 joined #git
21:29 mkelly joined #git
21:29 eletuchy joined #git
21:30 mehola joined #git
21:30 circ-user-Oetft_ joined #git
21:32 theRealGent joined #git
21:32 theRealGent When you squash commits, can that be reversed? Is any data about the comments/particular changes of each commit present after the squash?
21:33 nick123 joined #git
21:34 i7c The old commits are still around.
21:34 i7c I.e. the unsquashed ones. See git reflog.
21:36 rominronin joined #git
21:39 paul424 joined #git
21:41 mehola joined #git
21:42 mkelly joined #git
21:43 NeverDie joined #git
21:44 mehola joined #git
21:44 NeverDie joined #git
21:45 Sasazuka__ joined #git
21:46 NeverDie joined #git
21:47 NeverDie joined #git
21:48 mozzarella joined #git
21:48 NeverDie joined #git
21:50 NeverDie joined #git
21:50 eletuchy joined #git
21:51 NeverDie joined #git
21:51 mingrammer_ joined #git
21:52 fscala joined #git
21:53 mkoskar joined #git
21:53 grubles joined #git
21:54 vjacob joined #git
21:54 theRealGent thanks i7c
21:55 theRealGent And my last question would be is there any difference between **/target and target/ within a .gitignore?
21:55 qsx theRealGent: yes, the latter one only matches directories named target
21:55 adino joined #git
21:55 theRealGent qsx, aha. But target/ still ignores all directories named target regardless of where they are in the file system tree correct?
21:56 qsx theRealGent: down from .gitignore – neither will match in parent directories of course.
21:56 theRealGent qsx, of course.
21:57 hahuang61 joined #git
21:58 joki joined #git
21:58 eletuchy joined #git
21:58 zivester joined #git
21:58 Groscheri joined #git
21:59 mehola joined #git
21:59 jaguarmagenta joined #git
21:59 mkelly joined #git
22:00 eletuchy_ joined #git
22:00 SwiftMatt joined #git
22:02 monoprotic joined #git
22:02 trewe joined #git
22:02 romerocesar joined #git
22:03 piling_ joined #git
22:03 kbs joined #git
22:05 docnvk joined #git
22:05 diegoviola joined #git
22:06 mehola joined #git
22:06 kbs Mostly out of idle curiosity - outside of git fsck, when does git fully check all the blobs and hashes are correctly associated in the graph? (e.g. does git clone do this?)
22:09 emPi joined #git
22:11 efdetonator joined #git
22:12 mkelly joined #git
22:14 mehola joined #git
22:16 cdg joined #git
22:18 efdetonator joined #git
22:18 circ-user-Oetft joined #git
22:18 mehola joined #git
22:19 kbs well, clone apparently doesn't do it, interesting...
22:20 allcentury joined #git
22:22 docnvk joined #git
22:23 a3Dman joined #git
22:24 DirtyCajun joined #git
22:24 mehola joined #git
22:24 rbr joined #git
22:28 mkelly joined #git
22:28 romerocesar joined #git
22:28 Sonderblade joined #git
22:29 mehola joined #git
22:29 Literphor joined #git
22:32 malide joined #git
22:33 eijk_ joined #git
22:36 efdetonator joined #git
22:37 mehola joined #git
22:37 rominronin joined #git
22:37 inflames joined #git
22:38 efdetonator joined #git
22:41 stonerfish joined #git
22:42 FuzzySockets joined #git
22:42 CheckDavid joined #git
22:47 efdetonator joined #git
22:48 efdetonator joined #git
22:51 nnyk joined #git
22:52 CEnnis91 joined #git
22:53 mehola joined #git
22:56 vuoto joined #git
22:58 hahuang61 joined #git
23:01 mehola joined #git
23:06 ahmedelgabri joined #git
23:08 Sucks joined #git
23:09 Ranhir joined #git
23:10 efdetonator joined #git
23:12 efdetonator joined #git
23:14 nnyk joined #git
23:16 dopesong joined #git
23:16 cdg joined #git
23:18 eduby joined #git
23:20 carif joined #git
23:21 mablae_ joined #git
23:21 dbkaplun left #git
23:24 ffabi joined #git
23:25 xall joined #git
23:25 ochorocho__ joined #git
23:28 quetz_ru joined #git
23:28 Kallis joined #git
23:28 eduby joined #git
23:29 efdetonator joined #git
23:31 xall_ joined #git
23:34 mehola joined #git
23:34 nick123 joined #git
23:38 rominronin joined #git
23:42 Sucks joined #git
23:44 allcentury joined #git
23:46 Rodya_ joined #git
23:49 douglascorrea joined #git
23:50 elastix joined #git
23:51 SpeakerToMeat can I get a single commit from a remote repo I've not cloned as a patch?
23:52 i7c Not with pure git, no.
23:52 i7c Almost everything that git does works locally.
23:52 SpeakerToMeat Hmm ok
23:52 dreiss joined #git
23:53 SpeakerToMeat And I can't find a way on github to get the raw commit as a patch :/
23:53 DistantStar joined #git
23:53 iron74 left #git
23:54 mehola joined #git
23:55 matthiaskrgr ?
23:55 matthiaskrgr if the commit is public, you can just show it in github and add ".patch" to the url
23:55 SpeakerToMeat matthiaskrgr: I want a single commit from a remote github
23:55 SpeakerToMeat matthiaskrgr: oh...
23:55 matthiaskrgr https://github.com/llvm-mirror/llvm/commit/9a17918d1cf510fd0ecf20d0fcb17128036fd203
23:55 matthiaskrgr =>
23:55 NeverDie joined #git
23:55 matthiaskrgr https://github.com/llvm-mirror/llvm/commit/9a17918d1cf510fd0ecf20d0fcb17128036fd203.patch
23:55 Rodya_ joined #git
23:55 * SpeakerToMeat hugs matthiaskrgr
23:55 matthiaskrgr :)
23:55 SpeakerToMeat thanks dude
23:56 matthiaskrgr :3
23:56 matthiaskrgr .diff might work too
23:56 SpeakerToMeat .diff works better
23:56 SpeakerToMeat doesn't have the informational header which IDK wether patch would choke on or not.
23:56 sangy joined #git
23:57 mozzarella joined #git
23:58 docnvk joined #git
23:58 hahuang61 joined #git

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