IRCloggy #git 2012-01-29

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2012-01-29

← aalex left00:00
← nOStahl left00:00
→ matsebc joined00:01
tizzo → tizzo-afk00:01
← koo3 left00:02
← eijk_ left00:04
← shruggar left00:06
→ uu joined00:06
← Destos left00:08
→ conntrack joined00:08
← matsebc left00:11
← techhelp left00:11
→ LucasTizma joined00:13
← jargon- left00:14
→ maartenv joined00:17
→ traviscj joined00:17
← LucasTizma left00:20
→ nikuyoshi joined00:22
← detaer left00:23
← Goplat left00:24
← flaguy48 left00:24
→ mikepack joined00:24
← di-five left00:27
← bolt left00:28
→ zomothesweeper joined00:29
← Demego left00:30
← lapistano left00:31
→ lapistano joined00:31
→ bolt joined00:32
evilniko → niko00:33
← Matrixiumn left00:35
← ajpiano left00:37
→ ajpiano joined00:39
← heinrich5991 left00:41
→ mulletron joined00:43
→ detaer joined00:43
→ frogonwheels joined00:45
← mezgani left00:46
← kryl99 left00:46
→ kryl99 joined00:47
← dSebastien_ left00:47
← frogonwheels left00:48
← caseymcg left00:49
→ dougsland joined00:50
← dougsland left00:50
→ dougsland joined00:50
CEnnis91|Away → CEnnis9100:51
← shad left00:51
→ shad joined00:51
→ smw joined00:52
smw how do I get the date of the last commit?00:53
SethRobertson `git show` among many other ways00:53
smw thanks00:53
→ heinrich5 joined00:54
← Praise left00:55
← ajpiano left00:57
→ Praise joined00:58
tizzo-afk → tizzo00:59
→ ajpiano joined00:59
tizzo → tizzo-afk01:01
→ friskd joined01:01
→ phillllijw joined01:03
← detaer left01:03
← bitkiller left01:04
→ sudoquai_ joined01:04
← sudoquai left01:06
→ matsebc joined01:06
← hyperair left01:07
→ frogonwheels joined01:07
← philllllijw left01:07
→ mando joined01:09
← tvw left01:12
← M_D_K left01:13
← matsebc left01:14
← uu left01:14
→ LeMike joined01:19
EugeneKay If your .bashrc contains the following line, you may be a bad person: alias git='ps1_git_date=0 && /usr/bin/git'01:19
→ nightshift joined01:19
cMike I'm having trouble setting up my git repo on my server, can anyone help me out?01:20
cbreak git init --bare01:20
done01:20
cMike yeah, but my refs folder is having issues01:21
cbreak add a --shared if you will share it with other users01:21
refs? problems?01:21
EugeneKay cMike: !repro01:21
gitinfo cMike: please paste (e.g. using http://git.pastebin.com/) a transcript of your terminal session in which the problem occurred so that we can troubleshoot more easily.01:21
NiklasFiekas → NiklasFiekas|afk01:21
EugeneKay 20 ?'s is fun and all, but I'm out of booze01:21
→ nicxvan joined01:21
← nightshift left01:22
→ hyperair joined01:22
cMike http://pastebin.com/ZD6tTeTK01:22
← jacekmigacz left01:23
cMike EugeneKay: !repo? what does this do?01:23
gitinfo EugeneKay: [!large_repos] Git can be slow in the face of large repositories. There are git-config options which can help. pack.threads=1; pack.deltaCacheSize=1; pack.windowMemory=512m; core.packedGitWindowSize=16m; core.packedGitLimit=128m. Other likely ones exist.01:23
EugeneKay cMike - it's "repro", and see what gitinfo said about it01:24
cbreak cMike: you should have write permissions in the folder you want to use as repository01:24
→ reggal joined01:24
EugeneKay Or, to put it another way, !doesntwork01:25
gitinfo Or: Sorry to hear it doesn't work. What happened? Did it fall asleep on your couch? Eat your homework? What did you want it to do? What happened instead? Please be specific!01:25
← friskd left01:26
← mpabst left01:27
→ Samual joined01:28
→ neurodrone_ joined01:28
← neurodrone left01:29
neurodrone_ → neurodrone01:29
← ajpiano left01:33
→ johnanderson joined01:33
← [M]ax left01:34
← reggal left01:34
→ ajpiano joined01:34
→ [M]ax joined01:35
← hyperair left01:35
→ reggal joined01:36
→ flaguy48 joined01:37
→ fayimora joined01:42
← reggal left01:45
→ reggal joined01:48
← reggal left01:48
← _md left01:51
← cMike left01:51
→ detaer joined01:53
→ mpabst joined01:54
← [M]ax left01:57
→ abetaha joined01:57
← skylord5816 left01:58
→ wuj joined01:58
→ rickmast joined01:59
→ [M]ax joined01:59
← rickmasta left02:00
← Russell^^ left02:00
→ sudoquai joined02:01
← sudoquai left02:01
→ yuwang joined02:02
← sudoquai_ left02:03
→ sudoquai joined02:03
← sudoquai left02:04
← mando left02:04
→ jk4 joined02:05
← JPT left02:06
→ sudoquai joined02:06
jk4 i have a wierd issue that when i push to a cgit repo, cgit says "Repository seems to be empty02:06
it doesn't seem to be related to version mismatches and another repo works fine.02:06
i wonder if anyone else has had a similar issue and found a solution02:06
← matthiaskrgr left02:06
jk4 goes like this: 1) repo works fine in cgit 2) pull, add/commit, push, 3) borked02:07
but if it delete the repo on the server, create a bare repo and then push to it, it works02:07
→ Goplat joined02:08
jk4 so wierd and had a hard time searching for symptoms like that02:08
→ matthiaskrgr joined02:09
← dibber left02:10
→ wilmoore joined02:11
→ Bmac joined02:12
→ __null joined02:15
bremner jk4: is the repo really "borked" or is cgit just confused?02:15
→ akosikeno joined02:15
← [M]ax left02:15
__null I just had to do a hard reset to a previous commit. Do I need to push after the hard reset?02:16
phillllijw can I run gc on the bare (origin) repo?02:16
__null The changes are made and all, but I'd like the current commit to be reflected on github02:16
RandalSchwartz if you did a reset, it'll have to be a forced push02:17
and you will make people angry02:17
!rewrite history02:17
gitinfo [!rewriting_public_history] Rewriting public history is a very bad idea. Anyone else who may have pulled the old history will have to `git pull --rebase` and even worse things if they have tagged or branched, so you must publish your humiliation so they know what to do. You will need to `git push -f` to force the push. The server may not allow this. See receive.denyNonFastForwards (git-config)02:17
__null i'm the only one using this02:17
← fayimora left02:18
→ Matrixiumn joined02:18
RandalSchwartz then why do you have it on github?02:18
(third time I've heard this in two days)02:18
__null multiple work environments02:18
RandalSchwartz why not a private repo then?02:18
→ [M]ax joined02:18
__null i work for a non-profit02:18
i don't want to spend money on a private gh02:18
repo02:18
jk4 bremner: the repo is fine. we can push and pull to our hearts' contents02:18
RandalSchwartz uh... WHAT?02:18
github isn't the only game in town02:19
← johnanderson left02:19
__null i know this02:19
i know about bitbucket02:19
but i prefer github02:19
RandalSchwartz bitbucket isn't the only *other* game in twon02:19
← ahf left02:19
RandalSchwartz it's about 15 minutes to install gitolite02:19
jk4 gitolite is pretty decent02:19
RandalSchwartz then you have a completely private repo that you can force-push to your heart's content02:19
DON'T DO THAT ON GITHUB02:19
← Lgb left02:20
__null okay.. what's the best way to get the master github back to the previous commit without hurting your feelings?02:20
RandalSchwartz man git-revert02:20
gitinfo the git-revert manpage is available at http://jk.gs/git-revert.html02:20
→ ahf joined02:20
__null thanks02:20
RandalSchwartz add a commit that undoes the previous one02:20
and next time, remember, when you push, it's on your permanent record02:20
so think twice before you do that02:20
→ johnanderson joined02:20
← johnanderson left02:20
→ majorursa joined02:21
→ Lgb joined02:21
__null okay, thanks for the info02:21
what do you have against github?02:21
are they don't something that you don't approve of?02:22
RandalSchwartz I have nothing against it, when you're actually sharing stuff02:22
but when it's *just* *you*, why publish there?02:22
RichiH is there a way to set a default email address for a repo so that git send-email will always send to this address by default?02:22
bremner yes02:23
RandalSchwartz git config blahblah02:23
bremner oh, to, sorry02:23
RandalSchwartz man git-config02:23
gitinfo the git-config manpage is available at http://jk.gs/git-config.html02:23
bremner from yes, to, I don't think so02:23
__null RandalSchwartz: it's just me for now. but in the future we will add developers02:23
RichiH bremner: yah, not from ;)02:23
there is sendemail.cc and sendemail.bcc, but no sendemail.to02:24
→ guns joined02:25
→ philllllijw joined02:26
smw I forget the command to do this but I know it is possible. How can I make a new commit and branch at the same time?02:26
→ TomyLobo joined02:27
→ amigojapan joined02:27
smw anyone/02:27
?02:27
← offby1 left02:29
← mpabst left02:29
← phillllijw left02:29
→ offby1 joined02:30
← offby1 left02:30
→ offby1 joined02:30
RandalSchwartz "make a new commit"?02:31
don't make a commit that has no delta02:31
smw RandalSchwartz, I just managed to lose my changes :-\02:31
RandalSchwartz that just makes things noisy02:31
git checkout -b NEWBRANCH02:31
← JackWinter left02:32
RandalSchwartz that creates NEWBRANCH as the same as the current commit02:32
that's generally what you want02:32
smw RandalSchwartz, good to know02:32
RandalSchwartz, now I will go remake my changes :-\02:32
← guns left02:32
→ jmoreira81 joined02:33
jmoreira81 Hi! I'm having an issue…. I'm push to a remote repo, it says everything is up to date but nothing changes on the remote repo. Any clues?02:33
RandalSchwartz how do you know "nothing changes"02:34
are you pushing to a non-bare repo?02:34
→ JackWinter joined02:34
RandalSchwartz waits for jmoreira8102:34
→ [RHQme]stringo0 joined02:34
jmoreira81 yea...02:35
← stringoO left02:35
RandalSchwartz !non-bare02:35
jmoreira81 i'm pushing to a non-bare repo02:35
RandalSchwartz !bare02:35
gitinfo an explanation of bare and non-bare repositories can be found here: http://bare-vs-nonbare.gitrecipes.de/02:35
RandalSchwartz yaeh don't do that02:35
push only to bare repos02:35
jmoreira81 i'm sorry.. i was pushing to a bare02:35
myrepo.git02:35
RandalSchwartz ok - then how do you know "nothing changes"02:35
jmoreira81 it was working before i changed my hdd on my computer02:36
← Matrixiumn left02:36
RandalSchwartz waits for something other than a non-answer02:36
RandalSchwartz How. Do. You. Know.02:37
jmoreira81 yea02:37
because i cloned from the git repo and it didn't update the files02:37
RandalSchwartz what is the command you're testing to see if something changed02:37
jmoreira81 the files remain old02:37
i cloned into a different directory to see if it was being updated but i don't think it is02:38
RandalSchwartz what does "git branch -avv" say?02:38
does it show your remotes are updated?02:39
← brian_g left02:39
__null RandalSchwartz: is checking out the older commit and making it a new comment (with a detailed commit message) adequate?02:39
jmoreira81 on the remote git repo?02:39
RandalSchwartz no - local02:40
the local repo will also show what it things the remote commits are too02:40
git fetch --all will update those02:40
and if that shows the commits local and remote are the same, the push is already there02:40
as in - if "master" and "remotes/origin/master" are the same commit, life is good02:41
jmoreira81 let me see...02:42
RandalSchwartz compare "git branch -avv" and "git branch -rvv"02:42
jmoreira81 locally?02:42
→ Yuuhi`` joined02:42
RandalSchwartz well - if you can issue commands in the remote repo, that'd be cool as well02:43
→ Heimidal joined02:43
RandalSchwartz darn it - trying to remember the equivalent remote command02:44
→ guns joined02:44
← Yuuhi` left02:44
← berserkr left02:44
jmoreira81 i can.. the remote is a gitosis remote i created02:44
RandalSchwartz yeah, but there's two basic commands to say "show the branch heads locally" and "show the branch heads remotely"02:45
the second escapes me at the moment02:45
→ iamjarvo joined02:45
canton7 ls-remote ?02:46
← detaer left02:46
← patrick99e99 left02:47
← wilmoore left02:49
jmoreira81 RandalSchwartz: It's working.02:50
← j416 left02:50
jmoreira81 not sure what happened there….02:50
RandalSchwartz: brb02:50
__null i can't perform git revert on a root commit02:51
RandalSchwartz so if you have A B C, and you don't like C, you need to generate A B C C'02:52
which is what git-revert does02:52
*you* are trying to make it A B only02:52
and that breaks people who have pulled02:52
→ caseymcg joined02:52
__null i see02:53
→ techhelp joined02:54
→ maletor joined02:54
← maletor left02:55
→ shiba_yu36 joined02:55
← neurodrone left02:57
→ neurodrone joined02:57
← drive-by-advice left02:59
← toxico left02:59
← disappearedng left03:00
← ph^ left03:00
→ kimico joined03:00
← leo left03:00
__null so after reading the man pages for a few things, is my best way to go about this to checkout commit B and create a new commit D after C (where the problem happened)?03:00
← arvind_khadri left03:00
← bolt left03:00
→ leo joined03:00
→ disappearedng joined03:00
← Chib left03:00
→ ph^ joined03:00
→ Chib joined03:01
← Exodist left03:01
→ drive-by-advice joined03:01
← storrgie left03:01
← madsy left03:01
→ Exodist joined03:01
→ nadavoid joined03:02
← jweinberg left03:02
← tabakhase left03:02
← malorie left03:02
← blast_hardcheese left03:02
← ezkl left03:02
→ storrgie joined03:02
← demi` left03:02
→ malorie joined03:03
→ tabakhase joined03:03
← Lgb left03:03
← shuffle2 left03:03
← Lujeni left03:03
← k0rnel left03:03
→ shuffle2 joined03:03
→ k0rnel joined03:03
→ demi` joined03:03
→ madsy joined03:03
← madsy left03:03
→ madsy joined03:03
← GrowLinux left03:03
← moqq left03:03
← as3llus left03:03
→ blast_hardcheese joined03:04
← blast_hardcheese left03:04
→ blast_hardcheese joined03:04
→ jweinberg joined03:04
→ GrowLinux joined03:04
→ moqq joined03:04
← wereHamster left03:04
← jason237 left03:04
← havocologe left03:04
← dyek_ left03:04
→ as3llus joined03:04
→ havocologe joined03:04
← k6b left03:04
→ wereHamster joined03:05
→ ezkl joined03:05
→ Lgb joined03:06
← TheDudeKnows left03:06
→ Lujeni joined03:07
→ maqr joined03:07
← OOPMan left03:08
← Error404NotFound left03:08
← rickmast left03:09
→ munichlinux joined03:09
→ OOPMan joined03:09
→ k6b joined03:09
→ rickmasta joined03:09
← Bmac left03:11
→ bolt joined03:11
→ dyek_ joined03:12
→ arvind_khadri joined03:13
← arvind_khadri left03:13
→ arvind_khadri joined03:13
→ jason237 joined03:13
← wuj left03:14
→ yakko joined03:14
→ intripoon_ joined03:17
← OOPMan left03:18
→ fisted_ joined03:18
→ mandric joined03:19
→ OOPMan joined03:19
← orafu left03:20
← canton7 left03:20
→ orafu joined03:20
← fisted left03:20
← intripoon left03:20
→ Error404NotFound joined03:21
→ Matrixiumn joined03:21
← [M]ax left03:23
SethRobertson __null: !fixup03:23
gitinfo __null: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at https://gist.github.com/1612395 for full instructions. For hints type !fixup_hints in IRC. Remember, if you have pushed there only a few things you can do without !rewriting_public_history (type that for more info)03:23
→ jonesy joined03:24
→ [M]ax joined03:25
→ TheDudeKnows joined03:29
← iamjarvo left03:29
← sudoquai left03:29
← Matrixiumn left03:30
← kukks left03:31
← ajpiano left03:34
← OOPMan left03:35
→ ajpiano joined03:36
→ OOPMan joined03:36
← Error404NotFound left03:39
← TheDudeKnows left03:40
→ TheDudeKnows joined03:40
→ Error404NotFound joined03:40
→ marcoshack_br joined03:41
← DofLeFou left03:41
← TheDudeKnows left03:43
→ TheDudeKnows joined03:45
← caseymcg left03:45
← TheDudeKnows left03:46
→ davidrussell joined03:48
← techhelp left03:49
← SeySayux left03:49
← timoxley left03:51
→ timoxley joined03:52
→ Bmac joined03:54
→ TheDudeKnows joined03:56
← TheDudeKnows left03:58
→ TheDudeKnows joined03:58
→ hyperair joined03:59
→ McLovin` joined03:59
→ SeySayux joined04:00
← nicxvan left04:01
← easypie left04:01
→ easypie joined04:01
← McLovin` left04:03
← OOPMan left04:03
→ Kitsuo joined04:04
→ igotnolegs joined04:06
jmoreira81 I keep getting the passphrase pop up when pushing to a repo? Does anyone know how to remove it? I had to create a new id_isa_pub.04:06
RandalSchwartz yeah - don't create passphrase-protected pairs for automated tasks04:07
→ savage- joined04:07
← Bmac left04:07
← savage- left04:08
jmoreira81 hummm gotcha04:09
→ dr0id joined04:10
← yakko left04:11
→ jaisoares joined04:11
jmoreira81 it worked...04:11
→ Bmac joined04:12
← Error404NotFound left04:12
→ iamjarvo joined04:12
← Chillance left04:13
→ caseymcg joined04:13
→ angelsl joined04:21
→ yshh joined04:21
→ OOPMan joined04:22
→ Matrixiumn joined04:24
← mikepack left04:25
← Kitsuo left04:25
→ Kitsuo joined04:25
→ wilmoore joined04:26
← disappearedng left04:27
← vandal- left04:29
← nadavoid left04:29
← Kitsuo left04:30
→ xerora joined04:30
→ Kitsuo joined04:30
← Kitsuo left04:30
→ jwmann joined04:32
→ nadavoid joined04:33
→ wuj joined04:35
← carbocation left04:35
← davidrussell left04:37
← OOPMan left04:38
→ Axsuul joined04:40
← Axsuul left04:40
→ Axsuul joined04:40
← Axsuul left04:40
→ Axsuul joined04:40
← Axsuul left04:41
← Matrixiumn left04:41
→ Axsuul joined04:41
→ banisterfiend joined04:44
→ KindOne joined04:45
→ t4nkd joined04:45
← amigojapan left04:46
← zomothesweeper left04:48
← marcoshack_br left04:49
→ AlecTaylor joined04:49
AlecTaylor hi04:49
Getting some weird responses from a git pull04:50
Example: td0s_deIgOslm0 e/Deotde 4rocpyFFeme e4_tSetdepc/ol/inte.04:50
eo0p0robltd0socmt024d_eh td0s_dbr210ar_kbl e/10aundrs_urme 0 e dcg/11atesyhbltd0s_dbr229i_cshlm14ec/ie102p_o_corme 4rocmt126t___t.04:50
eo0 e/dgt0r/ba009nadhnc/e04_theo0edie29_cponme 0pcme0_fisrtem0p//209d__d022ar. e so/t14d_dhem0s/1ts_rb.htm me r//a15ggloe 4ecg026ldb e d/a11c_mrlt 4ed/200ao_d oda210eaor04:50
te4o/g020t_rl 04d//g121ronthed6ed//20l22tser.de 4oba11__e.em4edt15eooon.le1 r_//gtgm4edgllnt csegngte4e/autlgt rd///p04:50
ee0pdglm0pcmfgee04p_/c/dAaneme0poigsBn 1r_cmpked o6 1e/amt0sd/_nt04:50
Any ideas what's causing this?04:50
RandalSchwartz whoa04:50
you pulling from mars? :)04:51
AlecTaylor :P04:51
That's about 5% of the title response04:51
*total04:51
I haven't pulled from the project for ages, but that shouldn't cause these sorts of errors :\04:51
banisterfiend RandalSchwartz: did you name yourself after the schwartz transform04:52
→ digitalfiz joined04:52
← digitalfiz left04:52
→ digitalfiz joined04:52
RandalSchwartz heh... exactly the opposite :)04:53
banisterfiend ;)04:53
RandalSchwartz My dad named me after him, actually :)04:53
banisterfiend cool04:53
RandalSchwartz at least the last name04:53
AlecTaylor xD04:54
RandalSchwartz my mom picked out my first name04:54
banisterfiend RandalSchwartz: oh so you're not 'the' randal schwartz?04:54
RandalSchwartz I *am* 'the' Randal Schwartz yes04:54
and the Schwartzian Transform is named after me, but not *by* me04:54
I'm not that vain. :)04:54
banisterfiend groovy04:54
must feel good to have something named after you04:55
RandalSchwartz Tom Christiansen came up with that name04:55
← wuj left04:56
RandalSchwartz well - it's not really something I invented, so it's a bit weird.04:57
← KindOne left04:58
RandalSchwartz I mean, I was hacking decorate-undecorate patterns a dozen years earlier in Emacs Lisp.04:58
← Bmac left04:58
→ rchavik joined05:05
← rchavik left05:05
→ rchavik joined05:05
← sharkmonkey left05:08
← iamjarvo left05:08
→ mdel joined05:11
← cilly left05:11
→ w09x joined05:12
← w09x left05:12
→ w09x joined05:12
→ subbyyy joined05:12
→ cilly joined05:14
→ yakko joined05:14
← soulcake left05:16
→ bindaasomatic joined05:16
← digitalfiz left05:16
→ digitalfiz joined05:17
← digitalfiz left05:17
→ digitalfiz joined05:17
← Octalot left05:19
AlecTaylor I'm trying to add a new folder to the source tree. What's the command?05:19
← w09x left05:21
AlecTaylor `git add .` isn't doing anything :\05:21
← jepler left05:22
RandalSchwartz git doesn't track folders05:23
just content05:23
put some content in there05:24
then add that05:24
tizzo-afk → tizzo05:24
banisterfiend RandalSchwartz: is it possible to do an interactive cherry-pick ?05:24
RandalSchwartz tries to comprehend what that means05:25
banisterfiend RandalSchwartz: i'd like to cherry-pick a range of commits, but interactively (so i can squash some of them, and delete some of them)05:25
RandalSchwartz that sounds like you want rebase -i05:25
→ jepler joined05:26
tizzo I don't suppose git magically keeps a copy of stashes that I've already popped somewhere?05:26
RandalSchwartz: love FLOSS weekly btw05:26
RandalSchwartz++05:27
RandalSchwartz thank you05:27
AlecTaylor Finally got an error! - `fatal: Path 'store/static/bootstrap/bootstrap.css' is in submodule 'store/static/bootstrap'`05:27
banisterfiend RandalSchwartz: hmm, say i had branch1, but i wanted to cherry-pick from branch2~7..branch2~2 (but interactively) how would i do that using rebase -i instead?05:27
RandalSchwartz: i wanted to cherry-pick those commits onto branch1*05:27
RandalSchwartz git rebase -i branch2-7..branch2-2 --onto branch105:27
AlecTaylor How do I add that .css to the static folder?05:27
banisterfiend RandalSchwartz: that's when i have branch1 checked out?05:27
RandalSchwartz doesn't matter05:28
it'll check out branch1 because of --onto05:28
← nikuyoshi left05:28
banisterfiend RandalSchwartz: ah cool, thanks05:28
tizzo HA! I don't need my stashed stuff, I had a vi buffer open, phew05:28
→ Matrixiumn joined05:29
← Matrixiumn left05:29
→ Matrixiumn joined05:29
RandalSchwartz doesn't ever use stash05:29
tizzo but to confirm, if you git stash that's totally out of git's repo history completely at that point right?05:29
RandalSchwartz: oh, it's so useful!05:29
esp when jumping between feature branches05:29
RandalSchwartz I just comit05:29
I never have a dirty tree05:29
tizzo lots of feature branches?05:29
AlecTaylor How do I get past this error? - `fatal: Path 'store/static/bootstrap/bootstrap.css' is in submodule 'store/static/bootstrap'`05:29
tizzo AlecTaylor: sounds like the file you're trying to mess with is in a child repository05:30
RandalSchwartz there's nothing stash is doing that you can't do with commits05:30
tizzo you have to commit it to the child repo then update the parent repo05:30
RandalSchwartz but commits make it visible05:30
AlecTaylor tizzo: kk05:30
RandalSchwartz stash is kinda magical05:30
I'm very good at WIP commits05:31
and then undoing them later05:31
← frogonwheels left05:31
← mandric left05:31
tizzo RandalSchwartz: in principle that's true, but I work with a team of about 10 other folks and to avoid a history that's 80% merges, we have git set to auto rebase on pull05:31
RandalSchwartz the nice thing is they become part of history, so I can diff against the WIPs05:31
tizzo that means no pulling with a dirty working tree05:31
so I stash, pull, stash pop a lot in mid thought05:31
RandalSchwartz right - I never pull with a dirty tree either05:31
I *never* bring in other work without committing05:32
tizzo yeah, that does make sense, I've been moving in that direction much much more05:32
one think I've been using stash for a lot lately is a settings file that has to be different on my local env.05:32
why would that be checked into the VCS you ask?05:32
because the stupid app host the client is requiring needs it to be there for their stuff not to 'splode05:33
stash is really nice for that05:33
RandalSchwartz that should be part of the build process then05:33
not in the VCS05:33
VCS should record the prototype version05:33
tizzo RandalSchwartz: I agree, now if I could only convince the app host ;)05:33
RandalSchwartz but not the live value05:34
tizzo yep yep yep05:34
RandalSchwartz if you abuse software, everyone loses05:34
tizzo and pushing to the git repo should probably never auto deploy to even the dev env either05:34
but … sometimes you have to put up with a broken system05:34
RandalSchwartz you end up with suggestions for thedailywtf.com05:34
so many of my client's work would go there. :)05:35
tizzo haha, yeah seriously05:35
← metellius left05:38
→ metellius joined05:39
AlecTaylor Damn, I keep getting these errors: "You have both store/static/bootstrap and store/static/bootstrap/LICENSE error: Error building trees"05:40
← nadavoid left05:41
RandalSchwartz wanders off05:41
← AlecTaylor left05:43
→ kl4m joined05:50
← orospakr left05:50
← n3m left05:50
→ snickers_ joined05:50
← flyz_ left05:54
offby1 wanders eof05:54
← AzzA left05:54
← Matrixiumn left05:54
banisterfiend offby1: hey, how's your ruby experience going05:54
→ flyz joined05:55
→ Cam joined05:58
← majorursa left06:02
← Textmode left06:03
← [RHQme]stringo0 left06:04
→ Matrixiumn joined06:06
← Matrixiumn left06:06
← guns left06:07
→ maleknet joined06:08
→ Anubisss joined06:09
← Anubisss left06:09
← milki left06:10
→ guns joined06:12
→ LICH joined06:15
← LICH left06:16
→ cirwin joined06:17
← yakko left06:17
→ Shusshu joined06:17
← Cam left06:19
→ zomothesweeper joined06:21
← madewokherd left06:21
← t4nkd left06:24
← caseymcg left06:25
← [M]ax left06:25
→ [M]ax joined06:29
→ t4nkd joined06:29
→ glcrazy joined06:29
← timoxley left06:32
→ milki joined06:33
← milki left06:33
→ timoxley joined06:35
→ milki joined06:35
← drl left06:36
→ tewecske joined06:37
← aspotashev| left06:39
→ nixmaniack joined06:40
← timoxley left06:42
→ brainsail joined06:44
→ krz joined06:46
→ AmirBehzad joined06:48
→ queequeg1_ joined06:49
← gerberb left06:49
← queequeg1 left06:50
→ bgerber joined06:51
← cilly left06:51
← maleknet left06:51
← jwmann left06:51
→ savage- joined06:51
→ orospakr joined06:53
→ rurufufuss joined06:53
← [M]ax left06:59
← kenyon left06:59
← subbyyy left06:59
← adamm left07:00
← JoeyJoeJo left07:01
→ [M]ax joined07:02
← zomothesweeper left07:02
→ maleknet joined07:03
Karmaon Uhh, why did git flow not apply the no-ff for merging a feature branch?07:06
→ caseymcg joined07:06
← savage- left07:10
→ Matrixiumn joined07:11
→ apok joined07:11
← arvind_khadri left07:11
→ kenyon joined07:12
→ arvind_khadri joined07:12
← arvind_khadri left07:12
→ arvind_khadri joined07:12
→ detaer joined07:12
← bindaasomatic left07:15
→ bindaasomatic joined07:15
← queequeg1_ left07:17
→ savage- joined07:17
← shiba_yu36 left07:18
← Heimidal left07:19
→ Heimidal joined07:19
→ shiba_yu36 joined07:21
← wilmoore left07:21
← detaer left07:21
→ oyvind joined07:21
← Matrixiumn left07:21
oyvind → Guest5585507:21
← savage- left07:22
← neurodrone left07:23
Karmaon Anyone here?07:24
cirwin yes07:24
→ wilmoore joined07:25
← snickers_ left07:32
← diegoviola left07:32
→ cilly joined07:33
← cilly left07:33
← wilmoore left07:34
Karmaon Is there a way to revert git to an exact state of the whole repository a few commits ago?07:35
→ gavin_huang joined07:35
Karmaon I screwed up the repository pretty bad while merging07:35
← caseymcg left07:37
bob2 suspect you're after reset --hard07:38
Karmaon i need to undo the conflict resolution07:39
does git reflog record states of the whole repository?07:39
← banisterfiend left07:40
cirwin Karmaon: yes, find the commit you want07:40
(using git log)07:40
and then do "git reset --keep <commit>"07:40
that will throw away all the commits after that point07:40
Karmaon How about other branches?07:40
← bindaasomatic left07:40
cirwin branches just point to commits07:41
look at "gitk --all" to see where everything is pointing07:42
Karmaon I think I want to undo the conflict resolution07:45
cirwin the simplest way is to undo the merge, and do it again07:48
→ TrineLocke joined07:49
cirwin so just git reset --keep <bad-merge>^07:49
git merge <other-branch>07:49
← igotnolegs left07:50
← Goplat left07:51
→ brar1 joined07:52
← codewrangler left07:53
→ disappearedng joined07:54
← easypie left07:55
← digitalfiz left07:56
Karmaon cirwin: thanks! that fixed it :)07:57
cirwin w00t07:57
← matthiaskrgr left07:57
__null RandalSchwartz: to remedy my fuck up earlier i deleted the project's .git and github page (it was only a day old) and initialized a new git and created a new github page07:58
→ matthiaskrgr joined07:58
__null not a good thing to do, i know, but in the future i'll be more careful07:58
← brar1 left07:58
← munichlinux left08:01
← mattly left08:01
→ mofaph joined08:02
Karmaon Which file window should I be editing for git mergetool?08:03
← akosikeno left08:03
cirwin Karmaon: which merge-tool are you using?08:03
→ ThomasLocke joined08:03
Karmaon git mergetool08:03
it opens up gvim08:03
cirwin it's normally the one with <<<< ==== >>>> in it08:03
Karmaon Ah ok, thanks08:04
→ gusnan joined08:07
← heidar left08:10
→ mattly joined08:11
→ bindaasomatic joined08:11
← macmartine left08:11
← LeMike left08:12
→ Dave^| joined08:13
← BiggFREE left08:14
→ akosikeno joined08:15
← hwrdprkns left08:15
Karmaon So I accidently had some syntax errors in the conflict resolution, how do I amend that?08:16
nixmaniack i'm just trying git-send-email, i don't want to cc anyone while sending patch, how do I turn off auto cc?08:16
cirwin did you make another commit after the merge?08:16
if not just fix the file08:16
and then git commit --amend <file>08:16
Karmaon Oh, it's that simple. thanks again08:17
Why did it have a new file called <file_name>.php.orig?08:17
cirwin nixmaniack: man git-send-email implise --suppress-cc=all does what you want08:17
gitinfo nixmaniack: the git-send-email manpage is available at http://jk.gs/git-send-email.html08:17
cirwin Karmaon: because it didn't want you to lose work08:17
→ heidar joined08:17
→ macmartine joined08:18
← macmartine left08:18
← TrineLocke left08:19
→ arvind_k joined08:19
→ aspotashev| joined08:20
← Lgb left08:20
nixmaniack cirwin, thanks, i did see supress all but didn't know what put in category08:20
s/supress all/supress cc08:20
← jmoreira81 left08:20
← koo5 left08:20
← arvind_khadri left08:21
→ Lgb joined08:21
→ dr_win joined08:22
→ NAAS011 joined08:22
← lausi_ left08:24
← JPeterson left08:24
→ JPeterson joined08:25
→ i42n joined08:26
← t4nkd left08:27
→ BasicXP joined08:28
→ twisted`_ joined08:29
← twisted` left08:31
twisted`_ → twisted`08:31
→ uu joined08:32
→ lausi joined08:33
→ Bluestrike2 joined08:33
← lapistano left08:34
→ lapistano joined08:34
← cooldude left08:34
nixmaniack i'm getting this error W: unable to extract a valid address from: FirstName LastName [email@hidden.address]08:35
while using git send-email08:35
→ cooldude joined08:36
cirwin "Foo Bar [email@hidden.address] <-- you need <>08:37
← seivan left08:38
nixmaniack cirwin, i have configured it to read from mutt08:38
i added muttaliases08:38
cirwin doesn't know nowt about mutt08:39
cirwin but git expects the <>08:39
nixmaniack cirwin, okay. i'll try adding it then08:39
cirwin awk '{ print $1 " " $2 " <" $3 ">" }'08:39
<-- showing of my awk skillz08:39
← mattly left08:40
→ starlays joined08:41
← gusnan left08:42
nixmaniack cirwin, it worked if i add <>, but mutt aliases doesn't require them.08:43
cirwin you could try writing a letter of complaint to [email@hidden.address]08:44
→ Matrixiumn joined08:44
cirwin it seems pretty obvious that "foo bar baz@bam" is a name and an email08:44
maybe they're being strict about some rfc though, so I'm not sure they'd change it08:44
→ rendar joined08:45
nixmaniack cirwin, hmm. i'll do that.08:45
→ d0k joined08:49
← albel727 left08:49
← maleknet left08:49
← BasicXP left08:51
→ albel727 joined08:52
← albel727 left08:52
→ albel727 joined08:52
→ drizzd joined08:53
→ drizzd_ joined08:53
→ lhunath joined08:57
lhunath how could I find the nearest tag from the current commit?08:58
kind of what git describr gives me without the noise08:58
← Bluestrike2 left08:59
→ iocor joined09:00
→ jmd joined09:01
→ chromaticwt joined09:01
→ maleknet joined09:01
chromaticwt how do I list all commits by author?09:01
← Sweetshark left09:01
← Matrixiumn left09:02
albel727 lhunath: well, you could try git tag --contains. although you'll have to choose the "nearest one" yourself.09:02
→ Sweetshark joined09:02
← Sweetshark left09:02
→ Sweetshark joined09:02
jmd chromaticwt, git log --author=09:02
← aspotashev| left09:03
albel727 or git shortlog, if you don't need to parse the output.09:03
← ehsan left09:03
jmd What's the easiest way to copy a file from one branch to another?09:04
→ ehsan joined09:04
→ shruggar joined09:04
albel727 git checkout <branch> -- <filename> , I guess.09:04
← maartenv left09:06
← kl4m left09:08
chromaticwt jmd: can I do a regex for the author name?09:12
serious question09:14
or how can I just search last names.09:14
Mikachu it does a substring match if that helps09:15
chromaticwt sry09:15
It works.09:15
yeah09:15
jmd According to the man page, it matches regexps by default.09:15
→ BiggFREE joined09:15
← batrick left09:16
→ seivan joined09:18
chromaticwt cool thnx09:20
→ gusnan joined09:20
← chromaticwt left09:20
MarcoKZ whats the actual difference between git fetch and pull09:24
cirwin git pull immediately does a merge09:24
!pull09:25
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:25
→ jacekmigacz joined09:26
← iocor left09:29
cbreak the opposite of push is an other push09:29
(that restores the old history, must be forced)09:29
cirwin I guess it depends on the axis of reflection09:29
could be another push from the remote server to the local server09:30
cbreak now that sounds like trouble09:30
unless you didn't change history in between I guess09:30
→ tvw joined09:31
→ dSebastien joined09:31
← jakob left09:35
→ jakob joined09:35
← rurufufuss left09:36
→ chromaticwt joined09:37
chromaticwt can I have one git repo, with linux-next, linux-stable, and mainline linux, as branches?09:37
→ BasicXP joined09:38
← BasicXP left09:38
→ BasicXP joined09:38
FauxFaux chromaticwt: Sure, just add the remotes and checkout whatever branch you want.09:39
Karmaon So I accidentally commited stuff to a feature branch that was meant for the develop branch09:46
how do I move those commits to the develop?09:46
FauxFaux Karmaon: !fixup09:46
gitinfo Karmaon: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at https://gist.github.com/1612395 for full instructions. For hints type !fixup_hints in IRC. Remember, if you have pushed there only a few things you can do without !rewriting_public_history (type that for more info)09:46
→ rurufufuss joined09:48
→ brar joined09:49
← flyz left09:49
→ flyz joined09:49
← [M]ax left09:50
← chromaticwt left09:51
← brar left09:52
→ brar joined09:52
Karmaon FauxFaux: I was looking for cherry-picking, but thanks.09:52
→ [M]ax joined09:53
→ dr_lepper joined09:54
← dr_lepper left09:54
→ dr_lepper joined09:54
→ FernandoBasso joined09:55
← shiba_yu36 left09:55
← ehsan left09:57
→ Demego joined09:58
→ iocor joined09:59
→ flavius joined09:59
→ shiba_yu36 joined10:00
← dr_lepper left10:00
← mofaph left10:01
→ martinjlowm-lptp joined10:02
→ dr_lepper joined10:06
← dr_lepper left10:06
→ dr_lepper joined10:06
← seivan left10:06
__null If I add an existing file into .gitignore, will all future commits ignore that file? Or will it continue to be committed?10:08
→ RaptorX joined10:10
FauxFaux __null: .gitignore doesn't affect tracked files.10:10
__null Is there a way for it to affect tracked files? Or do I need to rm them manually?10:11
→ kylef joined10:11
← flyz left10:11
__null They aren't sensitive files do I don't need to delete them from past commits, just for future commits to make things cleaner10:12
← cirwin left10:12
← dr_lepper left10:12
← RaptorX left10:12
→ RaptorX joined10:12
FauxFaux If you rm them, then ignore them, they won't be tracked files, so .gitignore will work fine.10:12
← shiba_yu36 left10:15
→ shruggar1 joined10:15
← shruggar left10:15
→ flyz joined10:17
→ dr_lepper joined10:17
← dr_lepper left10:17
→ dr_lepper joined10:17
← dr_win left10:19
→ dr_win joined10:19
← gusnan left10:20
← spuz left10:28
→ berserkr joined10:31
← Heimidal left10:31
→ n3m joined10:34
→ eletuchy joined10:39
→ magicaltrout joined10:40
magicaltrout hey guys I can't see an obvious answer so I'll have an ask. I would like to write a post-receive hook that executes a certain command if files are modified within a certain directory of the repository10:41
→ Octalot joined10:41
magicaltrout so is there a sensible way of getting a list of modified files in the post commit?10:41
← eletuchy_ left10:41
bob2 post receive or commit?10:42
anyway, post-receive gets passed revids, so you can find out whatever you wanty10:42
← fr0stbyte left10:43
cmn magicaltrout: look at the default post-receive or post-commit for ideas, depending on which one you actually meant10:44
← Axsuul left10:44
cmn the thing that can be tricky is figuring out what to diff, once you have that, git diff --name-only one...other will give them to you10:44
← jmd left10:46
magicaltrout ah right10:46
thanks guys, i want git to run a command if a certain directory is modified, I shall take a look10:46
cmn but "when?" is the question; come to think about it, is there even a post-commit?10:48
→ gusnan joined10:48
← iocor left10:48
cmn ah, there is, ok10:48
magicaltrout this is on the server so its post push, so post-recieve10:48
cmn do you want to be able to affect the success status of the push?10:49
magicaltrout commit is clientside10:49
no cmn i, i want it to look and see if directory x has any modified files10:49
if so then run command y10:49
cmn then yes, post-receive will be fine10:50
→ frnkkpp joined10:50
→ seivan joined10:51
magicaltrout ah i see, git diff-tree10:51
thanks cmn bob210:52
← p3rror left10:53
→ bigkm joined10:55
→ faber joined10:56
→ patrick99e99 joined10:56
→ aidenhong joined10:57
← Shusshu left10:59
→ LeMike joined11:00
← magicaltrout left11:02
→ timoxley joined11:04
→ thiago joined11:05
← nixmaniack left11:06
← Guest55855 left11:07
→ ipalaus joined11:08
→ nixmaniack joined11:08
← aidenhong left11:11
→ aidenhong joined11:11
← nixmaniack left11:11
→ Jackneill joined11:14
← bigkm left11:16
→ Spockz` joined11:20
→ Matrixiumn joined11:22
→ Cromulent joined11:23
← dwmw2_gone left11:23
← maleknet left11:25
→ dwmw2_gone joined11:25
← aidenhong left11:26
→ maleknet joined11:27
← i42n left11:28
← dwmw2_gone left11:30
← bolt left11:30
→ bolt joined11:32
→ vervic joined11:33
← timoxley left11:34
← ipalaus left11:36
→ dwmw2_gone joined11:36
← dwmw2_gone left11:38
→ brian_g joined11:38
← shruggar1 left11:39
→ dwmw2_gone joined11:41
→ mpabst joined11:43
→ _md joined11:43
← Nibato left11:45
← tvw left11:45
→ Nibato joined11:46
← dwmw2_gone left11:46
→ bitkiller joined11:49
← catsup left11:50
→ amigojapan joined11:50
← maqr left11:50
← dharriga1 left11:50
→ batrick joined11:51
← Caelum left11:53
← Cromulent left11:54
→ jargon- joined11:55
→ Caelum joined11:56
→ Sigma joined11:57
→ bouzbou joined11:57
→ _dzonder joined11:58
← _dzonder left11:58
→ Dave^|| joined11:58
gitinfo set mode: +v11:59
bouzbou Hi, is git case-insensitive on windows?11:59
→ dwmw2_gone joined11:59
cmn when git initialises a repository, it checks whether the filesystem is case-sensitive11:59
and sets up a configuration option to remind itself11:59
← seivan left12:00
bouzbou if he checks that the filesystem is non case-sensitive (I guess this is the case on windows right?), it doesn't do a trick or something to make it sensitive?12:01
cmn no12:01
it can't12:01
→ aspotashev| joined12:01
thiago how is it going to make a case-insensitive filesystem case-sensitive?12:02
cmn that's a limitation/feature of the filesystem, there's nothing git can do abou tit12:02
← Dave^| left12:02
bouzbou okay, so is there a way to make a fake renaming with a git command?12:03
cmn use a temp filename12:03
git mv a B; git mv B A12:03
the term that might be missing here is case-preserving12:04
FAT and NTFS will store the name as Abc if you create it that way, but if you ask to open abc, it'll open Abc12:05
→ catsup joined12:05
bouzbou but if I create a file AbC on windows, and do a git add, how will git know that it's AbC and not aBC or ABC if the filesystem is non case sensitive?12:06
thiago I guess it adds what you typed12:06
→ vandal-- joined12:07
→ vandal- joined12:07
→ vandal-_- joined12:07
bouzbou when I type git "add .", I don't type the file names12:07
cmn when you do add . git asks the fs12:08
so the case would be preserved12:08
← vandal-_- left12:08
← vandal-- left12:08
← vandal- left12:09
bouzbou okay, so I could also do a 'git rm -cached' (I don't remember if it's that command), and then do a git add and the file case will be back to normal right?12:10
→ JPT joined12:10
cmn maybe12:11
try it out12:11
→ ipalaus joined12:12
→ KU0N joined12:12
bouzbou yes it's working12:15
thank you cmn12:16
for your explanations12:16
← bouzbou left12:16
← [M]ax left12:18
→ [M]ax joined12:20
← brian_g left12:20
→ brian_g joined12:21
← kryl99 left12:22
← rchavik left12:22
totte I'm back with git-log-UTF-8-åäö-Inconsolata problems. -_- Some entries in the git log where I'm the author (as I have an "ä" in my name) show up proper with ä, and others show up with an ä that only is printed with the Menlo or Monaco font as a non-ASCII character. If I try to copy and paste it the paste looks like this: a12:25
a<0308>12:25
bob2 are they from different machines by any chance12:26
cmn still can't see the chars as printable12:27
← BiggFREE left12:27
totte bob2: That is possible.12:27
← apok left12:27
← uu left12:28
← pdtpatrick_ left12:29
← Nibato left12:30
totte (alt+u, a) ä piped through od -tx1: 0000000 c3 a4 0a (new line) 0000003, a piped through od -tx1: 0000000 61 cc 88 0a (new line) 000000412:30
→ canton7 joined12:30
→ Nibato joined12:34
→ fayimora joined12:35
← Nibato left12:36
→ kryl99 joined12:36
→ uu joined12:38
→ Nibato joined12:39
→ whitman joined12:39
→ j416 joined12:40
→ sudoquai joined12:41
→ Cromulent joined12:42
FauxFaux totte: git cat-file commit | od?12:42
→ project2501a joined12:42
→ LucasTizma joined12:43
project2501a hey guys. i am going brought the o'reilly git book. it is mentioning here that the commits are not in a time order but a to political sort of the commits? i am a bit confused about that. can i please have a pointer?12:44
← Nibato left12:44
FauxFaux project2501a: Topilogical, not political?12:45
Mikachu topological12:45
project2501a nope. says here "topological"12:45
← flaguy48 left12:45
project2501a also /b/12:45
← fayimora left12:45
← bolt left12:46
cmn right, topological12:47
← NiklasFiekas|afk left12:47
cmn it means they're ordered according to where they stand in the DAG, not some timestamp12:47
gitk --all will show you how they look12:47
← [M]ax left12:47
project2501a gitk ? oh damn! look at that! a GUI!12:48
A GOOD LOOKING GUI12:48
→ bolt joined12:48
cmn hm?12:48
project2501a i didn't know about gitk12:49
→ Nibato joined12:49
cmn it's just a X version of git log --graph --decoreate12:49
project2501a color me impressed :D12:49
cmn then you'll shit your pants wen you see git gui12:49
project2501a cmn: can i save that tree? in png or jpg or somethin12:49
project2501a prepares to have brix shat12:49
cmn printscreen?12:49
project2501a well, i was more like thinking git log --graph --decorate --save12:50
bremner project2501a: it'12:50
s just text12:50
redirect to a file?12:50
→ [M]ax joined12:50
project2501a holy crap,. must rtfm more :D12:50
→ vandal- joined12:50
← BasicXP left12:50
project2501a thanks guys!12:51
and the occasional fbi agent posing like a 14 year old girl12:51
← ph^ left12:53
→ ph^ joined12:54
→ OOPMan joined12:59
→ f0i joined13:01
→ khmarbaise joined13:02
← keller left13:06
→ keller joined13:06
→ flaguy48 joined13:06
→ Adaptee joined13:07
→ michale joined13:07
← vervic left13:10
→ rebagliatte joined13:11
← Cromulent left13:11
→ BasicXP joined13:13
→ dnjaramba_ joined13:16
← Nibato left13:17
← Adaptee left13:17
→ BasicXP|2 joined13:17
← BasicXP|2 left13:17
← BasicXP left13:17
→ Adaptee joined13:18
← xerora left13:19
→ Nibato joined13:19
→ l1nu5r joined13:19
← l1nu5r left13:20
← rebagliatte left13:20
→ NiklasFiekas joined13:20
→ mklappstuhl joined13:22
← jdav_gon` left13:22
→ BasicXP joined13:23
← NiklasFiekas left13:24
→ tobias__ joined13:26
→ icwiener joined13:26
← [M]ax left13:26
← Nibato left13:26
→ fayimora joined13:27
→ [M]ax joined13:27
→ jdav_gone joined13:27
→ empity joined13:28
← __iron left13:30
→ vervic joined13:30
→ Nibato joined13:31
← Chib left13:32
→ seivan joined13:35
← Nibato left13:36
→ Nibato joined13:36
← gusnan left13:37
← vervic left13:42
→ di-five joined13:43
→ shiba_yu36 joined13:43
← aspotashev| left13:44
→ i42n joined13:46
← [M]ax left13:47
→ Hawk416 joined13:48
→ Xizor joined13:49
→ Nirvanko joined13:49
→ [M]ax joined13:50
← brian_g left13:50
Nirvanko Is there any difference in wich way we merge two branches? git merge A with a current B branch, or git merge B with the current A branch?13:51
→ brian_g joined13:51
→ eletuchy_ joined13:51
← dr0id left13:51
Matrixiumn → GoldenHamster13:51
← eletuchy left13:54
← frnkkpp left13:58
→ CarstenF joined13:58
→ komma joined13:59
cmn yes13:59
in the first you're merging A into B, the cond you're merging B into A14:00
FauxFaux The resultant commit will be roughly the same, but it'll be on a different branch, and the parents will be in a different order (which has meaning to some people).14:01
→ sharkmonkey joined14:01
cmn and it will affect whether you can merge the merged-into branch into older branchesw14:02
tizzo → tizzo-afk14:02
→ frnkkpp joined14:02
→ erichynds joined14:03
→ rebagliatte joined14:03
GoldenHamster → minimerbo14:04
minimerbo → GoldenEagle14:04
← brar left14:07
← maleknet left14:09
← komma left14:13
→ komma joined14:14
totte FauxFaux: Not quite sure what that command does?14:14
FauxFaux totte: It takes a commit id, and outputs the actual data file representing it, hopefully without mangling any encoding.14:15
← uu left14:18
GoldenEagle → CarbonHamster14:19
CarbonHamster → DiamondHamster14:19
← Lgb left14:20
← jargon- left14:20
totte FauxFaux: Like so? https://gist.github.com/169902214:20
FauxFaux I was hoping that it would help you. If you want me to read it then use "xxd" instead of "od -tx1". ¬_¬14:21
← lapistano left14:21
→ lapistano joined14:21
→ Lgb joined14:22
← erichynds left14:23
totte Updated, I have no idea of what I'm doing.14:23
← komma left14:23
← Nirvanko left14:26
FauxFaux is a bit busy to help, sorry; maybe later.14:26
→ neurodrone joined14:26
← icwiener left14:27
→ icwiener joined14:27
← mklappstuhl left14:28
← LucasTizma left14:29
Mikachu totte: xxd instead of od, not od -xxd14:29
FauxFaux Mainly because of that, yes. ¬_¬14:29
Mikachu but your problem is likely to be NFC vs NFD14:29
for some reason osx decided to break everything and use NFD14:30
i don't think anyone else uses it14:30
FauxFaux Oh dear.14:30
Mikachu i didn't mean for that to sound like trolling btw ;)14:31
→ madewokherd joined14:32
→ Cromulent joined14:34
→ NiklasFiekas joined14:35
→ vervic joined14:39
← CarstenF left14:40
→ eletuchy joined14:40
← cccaldas left14:41
← edude03 left14:42
← Nibato left14:42
→ edude03 joined14:43
→ cccaldas joined14:43
← eletuchy_ left14:43
→ _h0bbit joined14:44
← [M]ax left14:44
← FernandoBasso left14:45
← vervic left14:45
→ [M]ax joined14:46
→ subbyyy joined14:46
← guns left14:47
← subbyyy left14:47
→ subbyyy joined14:47
← sharkmonkey left14:47
← gavin_huang left14:48
→ t0rc joined14:50
DiamondHamster → GiantHamster14:50
← rurufufuss left14:51
→ alansaul joined14:55
→ gusnan joined15:00
← [M]ax left15:05
totte Mikachu: I added one piped through xxd at the end of the paste... Still not sure what this is all about. I use iTerm2 on OS X, is there a somewhat simple solution or workaround or am I in the wrong place - should I go to iTerm2 or OS X support?15:05
→ Chiroo64 joined15:06
totte git log is the one and only place I've encountered this and I still don't understand why. :/15:06
→ sharkmonkey joined15:06
→ [M]ax joined15:07
→ lacrymology joined15:09
→ lnostdal_ joined15:11
← cccaldas left15:15
Mikachu totte: your name is written in nfd in a config file somewhere15:16
← telemachus left15:17
← seivan left15:18
totte Mikachu: But Steve is dead. Weren't we liberated?15:19
On a more serious not I assume it's one of the git config files in ~, is there an easy way to tell NFC from NFD?15:20
← bgerber left15:20
← amigojapan left15:20
Mikachu what's lycosaexplorer?15:21
totte Some Python FuzzyFinder thing.15:22
→ bgerber joined15:22
totte The entire log is riddled with these issues, it's (probably) not due to LycosaExplorer.15:22
Eh, vim plugin.15:23
→ telemachus joined15:23
← [M]ax left15:23
→ fisted joined15:24
→ canton8 joined15:26
← fisted_ left15:26
→ iamjarvo joined15:27
totte Well I edited my ~/.gitconfig file, the letter that should be an ä was an a. I made a commit and the log entry for that seems to be alright.15:27
→ Textmode joined15:27
→ [M]ax joined15:28
→ brian joined15:28
brian → Guest4778715:28
← canton8 left15:29
→ Yojiro joined15:29
← Textmode left15:29
→ Textmode joined15:30
→ marcoshack_br joined15:33
→ Dragooon joined15:38
→ seivan joined15:39
← AmirBehzad left15:40
← Chiroo64 left15:40
→ Chiroo joined15:40
→ cccaldas joined15:41
→ Chirag joined15:42
→ HolySinner joined15:42
← Chiroo left15:42
tizzo-afk → tizzo15:43
← [M]ax left15:43
← empity left15:44
→ [M]ax joined15:46
← kpreid left15:47
← dr_win left15:47
→ dcarper joined15:48
← wolog left15:50
→ wolog joined15:53
→ brar joined15:55
← Chirag left15:55
→ Chiroo joined15:56
→ list joined15:58
← list left15:59
← HolySinner left15:59
→ jwmann joined16:01
← ph^ left16:02
→ kevwil joined16:04
→ soulcake joined16:08
tizzo → tizzo-afk16:09
→ gebbione joined16:12
gebbione hi does anyone use egit?16:12
bremner not many, but you can try your question anyway16:13
← angelsl left16:13
← GiantHamster left16:13
← jweinberg left16:14
→ jweinberg joined16:14
→ Matrixiumn joined16:14
gebbione in another machine i created a few branches and after fetching i dont have them available from this machine through the egit switch option, i have to go to custom and then remote>branch16:14
but it looks like it refers to the remote reference16:14
am i not supposed to download that somehow?16:14
← soulcake left16:15
cbreak normally with git, if you fetch a remote, you get remote tracking branches for all the remote branches16:16
(git branch -r)16:16
if you want to use them locally for example to commit to them, you have to make a local branch out of them with git checkout -t origin/foo or so.16:17
→ iocor joined16:18
← dennda left16:18
← kevwil left16:18
→ LucasTizma joined16:19
← Cromulent left16:19
→ snearch joined16:19
gebbione not too sure how that works out in egit16:19
→ kukks joined16:22
← __main__ left16:25
← rebagliatte left16:26
→ AmirBehzad joined16:27
→ ninjaneer joined16:28
← lapistano left16:28
→ lapistano joined16:28
← ninjaneer left16:30
→ kriegerod joined16:31
← darrend left16:32
→ shruggar joined16:33
kriegerod I look for command like "git clone --bare /local/repo remoteuser@remotehost:remote/path". exactly this command fails, but i really want to have sth for this case. Is there a way to straightly clone repo to remote host by ssh? If not, seems i have to use git-bundle. Is that right?16:33
← alansaul left16:33
← _md left16:35
← DrHouse|TARDIS left16:35
→ Raging_Hog joined16:36
FauxFaux kriegerod: ssh remoteuser@remotehost 'git init --bare remote/path' && GIT_DIR=/local/repo git push remoteuser@remotehost:remote/path16:36
(Or git clone --bare locally and rsync / scp the result over.)16:37
← gebbione left16:38
→ cilly joined16:38
← rdholder left16:38
← berserkr left16:39
→ chilversc joined16:40
→ ehsan joined16:41
← i42n left16:41
← cccaldas left16:41
→ mandric joined16:42
← iocor left16:45
→ berserkr joined16:45
→ codewrangler joined16:46
→ kl4m joined16:46
← AmirBehzad left16:47
kriegerod FauxFaux: thanks16:47
← kl4m left16:50
→ apok joined16:51
← starlays left16:51
→ starlays joined16:51
chilversc odd, git rebase keeps taking ages, then dying with "malloc failed"16:52
also, when it does that git rebase --abort doesn't reset the head back, leaving the head pointing to the rebase target16:53
FauxFaux git version, platform, ulimit -a output, git count-objects -v output, etc.16:54
FauxFaux has that whole minute "What's that git command.. the one that.. counts objects.. and outputs the count.. of the objects.. in the repository." converstation with himself again.16:54
← tabakhase left16:55
→ tabakhase joined16:55
→ intripoon joined16:58
← intripoon_ left16:58
→ johnkpaul joined16:58
chilversc well, more concerning than the error is that it doesn't provide an easy way out unless you have the reflog enabled16:59
← gusnan left17:00
← apok left17:01
← lhunath left17:01
→ _md joined17:01
← cilly left17:03
← whitman left17:03
← t0rc left17:03
← intripoon left17:04
canton7 chilversc, ORIG_HEAD probably exists and is correct. Not that I'm not concerned that rebase --abort is failing...17:05
← vandal- left17:05
← brainsail left17:05
chilversc FauxFaux: pastebin.com/Sc6HFzei17:06
← lonewulf` left17:06
← drizzd_ left17:07
← drizzd left17:07
→ whitman joined17:07
chilversc so what does rebase do that's any different to resetting the head to the other branch, then individually cherry-picking the commits?17:08
FauxFaux That really shouldn't be segfaulting. ¬_¬17:08
→ vandal- joined17:08
→ intripoon joined17:09
chilversc the final error currently is, malloc failed (tried to allocate 5,754,881 bytes)17:09
canton7: so it is, didn't know about ORIG_HEAD17:10
cmn I believe there is a -m option17:10
that doesn't try to allocate so much memoryh17:10
tizzo-afk → tizzo17:10
FauxFaux Also, I wonder why git bash on Windows returns a max open files of 256 (reproduced). :s17:10
← edude03 left17:10
EugeneKay chilversc - IIRC, cherry-pick gives you a "committed-by" field. rebase doesn't.17:11
CareBear\ rebase also does17:11
you create a new commit when you rebase17:11
even if it is identical to another, the new commit has a different parent17:11
and/or date17:11
tizzo → tizzo-afk17:11
chilversc cmn: ah, could be copy tracking, there were a lot of files deleted from the master after the branch point17:11
EugeneKay I mean, separate Author and Commiter fields17:12
EugeneKay whips out his test repo17:12
← dcarper left17:12
← EricInBNE left17:12
cmn chilversc: it could be... though git shouldn't be calculating anything of the sort for a rebase17:12
→ iocor joined17:13
← icwiener left17:13
→ icwiener joined17:13
→ savage- joined17:14
← savage- left17:14
← shruggar left17:15
EugeneKay Hrm, seems not.17:15
chilversc cmn: must be that, I tried git rebase -s resolve master and it worked17:17
→ nixmaniack joined17:17
tizzo-afk → tizzo17:19
← icwiener left17:20
→ icwiener joined17:20
← BlindOracle left17:21
← kkiero left17:21
← frnkkpp left17:21
→ Cromulent joined17:22
→ Fernandos joined17:22
Fernandos hi17:23
→ lonewulf` joined17:23
→ BlindOracle joined17:23
Fernandos I'm undecided if I should do a git rebase or which effects it has. I've 7 branches each represents a milestone and I've now reached all milestones so far. one of them represents a release branch. I'm on branch milestone-7 how do I copy all changes to branch release?17:24
nerdboy moin17:25
cmn a merge might be best17:25
Fernandos my buddy always copied the entire directory, checked out the next milestone, overwrote all files with the backup directory..17:26
→ frnkkpp joined17:26
← Carmivore left17:26
cmn that's very bad17:26
→ Carmivore joined17:26
Fernandos I believe so, but we didn't have time to teach him into git..17:27
→ t0rc joined17:27
→ Destos joined17:27
← fruight left17:28
→ kl4m joined17:28
cmn from what you say, he's destroying history; which means it'll cost you more in developer time if you don't teach him how to use the tools17:28
nerdboy if there are no changes on the release branch then it's a pretty simple merge...17:30
chilversc milestones sound more like something that should be tags?17:30
Fernandos oh, I don't think he copies the .git folder also into the checkout out branch, hmm.. but he lately asked what the .git dir is.. so you're right we should go through it with him..17:31
cmn if he simply copies the result, he's telling git that he did all of those changes in one go17:31
Fernandos chilversc: when the milestone is reached I create a tag with the version17:31
cmn that's the history he's destroying17:31
how the files actually got to the state they're in17:32
assuming these milestone branches represent changes you want to get into the release branch, a merge is what you want17:32
Fernandos I see17:32
← frnkkpp left17:32
cmn a pre-merge rebase on top of master might make the history a bit prettier graphically17:32
on top of release, I mean17:32
→ mattly joined17:34
→ dfr|floridia joined17:35
→ FernandoBasso joined17:37
← snearch left17:37
→ mando joined17:37
→ dnjaramba joined17:37
← iamjarvo left17:37
smw Hi all. If I have a file in the current commit that is checked out, how can I diff it with head?17:40
FauxFaux git diff HEAD path/to/file17:40
smw thanks FauxFaux17:41
FauxFaux, HEAD is master's head, right?17:42
→ fruight joined17:42
cmn no17:42
→ vervic joined17:42
cmn HEAD is HEAD, it points to the current branch/commit17:42
← kriegerod left17:43
smw cmn, ah17:43
cmn if you're in master, then yes, HEAD points to master's head17:43
(a.k.a tip)17:43
smw so I want "git diff master -- the/file"17:44
?17:44
cmn maybe17:44
→ HardFu joined17:44
cmn what FauxFaux gave you will compare against the current branch's tip17:44
HardFu announces that Carmivore has been updated, to check your stats, see http://carmivore.com/your-nickname17:44
smw cmn, would that diff the/file against "tip" (latest commit to branch master)17:44
cmn, sounds good17:45
cmn the latest commit in branch master is master's tip17:45
there is no global tip17:45
smw ok17:45
cmn, sorry, I am not a developer and I recently had to start working with git with commands other than clone and pull :-\17:46
cmn read the !book17:46
gitinfo 'Pro Git' is a complete book about git that is available online for free (there's a print version, too): http://progit.org/book/17:46
smw thanks17:47
cmn and the man pages of whatever commands you're using17:47
← dfr|floridia left17:47
→ rebagliatte joined17:48
→ dfr|floridia joined17:51
← di-five left17:53
→ Pawka joined17:54
→ adamm joined17:58
→ churp joined17:59
← vervic left17:59
SethRobertson !thanks17:59
gitinfo The best way to thank someone is to say their nickname with two pluses after it, as part of a larger message of thanks if you want. So to thank me, for instance, say "gitinfo++". I'm a bot so thanks to me should be directed to my master, jast.17:59
EugeneKay Does gitinfo track thanks levels ? :-p17:59
SethRobertson No, there is some silly website which does.18:00
→ jargon- joined18:00
SethRobertson Of course, gitinfo can be used to, err, adjust the thanks levels18:00
← vandal- left18:00
→ Goplat joined18:01
→ Chillance joined18:02
← iocor left18:02
SethRobertson Isn't !vsch a typo?18:02
gitinfo https://github.com/RichiH/vcsh - a tool to manage dotfiles using git's fake bare repos to put more than one working directory into $HOME18:02
← NiklasFiekas left18:02
← codeshah left18:03
→ pdtpatrick_ joined18:05
→ vervic joined18:05
← subbyyy left18:06
bremner SethRobertson: yes18:06
← vervic left18:06
← abetaha left18:07
→ iocor joined18:09
→ vandal- joined18:10
jast hey now18:10
I'm not a master of anything :P18:10
SethRobertson !vsch18:10
gitinfo TYPO! Please delete me! (Or document how we can delete it ourselves)18:10
SethRobertson Well, perhaps a master some somethings18:10
jast well, deletions get rid of the version history for the trigger, so I've been giving less people the privilege18:10
try it now: use .trigger_edit to set the expansion to "-" (no quotes) to delete a trigger18:11
→ pgebhard joined18:11
→ subbyyy joined18:12
← kylef left18:12
SethRobertson jast++ :-)18:13
Hmm. The gitinfo webpage isn't returning UTF-8 as the encoding type18:13
jast I thought I got the web server to send a header18:13
← pgebhard left18:13
SethRobertson No, that's a lie. I wonder why it isn't expanding UTF-8 lke gitinfo does in the channel18:13
Fernandos does someone use github bots?18:14
to crawl stats about repos?18:14
jast I added the header now... but it still doesn't do it18:14
oh, in fact it's been in the HTML, too, ever since I made the page18:15
I think something in the processing chain is double-encoding the data18:15
SethRobertson Perhaps you have a HTML encoding that went awry?18:15
jast no idea why18:15
let's just blame PHP18:15
→ dr_win joined18:15
jast a reasonable default in my experience18:15
← yshh left18:16
→ cilly joined18:17
← OOPMan left18:17
→ OOPMan joined18:18
→ cmyk_ joined18:18
← cilly left18:19
→ yakko joined18:21
← subbyyy left18:22
← arvind_k left18:22
← shiba_yu36 left18:23
htoothrot → toothr18:24
← [M]ax left18:24
EugeneKay man git-archive18:24
gitinfo the git-archive manpage is available at http://jk.gs/git-archive.html18:24
→ [M]ax joined18:26
→ macmartine joined18:26
← Yojiro left18:26
← faber left18:26
← HardFu left18:27
← mando left18:28
→ Biopandemic joined18:28
← Biopandemic left18:28
← tureba left18:28
← mishok13 left18:29
→ shurane joined18:30
→ tureba joined18:32
→ danielpunt joined18:33
→ dcarper joined18:34
← michale left18:34
→ crisp joined18:35
→ arvind_k joined18:35
dcarper what's the best way to move a range of commits to a new branch?18:35
← fayimora left18:35
FauxFaux dcarper: !fixup18:36
gitinfo dcarper: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at https://gist.github.com/1612395 for full instructions. For hints type !fixup_hints in IRC. Remember, if you have pushed there only a few things you can do without !rewriting_public_history (type that for more info)18:36
→ Yojiro joined18:37
→ t4nkd joined18:37
→ cilly joined18:37
← Fernandos left18:38
dcarper FauxFaux: that's a helpful resource so thank you but doesn't really answer my question18:39
FauxFaux It really did.18:39
offby1 dcarper: I'd create the new branch pointing at the last commit of the range, then do "git rebase -i" on the original branch to delete those commits.18:39
← brar left18:39
→ di-five joined18:40
→ edude03 joined18:40
← Karmaon left18:40
→ pantsman joined18:40
← pantsman left18:40
→ pantsman joined18:40
← cilly left18:42
← Jackneill left18:42
→ diegoviola joined18:42
← martinjlowm-lptp left18:44
← Guest24222 left18:45
smw Is there a quick easy way to import a file from master's tip to my branch?18:45
FauxFaux git checkout master -- path/to/file18:45
smw thanks FauxFaux18:45
→ marcuy joined18:45
← pantsman left18:46
→ notola joined18:46
← sudoquai left18:46
← Cromulent left18:46
→ ehsan_ joined18:48
← ehsan left18:48
RichiH .lr18:51
→ Davey_ joined18:51
→ subbyyy joined18:52
← flippo left18:52
→ gaius65 joined18:52
gaius65 What am I doing here wrong?18:52
← BasicXP left18:52
gaius65 git tag -a v0.9.3 -m 'Beta3 release'18:52
fatal: Failed to resolve 'HEAD' as a valid ref.18:52
last commit was a marge18:53
merge18:53
→ empity joined18:54
gaius65 oh, sry... solved. The download had an erro :-/18:54
← gaius65 left18:54
← kaimi left18:55
← Yojiro left18:55
→ Axsuul joined18:56
← Adaptee left18:56
→ sureaint joined18:57
→ Yojiro joined18:58
← n3m left18:58
→ n3m joined18:59
← shurane left19:01
← Yojiro left19:02
← xxtjaxx left19:02
→ xxtjaxx joined19:02
← xxtjaxx left19:02
→ xxtjaxx joined19:02
→ kaimi joined19:02
← xxtjaxx left19:03
← khmarbaise left19:03
→ Karmaon joined19:05
→ empity` joined19:06
→ Heimidal joined19:06
← sharkmonkey left19:07
tizzo → tizzo-afk19:08
→ guns joined19:08
← empity left19:10
→ QaDeS joined19:10
← dfr|floridia left19:11
→ kerrick joined19:11
→ porco joined19:13
← unreal left19:14
→ Nibato joined19:15
→ g0bl1n joined19:16
→ Cromulent joined19:16
→ shruggar joined19:17
← LeMike left19:19
→ pantsman joined19:20
← pantsman left19:21
← porco left19:21
→ porco joined19:21
→ CannedCorn joined19:21
← rebagliatte left19:25
← Nibato left19:25
← cyphase left19:26
← porco left19:26
→ fayimora joined19:27
→ BiggFREE joined19:28
← Davey_ left19:28
← g0bl1n left19:28
→ Cyber-Dogg joined19:29
← dr_lepper left19:30
← Octalot left19:30
→ matsebc joined19:30
Cyber-Dogg I recently joined a new proejct19:30
they're using github19:30
I made a change and commited it19:31
however, wehn we try to deploy - we're getting ssh issues with known_hosts19:31
only from my commit19:31
I don't understand git well enough to know if this is possibly a git config issue19:31
or something else19:31
I was hoping someone here could help me shed some light on that19:32
→ ph^ joined19:32
→ unreal joined19:32
m1sc Cyber-Dogg: do you get any error message?19:33
← shruggar left19:34
→ shruggar joined19:35
Cyber-Dogg yes19:35
← shruggar left19:35
→ Element9 joined19:35
Cyber-Dogg pastebin coming19:35
http://pastebin.com/DwhGTGez19:36
← CannedCorn left19:36
← matthiaskrgr left19:37
Element9 Is there a way to undo a commit? I committed instead of amending to the last commit19:37
majuscule Element9: if you haven't pushed your commit out, you can use git reset19:37
canton7 Element9, !fixup19:38
gitinfo Element9: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at https://gist.github.com/1612395 for full instructions. For hints type !fixup_hints in IRC. Remember, if you have pushed there only a few things you can do without !rewriting_public_history (type that for more info)19:38
→ stringoO joined19:38
Element9 majuscule: I didn't push yet19:38
canton7: thanks, I'll read that19:38
majuscule Element9: man git reset19:38
gitinfo Element9: the git-reset manpage is available at http://jk.gs/git-reset.html19:38
→ matthiaskrgr joined19:39
← Dragooon left19:39
→ aknewhope joined19:39
→ cirwin joined19:40
← aknewhope left19:41
← dnjaramba left19:41
→ aknewhope joined19:41
→ DofLeFou joined19:41
← fairuz_ left19:41
← notola left19:42
→ fayimora_ joined19:42
← FernandoBasso left19:43
Cyber-Dogg m1sc: does that pastebin tell you anything?19:43
← fayimora_ left19:43
← canton7 left19:44
← fayimora left19:44
→ apok joined19:45
m1sc Cyber-Dogg: delete line 1 in your known_hosts file19:46
← madsy left19:46
Element9 majuscule, canton7: problem solved. thanks again!19:47
→ rebagliatte joined19:48
← aknewhope left19:49
← mastro left19:52
← OOPMan left19:52
→ Fullmoon joined19:54
→ pantsman joined19:56
← pantsman left19:56
→ pantsman joined19:56
← ph^ left19:56
← ehsan_ left19:56
→ ehsan joined19:56
← Cromulent left19:57
→ Nibato joined19:58
← Nibato left19:58
→ mastro joined19:59
→ Nibato joined20:00
← apok left20:01
→ flippo joined20:01
← chrisf__ left20:01
→ chrisf joined20:02
← ehsan left20:02
→ ehsan joined20:02
→ Cromulent joined20:02
← Nibato left20:02
→ amcsi joined20:02
→ MariusKarthaus joined20:03
→ nicxvan joined20:03
← [M]ax left20:05
→ [M]ax joined20:05
Cyber-Dogg m1sc: thaks that took care of it20:08
I do have another question...20:08
→ erickr joined20:08
→ OOPMan joined20:08
Cyber-Dogg I'm getting a message taht says No submodule mapping found in .gitmodules20:08
→ digitalfiz joined20:08
← digitalfiz left20:08
→ digitalfiz joined20:08
Cyber-Dogg for a specific path20:08
however - I haven't defined any submodules20:08
and I'm not sure why it thinks there should be one20:08
→ toabctl joined20:09
erickr Is there a way to merge 2 nonconsecutive commits? I've made some changes and generated 4 patches with git-format-patch, but I want to merge 2 of them to one patch, is that possible?20:10
→ gusnan joined20:10
cirwin erickr: sounds like you want git rebase -i20:10
→ i42n joined20:10
Mikachu see also commit --fixup and rebase -i --autosquash20:11
erickr cirwin: but can I ignore some of the 4 commits with that? I only seemed to20:11
dcarper offby1: bit delayed but thanks, exactly what I was looking for ;)20:11
→ madsy joined20:12
← madsy left20:12
→ madsy joined20:12
erickr show have made a branch before my edits.. :)20:12
cirwin erickr: you can re-order the commits, put two next to each other20:12
and change the wording of the lower on to "squash"20:13
and it will merge them into one commit20:13
← starlays left20:13
erickr cirwin: aha, I'll try that..20:14
is there a way to only see my local commits+20:14
cirwin erickr: git log HEAD --not @{upstream}20:15
(--oneline --decorate --graph)20:15
erickr sweet. :)20:15
Cyber-Dogg basically - I need it to ignore that location anyway20:15
actually - I shouldn't say that20:15
I need it htere20:15
but I'm not sure what the submodule stuff is20:15
← brian_g left20:15
→ brian_g joined20:16
← rfx left20:18
Cyber-Dogg how do I look at the current list of submodules?20:18
← t4nkd left20:18
← TomyLobo left20:18
← krz left20:19
← babilen left20:19
← Lgb left20:20
← Pawka left20:20
← tureba left20:21
← Milossh left20:21
→ Lgb joined20:21
← agile left20:22
→ LeMike joined20:22
→ shurane joined20:24
← jargon- left20:25
← icwiener left20:25
→ icwiener joined20:25
← danielpunt left20:26
← sureaint left20:27
← macmartine left20:28
Cyber-Dogg so I pulled the repo20:29
there is a branch that was already in it20:29
← [M]ax left20:29
Cyber-Dogg I have added a new folder in the staging branch20:29
commited, pushed20:30
and I'm getting this 'No submodule mapping found in .gitmodules for path' error20:30
the path is the new folder I've added20:30
→ marcreichelt joined20:30
cbreak Cyber-Dogg: sees you added a submodule20:31
a git repository20:31
without also specifying a source20:31
← matsebc left20:31
→ [M]ax joined20:32
← Element9 left20:32
→ macmartine joined20:32
Cyber-Dogg i guess...?20:33
i didn't mean to20:33
just added a folder20:33
is that automatucally a submodule?20:33
cbreak no20:33
you added a git repository20:34
Karmaon Oh crap, interactive rebasing removed the effect of no-ff20:34
→ fr0stbyte joined20:34
Cyber-Dogg how do i make it not a repo then?20:34
I just need it to be a folder in the repo20:34
marcreichelt Hi! I want to convert my SVN repositories to git. I installed gitosis on my server and created an empty repository there, and I used 'git svn clone' on my client to import a complete SVN repo. Now I want to add my gitosis server as a remote for this repo, but 'git remote add origin gitosis@server:reponame' followed by a 'git push' simply lead to a message 'No refs in common and none specified; doing nothing. Perhaps you should specify a branc20:34
h such as 'master'.'20:34
cbreak Karmaon: rebasing doesn't preserve mages by default20:35
marcreichelt what am I doing wrong?20:35
cbreak Cyber-Dogg: move the .git folder inside away before git add && git commit && git push20:35
Karmaon cbreak: so would I have to reset to the commit before the merge and merge again?20:35
erickr cirwin: finally got it right, added git rebase -i origin/master to get it to show only my nonpushed stuff..20:35
cbreak marcreichelt: you used gitosis20:35
it's old. use gitolite20:35
Cyber-Dogg cbreak: you just totally lost me :-)20:35
I'm very new to git20:36
came from SVN world20:36
cbreak also, you have to read the error message20:36
SethRobertson !gitosis20:36
gitinfo gitosis is no longer maintained and supported by the author; we usually recommend gitolite instead which has much better documentation and more features: http://github.com/sitaramc/gitolite20:36
Cyber-Dogg all I've done is20:36
marcreichelt cbreak, I use a Debian server and gitolite was not available there. Should I use an external APT repository for this?20:36
Cyber-Dogg clone20:36
branch checkout20:36
← rickmasta left20:36
Cyber-Dogg mkdir newstuff20:36
cbreak marcreichelt: if you push to an empty repository, you have to do git push reponame branchnames20:36
Cyber-Dogg added some files to new stuff20:36
SethRobertson marcreichelt: You can install gitolite. There are .debs for it20:36
← LongBeach left20:36
← macmartine left20:36
Cyber-Dogg git add commit push20:36
and now my deploy is telling me no submodule defined20:37
cbreak Cyber-Dogg: check if the folder contains a .git folder where you added it20:37
Cyber-Dogg k - sec20:37
erickr marcreichelt: gitolite was a breeze to setup on debian even though it wasnt in the dep repos, i did it last week..20:37
marcreichelt cbreak, ok - thanks for the tip :)20:37
Cyber-Dogg no20:37
marcreichelt and I definitey will uninstall gitosis :)20:37
Cyber-Dogg it does not20:37
the folder I added though - does20:38
marcreichelt SethRobertson, I don't want no .debs, because I want automatic security updates20:38
cbreak Cyber-Dogg: do a git cat-file -p HEAD:path/to/parent20:38
with the path to the parent of the folder you added20:38
→ corburn joined20:38
Cyber-Dogg you know what - the files I added it is a submodule...20:38
cbreak relative to the repository root20:38
← corburn left20:38
Cyber-Dogg I did a clone in that folder from recurly's github20:39
so that does make sense...20:39
→ corburn joined20:39
SethRobertson marcreichelt: It is in packages.ubuntu.com. I'm not sure if that means it will get those or not20:39
← Chiroo left20:39
Cyber-Dogg I just remembered20:39
← corburn left20:39
← resmo left20:39
marcreichelt just found out that he is still running Lenny on his server (OMG!)20:40
Cyber-Dogg so - yeah I'm an idiot :-)20:40
cbreak Cyber-Dogg: if you have a submodule, you have to use git submodule add to add it20:40
read the man page20:40
also, be sure that you want a submodule20:40
→ zetsubo joined20:40
SethRobertson Cyber-Dogg: Or consider other options: !subprojects20:40
gitinfo So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely seperate. Otherwise your best options are "!submodule" "!gitslave" and "!subtree" Try typing those commands into this IRC channel.20:41
cbreak they have some powerful assumptions which annoy anyone who doesn't fit to those assumptions20:41
→ corburn joined20:41
cbreak if you cloned it from someone elses repo, a submodule might be the right choice20:41
just make sure you know what you're getting yourself into :)20:41
→ zulax joined20:42
Cyber-Dogg hmm...20:42
→ apok joined20:42
← toabctl left20:42
Cyber-Dogg you scare me...20:42
→ tureba joined20:43
Cyber-Dogg basically - we havea vendor that we're using20:43
they have a github repo for their library20:43
→ the_cybersphinx joined20:43
Cyber-Dogg and the library hits their API20:43
so - it would make sense to do a submodule right?20:43
or - is that treating them entirely seperate?20:44
what would you experts do? :-)20:44
← ehsan left20:44
→ mcmt joined20:44
← johnkpaul left20:44
cbreak I'd use submodules20:45
will you commit to that repository?20:46
Cyber-Dogg nope20:46
don't have permission to even :)20:46
← cybersphinx left20:46
Cyber-Dogg just need to be able to grab their updated library periodically (whenever they make changes)20:46
but with some level of control on that in case they make breaking changes20:47
← tureba left20:47
→ maqr joined20:47
cbreak yeah, submodules then20:48
Cyber-Dogg k20:48
cbreak you'll get full control over which submodule commit the parent repo wants20:48
Cyber-Dogg k20:48
so to set that tup - I go to the parent repo and do a git submodule add?20:48
→ tureba joined20:49
→ acl_ joined20:49
Cyber-Dogg git submodule add <repo> <path>20:49
← tureba left20:49
Cyber-Dogg when I do that, I get 'design/javascripts/recurly-js' already exists in the index20:50
→ Element9 joined20:50
→ troydm joined20:51
troydm how can i merge two last commits?20:51
into one20:51
→ resmo joined20:52
troydm say i don't need two last commits to be separate20:52
can i merge them into one?20:52
cmn it's called squashing, git rebase -i HEAD~220:53
and squash the last one20:53
more information in man git rebase20:53
gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html20:53
← BlindOracle left20:54
→ macmartine joined20:56
→ tureba joined20:57
← flyz left20:58
← rebagliatte left20:59
→ sureaint joined21:00
← gusnan left21:03
Cyber-Dogg I got it21:03
→ mikepack joined21:04
← shurane left21:04
← _h0bbit left21:04
← empity` left21:05
→ shurane joined21:05
← sureaint left21:06
→ savage- joined21:06
erickr troydm: I just had the same question,21:07
troydm: I used git rebase -i origin/master21:07
troydm: adding origin/master will make it include only commits that are not pushed yet..21:07
← denysonique_ left21:08
← savage- left21:08
troydm erickr: but i have already pushed them21:08
← NimeshNeema left21:08
← MetaCosm left21:08
troydm erickr: and now on remote branch i have 3 sequentual commits that should be one21:08
← jab416171|Cloud left21:08
→ linusoleander joined21:08
troydm and i'm thinking of how to remove them21:08
→ NimeshNeema joined21:08
erickr troydm: aha, ok, you can probably use rebase anyway,21:08
→ MetaCosm joined21:09
← dkannan left21:09
→ marcuy_ joined21:09
erickr although, if anyone based work upon them, it will mess with their work..21:09
← jmcantrell left21:09
← arnihermann left21:09
← zetsubo left21:09
erickr use git rebase in the way cmn mentioned..21:09
troydm erickr: yeah, but it's just that those three commits should be one21:09
← NimeshNeema left21:09
troydm so basicly i need to somehow merge all three into one21:10
and rebase remote branch21:10
or something like that21:10
erickr see cmns answer.. it will do it..21:10
← desaila_ left21:10
→ eijk joined21:10
← nixmaniack left21:10
← erickr left21:10
← fujin left21:11
← MetaCosm left21:11
← marcuy left21:11
cmn troydm: do what I said, maybe change the 2 to 3 if you now have an extra commit to squash; and push with -f; but realise what you're doing is !rewriting_public_history21:11
gitinfo troydm: Rewriting public history is a very bad idea. Anyone else who may have pulled the old history will have to `git pull --rebase` and even worse things if they have tagged or branched, so you must publish your humiliation so they know what to do. You will need to `git push -f` to force the push. The server may not allow this. See receive.denyNonFastForwards (git-config)21:11
← tfnico left21:12
Cyber-Dogg thanks for the help!21:12
← Cyber-Dogg left21:12
troydm cmn: thanks21:12
← shennyg left21:12
troydm cmn: i'll try that21:12
→ CombatCow joined21:13
→ shennyg joined21:13
← kerrick left21:13
→ tfnico joined21:14
→ jdav_gon` joined21:14
→ jab416171|Cloud joined21:14
→ arnihermann joined21:15
→ jmcantrell joined21:15
→ johnkpau_ joined21:15
→ desaila_ joined21:16
← Guest47787 left21:16
→ Octalot joined21:16
→ kerrick joined21:16
→ denysonique_ joined21:17
← jdav_gone left21:17
→ NimeshNeema joined21:17
→ fujin joined21:18
← Sigma left21:19
→ batrick_ joined21:22
← batrick_ left21:22
→ |Agent joined21:23
→ dkannan joined21:23
|Agent What's the difference between "fetch" and "pull"?21:23
corburn pull is a fetch + merge21:23
rue You could read the man pages for further info, but pull is fetch + merge21:23
→ Hati joined21:23
wereHamster also, !pull21:23
gitinfo also: 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/21:23
|Agent okay thanks21:24
← guns left21:24
etcetera how do I find out the differences between remote master and local master?21:24
→ friskd joined21:25
→ s0ber_ joined21:26
cmn git diff master <remote>/master21:26
← batrick left21:27
→ MetaCosm joined21:27
← s0ber left21:28
s0ber_ → s0ber21:28
← friskd left21:31
← thomas_b left21:32
→ batrick joined21:32
etcetera cmn: assuming I have not fetched origin/master?21:32
cmn you don't21:32
etcetera WARNING: terminal is not fully functional21:33
← bindaasomatic left21:33
cmn you can find out whether it's different with ls-remote, but to find differences, you need something to compare against21:33
my terminal works just fine tyvm21:35
← mcmt left21:35
→ toabctl joined21:37
→ igotnolegs joined21:38
← |Agent left21:38
← Raging_Hog left21:39
etcetera using simple mac terminal.app21:40
it gives me the warning and provides no output.21:40
so I'm assuming no differences.21:40
→ martinjlowm joined21:40
→ ph^ joined21:41
→ pom joined21:43
← RaptorX left21:44
← igotnolegs left21:45
← lonewulf` left21:46
← shurane left21:47
→ gchristensen joined21:49
→ JackWinter2 joined21:49
← ThomasLocke left21:50
← JackWinter left21:50
→ igotnolegs joined21:50
→ guns joined21:52
← merkosh left21:53
← icwiener left21:53
→ komma joined21:55
→ friskd joined21:56
→ CannedCorn joined21:57
← toabctl left21:57
johnkpau_ → johnkpaul21:58
← ipalaus left21:59
← tewecske left22:00
← yakko left22:02
→ thomas_b joined22:03
← Spockz` left22:04
← jaisoares left22:04
→ Araxia_ joined22:05
→ rebagliatte joined22:06
← corburn left22:06
← j416 left22:07
→ logbot83725 joined22:07
← pantsman left22:08
→ infogulch joined22:10
← whitman left22:14
→ thusitha joined22:15
← Araxia_ left22:15
← macmartine left22:16
← mikepack left22:17
← thusitha left22:18
Omni|Work → Omni|AFK22:18
→ khmarbaise joined22:18
← lnostdal left22:19
→ lnostdal joined22:21
← apok left22:21
→ pen joined22:21
pen hey22:21
→ wuj joined22:22
pen sitaram: how's going?22:22
I have a question for ya, about setting up gitweb with gitolite22:22
FauxFaux pen: Out with it!22:22
pen I am getting 404 even after setting the appropriate user group permission and update the REPO_UMASK and do the chmod manually for the existing repo22:22
I am at the end of my wit22:23
I restart apache22:23
so many times22:23
← Goplat left22:23
→ boxybrow1 joined22:23
FauxFaux 404 on what URL?22:24
pen git.server/gitweb22:24
the default one22:24
FauxFaux: the gitweb interface is up, but 404 in the gitweb22:24
gitinfo set mode: +v22:24
pen 404 - No projects found22:24
gitinfo set mode: +v22:24
boxybrow1 Hi there, I'm trying to run git diff on the tips of two branches and it seems like its giving me incorrect results...22:25
I was hoping someone could help me figure out what was going on22:25
SethRobertson !repro22:25
gitinfo please paste (e.g. using http://git.pastebin.com/) a transcript of your terminal session in which the problem occurred so that we can troubleshoot more easily.22:25
boxybrow1 okay22:26
SethRobertson pen: Did you read the gitweb man page about setting export_ok or otherwise authorizing the projects?22:26
← wuj left22:26
← khmarbaise left22:27
→ macmartine joined22:27
pen SethRobertson: I haven't read it yet, I was following some guides online and I set the config files to redirect gitweb to the gitolite repos22:27
SethRobertson: but the problem is that gitweb cannot find the repos22:27
→ wuj joined22:27
SethRobertson gitweb fails safe. You must explicitly authorize repos to be exported. It might be producing an error since there are not authorized for export22:27
pen SethRobertson: from gitweb? hmm22:28
SethRobertson: I don't see man for gitweb22:29
SethRobertson man gitweb22:29
gitinfo the gitweb manpage is available at http://jk.gs/gitweb.html22:29
→ ccushing joined22:29
→ dfr|floridia joined22:29
← smw left22:30
pen SethRobertson: well, I didn't have that in my gitweb.conf, is it off by default?22:30
SethRobertson gitweb fails safe. You must explicitly authorize repos to be exported. It might be producing an error since there are not authorized for export22:30
pen SethRobertson: yea, it should be off by default22:30
I didn't set $strict_export22:31
nor $export_ok, the manual said both are off by default and gitweb can access all repositories22:31
SethRobertson: are you sure that's the case? I can try but that's just weird22:32
SethRobertson Well, then either the permissions ont he directory are wrong and apache cannot access them, or you have pointed gitweb at the wrong directory, or you are misreading the man page22:32
It has been 2-3 years since I set up gitweb. At that time you had to do something affirmative to allow export22:33
pen SethRobertson: that's why I said, I have tried changing $REPO_UMASK to 0027 and chmod the existing directories and I even do usermod to move www-data to my gitolite user group22:34
← Sonderblade left22:34
pen it is still complaining that it cannot access the repo22:34
I follow gitolite's suggestion and run chmod -R g+rX22:35
for all directories under gitolite user22:35
including the repos and project.list22:35
projects.list22:35
SethRobertson here is an experiment. Change the permissions and ownership of the gitweb.cgi fiels to the same as the repos. If you can still get gitweb output, then that is not your problem22:35
← bitkiller left22:35
pen k, where is the gitweb.cgi?22:35
← wuj left22:36
SethRobertson You installed it somewhere so that apache could call it when you requested the right URL, no?22:36
→ khmarbaise joined22:36
SethRobertson Either you installed the gitweb.cgi to a location or you mapped the URL from the location22:37
→ wuj joined22:37
pen ah, found it22:37
I installed via aptitude22:37
← wuj left22:37
pen hmm22:37
so what would be the command for this? to change it to gitolite user?22:38
SethRobertson ls -ld /path/to/a/gitolite/repo22:38
What does that return?22:38
← komma left22:38
→ wuj joined22:39
pen drwxr-x--- 7 gituser gituser 4096 Jan 23 14:49 repositories/testing.git/22:39
yea, I call it gituser22:39
wereHamster as if that wasn't obvious enough22:39
← guns left22:39
SethRobertson chmod 750 /path/to/gitweb.cig; chown gituser.gituser /path/to/gitweb.cgi22:39
pen ok, thanks22:40
SethRobertson You, err, have made apache part of group gituser and restart apache?22:40
Otherwise it isn't going to work.22:40
Well, that will be obvious enough soon22:40
← ccushing left22:40
pen yea, I did, I already did that22:41
boxybrow1 SethRobertson: okay, I've posted my issue on pastebin: http://pastebin.com/znMa1Jyc22:41
→ ccushing joined22:41
boxybrow1 I tried to add some comments to kind of describe whats going on22:41
er, what I'm seeing22:41
→ smw joined22:42
← mandric left22:42
boxybrow1 I suspect I just dont understand what is going on, but it seems like this behavior is pretty unexpected22:42
← khmarbaise left22:42
SethRobertson What does `git status` say?22:42
pen SethRobertson: still doesn't work after restarting, -rwxr-x--- 1 gituser gituser 211216 Sep 21 13:36 /usr/lib/cgi-bin/gitweb.cgi22:43
boxybrow1 SethRobertson: it just has a bunch of untracked files, no modifications22:43
← infogulch left22:43
← dfr|floridia left22:43
→ kojiro joined22:43
← wuj left22:43
SethRobertson pen: You are getting 404 no projects? Not 404 not found or something? You have checked the apache error log?22:44
pen SethRobertson: still no projects, let me check the log22:44
→ hwrdprkns joined22:44
SethRobertson pen: I'm asking whether you are getting a 404 message about not being able to find/run gitweb.cgi or whether you are getting a 404 message about no git repositories being found?22:45
→ frogonwheels joined22:45
pen SethRobertson: still the same, I can access the gitweb interface22:45
→ wuj joined22:45
→ bitkiller joined22:45
pen SethRobertson: 404 - No projects found22:46
still the same error message22:46
SethRobertson boxybrow1: !situation22:46
gitinfo boxybrow1: Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if you problem is more complex than 20 commits long)22:46
← KU0N left22:46
← Xizor left22:47
SethRobertson boxybrow1: Also: git log -n 20 --all --graph -- tutorial/src/gcdTestHarness_rtl.v22:47
← bitkiller left22:47
→ bitkiller joined22:47
← orospakr left22:47
→ hacim joined22:47
hacim i'm trying to add a submodule, but I keep getting an error that I do not understand:22:47
fatal: Not a git repository: ../.git/modules/development/modules/etherpad-lite22:48
Unable to checkout submodule 'development/modules/etherpad-lite'22:48
→ orospakr joined22:48
← wuj left22:48
hacim i'm doing the 'git submodule add <repo> path' in the top level git repository22:48
→ dfr|floridia joined22:48
→ wuj joined22:48
boxybrow1 SethRobertson: any specific branch I should be doing this on?22:49
SethRobertson boxybrow1: no22:49
pen: Have you customized the $project_root?22:49
projectroot22:50
→ corburn joined22:50
pdtpatrick_ Anyone know of something like this for git ?22:50
http://versionsapp.com/22:50
← johnkpaul left22:50
SethRobertson !tools22:50
gitinfo See https://git.wiki.kernel.org/articles/i/n/t/Interfaces,_frontends,_and_tools.html for information about known interfaces, frontends, and tools.22:50
hacim SethRobertson: no, I haven't22:51
err, maybe you weren't talk to me22:52
SethRobertson hacim: I didn't reply to you, but if I were going to reply I'd ask you to show the command you used. I'd also advise you to consider switching from git-submodules to !gitslave22:52
gitinfo hacim: gitslave (http://gitslave.sf.net) is useful to add subsidiary git repositories to a git superproject when you control and develop on the subprojects at more or less the same time as the superproject, and furthermore when you typically want to tag, branch, push, pull, etc. all repositories at the same time.22:52
← rebagliatte left22:52
hacim interesting22:53
pen SethRobertson: hey, no22:53
SethRobertson: I didn't22:53
hacim SethRobertson: i'll have a look at gitslave. I can't switch to it right now, but I will look at doing so. This is the command I was using: git submodule add git://labs.riseup.net/module_etherpad-lite development/modules/etherpad-lite22:53
pen SethRobertson: it is still in ~/repositories22:53
SethRobertson You could have done it in /etc/gitweb.conf22:54
boxybrow1 SethRobertson: here you go http://pastebin.com/VMxn1yma22:54
SethRobertson boxybrow1: Your paste looks corrupted22:55
← eijk left22:55
pen SethRobertson: I did, I set it to /home/gituser/repositories22:55
SethRobertson: btw, it is named $projectroot, no underscore22:56
← LekeFly left22:56
→ komma joined22:56
→ LekeFly joined22:56
kojiro Offhand, anyone familiar with dulwich and able to tell me how to iterate over the objects in a remote (ssh) repository? Or perhaps just how to clone that repo to local?22:57
SethRobertson pen: My only other suggestion is to use strace to try to see what gitweb is doing. `mv gitweb.cgi gitweb.cgi.real; echo "strace -o/tmp/tr -f -s128 $0.real" > gitweb.cgi; chmod 755 gitweb.cig` or something like that. Then yhou can look at /tmp/tr22:57
← arvind_k left22:58
kojiro alternatively, is it possible to emulate "clone" via other git commands? (such as init and fetch)22:58
← smw left22:58
← hacim left22:59
boxybrow1 SethRobertson: ugh sorry, one second22:59
SethRobertson boxybrow1: Does this show you the same thiffn? git show master:tutorial/src/gcdTestHarness_rtl.v > /tmp/master; git show solutions:tutorial/src/gcdTestHarness_rtl.v > /tmp/solutions; diff -u /tmp/master /tmp/solutions23:00
pen SethRobertson: now I cannot access the gitweb anymore, it now says internal server error23:01
SethRobertson kojiro: Yes, you may emulate clone with init, remote add, and fetch23:01
→ brar joined23:01
SethRobertson Hmm, perhaps try adding a line "#!/bin/sh" in front of the other one in gitweb.cgI?23:01
← unreal left23:01
SethRobertson I'm assuming you have strace installed. Check that too23:02
boxybrow1 SethRobertson: updated pastebin: http://pastebin.com/7Z9Y5Ltj23:02
SethRobertson: Same thiffn? what's that?23:02
SethRobertson thing23:02
pen SethRobertson: do you know anything about perl? I am examining gitweb.cgi23:02
SethRobertson: what does our do?23:02
SethRobertson our declares a variable as global23:02
boxybrow1 SethRobertson: yes it shows me the same thing, theres no difference between the files23:03
pen SethRobertson: I see that in the beginning it declares projectroot as "pub/git" and the comment said above that it will be prepended23:03
boxybrow1 diff -u /tmp/master /tmp/solutions dumps out nothing23:03
SethRobertson boxybrow1: that is peculiar.23:04
pen SethRobertson: seems like it is not getting it from gitweb.conf23:04
← patrick99e99 left23:04
boxybrow1 yeah I'm not sure what is going on, I'm scared things got corrupted23:04
← zulax left23:04
SethRobertson git fsck --full23:04
What version of git are you running? Can you make your repo publicly available?23:05
boxybrow1 I'm running 1.7.1, I'm not sure if I can make it publicly available23:06
→ drizzd joined23:06
← di-five left23:06
→ drizzd_ joined23:06
→ daviddoria joined23:07
boxybrow1 git fsck shows a bunch of dangling blobs23:07
and a dangling commit23:07
daviddoria if it wont let me push because "non-fast-forward updates were rejected", is there a way I can see what it is complaining about? Nothing has changed on the remote, but a lot has changed locally23:07
SethRobertson dangling is normal23:07
boxybrow1 okay23:08
pen SethRobertson: btw, I just installed strace but it is still getting me internal server error23:08
thiago daviddoria: it's complaining that the push is not a fast-forward23:08
linusoleander Is it somehow possible to make "git shortlog -s" not to lock when there isn't any HEAD?23:08
thiago daviddoria: that is, the remote has commits you don't23:08
drizzd_ we should remove dangling objects from fsck's output23:08
thiago daviddoria: maybe you need to pull or rebase?23:08
linusoleander It's waiting for data from stdin23:08
SethRobertson boxybrow1: You have stumped me a bit. Unless there are tags or other refs with the same name (master/solutions) I have no ideas23:08
← pdtpatrick_ left23:09
SethRobertson pen: Try running gitweb.cgi manually and see what it says23:09
→ pdtpatrick_ joined23:09
daviddoria thiago, hm, there shouldn't be any commits on the remote that I don't have... i'm afraid if I pull it will undo everything i've done locally or something23:09
cirwin linusoleander: you could </dev/null it :p23:09
pen SethRobertson: ah, permission denied23:09
boxybrow1 SethRobertson: okay..., I just did a "git merge master" on the solutions branch and that fixed it... but I'm not sure why23:10
linusoleander cirwin: That will send everything to dev/null23:10
What if shortlog has something to return=23:10
cirwin no, it will read from /dev/null23:10
SethRobertson pen: ls -l gitweb.cgi* /tmp/tr23:10
← naderman left23:10
cirwin and therefore find the empty log23:10
linusoleander cirwin: git shortlog -s < /dev/null23:11
Like that23:11
?23:11
cirwin yeah23:11
← pdtpatrick_ left23:11
SethRobertson boxybrow1: Git 1.7.1 is close to two years old. I'd recommend upgrading23:11
cirwin but that causes it to do nothing on real git repos too :(23:11
linusoleander cirwin: Exactly23:11
cirwin: is there a way to check if a head exists?23:11
SethRobertson git show HEAD?23:12
cirwin git rev-parse HEAD --quiet --verify23:12
← Dave^|| left23:12
SethRobertson even better23:12
pen -rwxr-xr-x 1 gituser gituser 34 Jan 29 18:07 gitweb.cgi23:12
-rwxr-x--- 1 gituser gituser 211216 Jan 29 18:06 gitweb.cgi.real23:12
yea23:12
linusoleander SethRobertson: I'm getting "fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.23:13
Use '--' to separate paths from revisions"23:13
SethRobertson pen: Are *you* a member of user/group gituser?23:13
daviddoria so if I do a push -f, is there really no way to get back commits in between?23:13
SethRobertson pen: What did the apache errorlog have to say about the problem?23:13
pen SethRobertson: oh oops, I chown but I run as another user, let me try again :P23:13
SethRobertson daviddoria: Yes, there is. !fixup23:13
gitinfo daviddoria: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at https://gist.github.com/1612395 for full instructions. For hints type !fixup_hints in IRC. Remember, if you have pushed there only a few things you can do without !rewriting_public_history (type that for more info)23:13
← JackWinter2 left23:13
daviddoria SethRobertson, cool, i'll take a look, thanks23:14
→ unreal joined23:14
→ bigkm joined23:14
→ naderman joined23:14
← naderman left23:14
→ naderman joined23:14
→ sudoquai joined23:15
← MariusKarthaus left23:15
pen SethRobertson: well, I run the gitweb.cgi as root now it spit out some html saying the same thing with 404 projects not found, and the weird thing is that apache is part of gituser group and it still gets the internal server error23:15
← Gitzilla left23:15
SethRobertson daviddoria: The advice only works if you had ever had the refs, For instance, if you hadn't pulled, you would have to run the lost&found stuff on the upstream repo23:15
← boxybrow1 left23:15
SethRobertson pen: Now grep for "open" in /tmp/tr and look for likely problems Wrong directories, -1 returns for stuff that exists, etc23:16
pen SethRobertson: i will paste my /tmp/tr23:16
SethRobertson Or that23:16
pen SethRobertson: ok23:16
→ pdtpatrick_ joined23:17
pen SethRobertson: https://gist.github.com/170130023:18
SethRobertson: something with io device?23:18
→ robotmay joined23:18
← unreal left23:19
SethRobertson pen: Um, does the file /home/gituser/project.list exist? What is in this file?23:19
Hint, the answer is nothing23:19
pen SethRobertson: let me check, that's weird23:19
SethRobertson Remove it, mv gitweb.cgi.real gitweb.cgi, and try again23:20
pen SethRobertson: in my gitweb.conf, my $projects_list is /home/gituser/projects.list23:20
→ JackWinter joined23:21
pen looks like gitweb is looking at the wrong file23:21
→ EricInBNE joined23:21
pen it has an s after project23:21
but why?23:21
SethRobertson Remove it, mv gitweb.cgi.real gitweb.cgi, and try again23:21
→ [RHQme]stringo0 joined23:21
pen SethRobertson: k23:21
SethRobertson: still the same response, 404 no projects found23:22
← stringoO left23:22
SethRobertson Try removing that assignment from /etc/gitweb.conf23:22
→ eletuchy_ joined23:22
pen you mean comment it out?23:23
oh wow23:23
works now23:23
what the hell23:23
I thought it wants the projects.list from gitolite23:23
← robotmay left23:23
pen SethRobertson: what's the cause for this? that's so weird23:24
SethRobertson If you have such a file with the projects listed it will use it. If the file is empty it will use it, but the results will not be as desired23:24
It did exactly what you told it to do. Exported all repos listed in that file23:24
→ mikepack joined23:24
→ shiba_yu36 joined23:25
pen SethRobertson: ohh, you mean my projects.list is empty? hmm I thought gitolite will add it automatically23:25
SethRobertson: yea, but I see why it says 404 now23:25
SethRobertson: thanks man23:25
SethRobertson !thanks23:26
gitinfo The best way to thank someone is to say their nickname with two pluses after it, as part of a larger message of thanks if you want. So to thank me, for instance, say "gitinfo++". I'm a bot so thanks to me should be directed to my master, jast.23:26
← eletuchy left23:26
← coopsh left23:26
pen SethRobertson++23:26
:D23:26
← tango_ left23:27
← macmartine left23:28
→ Nathandim joined23:28
→ macmartine joined23:28
← akosikeno left23:29
pen SethRobertson: is there a reason for ++?23:31
SethRobertson Learn to program. Most languages have that construct for increment.23:31
→ mandric joined23:32
pen SethRobertson: oh, I see I thought it is something with like c++, so the bot keeps a counter for each user here?23:33
SethRobertson mmm23:33
← gchristensen left23:34
→ Chib joined23:35
pen aha23:35
:P23:35
← Hati left23:36
→ coopsh joined23:36
← ph^ left23:37
→ ehsan joined23:37
← Cromulent left23:38
kojiro !karma c23:38
heh23:38
pen ha23:38
← kerrick left23:38
← dSebastien left23:39
→ kerrick joined23:39
SethRobertson !karma23:40
gitinfo Karma is nominally tracked by http://carmivore.com/. If you wanted to thank me, for instance, you would say gitinfo++.23:40
→ msponge joined23:41
bob2 argh23:41
did they at least make the bot not ever say anything ever?23:41
← marcreichelt left23:42
SethRobertson Well, the website looks like it was programmed by dunderheads, so probably not23:43
→ root_ninja joined23:45
← i42n left23:45
← root_ninja left23:45
→ root_ninja joined23:45
← Samoi left23:45
daviddoria If I 'git status', I see modified: c++/QT/ComputationThread (modified content) under "Changes not staged for commit:". If I then 'git add c++/QT/ComputationThread' then 'git status', it is still listed under "Changes not staged for commit:". How else can I add it?23:46
→ lonewulf` joined23:46
← Kulrak left23:46
→ Kulrak joined23:46
← Kulrak left23:46
→ Kulrak joined23:46
root_ninja → Samoi23:46
thiago Windows?23:47
daviddoria thiago, nope, linux (if you were talking to me)23:47
thiago I was23:48
I've never seen a git add not work on Linux...23:48
do you have any "crlf" settings on .git/status?23:48
← dfr|floridia left23:48
daviddoria not on purpose23:48
← iocor left23:49
kl4m daviddoria: is ComputationThread a file or dir?23:49
FauxFaux daviddoria: Quote the line?23:49
daviddoria kl4m, a dir23:49
thiago daviddoria: how about "yes" or "no" ?23:50
→ babilen joined23:50
thiago daviddoria: is that a submodule?23:50
daviddoria FauxFaux, do you mean 'git add "c++/QT/ComputationThread/"'?23:50
thiago, no, there are no submodules23:50
→ Bass2 joined23:51
→ Bass10 joined23:51
thiago daviddoria: a directory cannot be modified23:52
add the files that are inside it23:52
FauxFaux daviddoria: I don't know, does it work?23:52
← Bass2 left23:53
← glcrazy left23:53
→ Bass2 joined23:54
← Bass10 left23:54
← bitkiller left23:54
→ danielpunt joined23:54
→ bitkiller joined23:55
← Bass2 left23:55
→ Bass10 joined23:56
← brar left23:56
← Bass10 left23:56
→ gchristensen joined23:56
← friskd left23:57
→ brar joined23:57
← sudoquai left23:58
← gchristensen left23:58
→ sudoquai joined23:58
→ sudoquai_ joined23:58

Logs Search ←Prev date Next date→ Channels Documentation