IRCloggy #git 2009-12-24

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.

2009-12-24

→ bigmack83 joined00:01
subsonic I don't understand that when I swtich to a branch, modify a file, and then commit, it says I need to git add or git commit -a00:01
← WinterWeaver left00:01
cbreak what do you want to commit?00:01
the changed file?00:01
subsonic yeah00:02
cbreak then add the file00:02
subsonic I'm just running a test00:02
→ jablko joined00:02
subsonic WHy does it need to be added when it's marked as modified?00:02
cbreak because git doesn't commit all changes00:02
only those you added00:02
subsonic ohhhh, does it need to be "added" to the commit list?00:02
cbreak that way, you can commit a small bugfix while working at something else00:02
shd subsonic: git commit -a adds all modified files00:02
brian_panneton I have set up the server to host all the files and it uses git for collaboration. Each dev is going to make their own clone of the files. They edit them and want to send them back to the server. However, I don't want to push this? I don't understand why.00:02
shd subsonic: or git commit file00:02
subsonic ahh, okay00:03
it's like the reverse of SVN in that way00:03
shd subsonic: the logic is that git requires commits to be "staged"00:03
subsonic yeah00:03
shd subsonic: staging means the user indicates which files will go to the commit. you can have multiple files modified, but you can commit only some of it in logical pieces00:04
subsonic right. is there a way to list which files are staged?00:04
shd subsonic: git status00:04
← Sky[x] left00:05
subsonic ahh, okay00:05
jablko i cloned a repo on one machine and made some commits00:05
shd # Changes to be committed:00:05
jablko now i cloned the same repo on another machine00:05
shd <list of files to be committed>00:05
→ vital joined00:05
shd Changed but not updated:00:05
jablko and wanna pull the commits from the first machine to this one00:05
shd <list of files that are modified but that will not be committed>00:06
jablko but git pull says you asked me to pull w/o telling me which branch00:06
shd subsonic: staging allows one to pick-and-choose those parts of the tree should go in on a single commit00:06
← schacon left00:06
subsonic shd: yep :)00:07
← DavidKlein left00:07
shd subsonic: it's pretty convenient actually, once you get used to it00:07
→ arod__ joined00:07
subsonic I have files added (staged) how can I see the diffs of those?00:07
cbreak jablko: you need to pull a branch00:07
which branch do you want to merge?00:07
git diff --cached00:07
shd git commit -a more or less emulates the svn default behaviour00:07
subsonic: git diff HEAD00:07
cbreak difference between what is staged and what is HEAD00:07
shd subsonic: or, git diff HEAD -- filelist00:07
cbreak no00:07
git diff HEAd will show you the difference between what is modified and HEAD00:08
that is not neccessarily the same00:08
zoran119 hi people, i have a master bare repo and two developers pushing to it. one developer made a new branch and pushed it, the other one made a few commits on top of that same branch, then merged it into master and pushed it. how do we now clean up and delete this merged branch from the central bare repo and the developers local repos?00:08
→ loincloth joined00:08
jablko cbreak: thanks - not sure - on both machines i just ran "git clone ... git commit ..."00:08
w/o noticing the branch00:08
shd git diff HEAD is what svn people expect00:08
cbreak maybe master?00:08
jablko cbreak: master worked00:09
thanks00:09
← loinclot_ left00:09
← arod__ left00:09
cbreak good :) master's the default branch00:13
← Geralt left00:13
← tbuehlmann left00:15
← brett_h left00:16
→ idletask joined00:21
idletask Hello00:21
← subsonic left00:21
← erlehmann left00:21
→ fynn joined00:28
← kithpom left00:29
fynn Yo. How do I set core.excludesfile to be ~/.excludesfile? The following in ~/.gitconfig doesn't work00:29
→ loinclot_ joined00:29
fynn [core]00:29
excludesfile = $HOME/.gitexcludes00:29
Pieter s/$HOME/~/00:30
← Bryson left00:30
sitaram RobertLaptop: pingg00:30
RobertLaptop Hi Sitaram00:30
sitaram RobertLaptop: what does "user key and git key dont match" even mean? (just woke up, need help understanding what you meant!)00:30
← maxter left00:30
fynn Pieter: doesn't work, unfortunately :/00:31
← mbroeker left00:31
RobertLaptop I was looking at this line of code.00:32
+ next if $user =~ /^(gitweb|daemon|\@all)$/ or ( $user_list{$user} || '' ) eq 'has pubkey' or ( $internal{$user} || 0 ) == 1;00:32
I take that back. It was this message "print STDERR "WARNING: pubkey $pubkey exists but $user already used as an external name\n""00:32
idletask Feature request: when you git pull, git will automatically fetch + merge from the correct remote repository and then branch, as known in the config file00:33
sitaram RobertLaptop: let rephrase my question. What does "git key" even mean?00:33
→ mithro joined00:33
sitaram s/let/let me00:33
idletask However, suppose you want to dissociate fetch and merge: you need to git fetch theremote (or --all), but you need to specify the remote branch for git merge, even if you want the default00:33
fynn Looks like a patch for this might have gotten rejected?00:34
http://n2.nabble.com/PATCH-Support-core-excludesfile-gitignore-td742043.html00:34
RobertLaptop It means a Key used inside ssh to access git instead of a key used inside ssh to access a shell.00:34
idletask The feature would be; when on a tracking branch, "git merge" merges from the appropriate remote branch00:34
I mean, "git merge" with no other argument00:35
← Yuuhi` left00:35
RobertLaptop Sitaram my typing sucks really bad and I likely missed a few words.00:35
← amirite left00:36
→ Paraselene_ joined00:37
sitaram RobertLaptop: ok you meant a gitolite key versus shell key. Anyway that code has nothing to do with that, and I have no checks anywhere to make sure they dont match.00:37
charon idletask: how does 'git pull' not cover that case already?00:38
sitaram RobertLaptop: and with the new @SHELL feature, it may not even be needed after the first install00:38
RobertLaptop sitaram It means I miss read the patch. Wouldn't be the first time,00:38
sitaram np :)00:38
fynn OK, does anyone know whether it's possible to use $HOME or ~ when specifying the path to core.excludefiles?00:40
if not, seems like .gitconfig's would become non-portable.00:40
idletask charon: git pull will fetch00:41
fynn the docs says it is possible, but it's not working on 1.6.500:42
err, 1.6.400:42
felipec hmm, git ls-files -x $patern doesn't work00:42
→ amirite joined00:43
charon idletask: oh, apparently i missed the first half of your explanations. but how is that bad? admittedly someone might sneak commits into your merge, but you can just as well 'git pull; git log HEAD@{1}..' to look at it after the merge (and possibly 'git reset --merge HEAD@{1}' if you're not happy) instead of holding off the merge until you're sure you want to do it00:43
→ hummingkid joined00:43
← Sonderblade left00:44
zoran119 how do i tell if a remote branch has been deleted?00:44
idletask charon: well, I just thought that since git pull is smart enough to know which remote branch you track, git merge could be as well00:44
← loincloth left00:45
charon felipec: read http://thread.gmane.org/gmane.comp.version-control.git/13521900:46
idletask: true00:46
charon shrugs00:46
charon idletask: you can probably even write a small alias using git for-each-ref --format="%(upstream)" $(git symbolic-ref HEAD)00:47
modulo error checking, and note that git-pull has its own logic00:47
idletask charon: uh, that's much too advanced git usage for me right now00:48
→ unomi1 joined00:48
idletask tries this command00:48
ngw → ngw|away00:49
← aconbere left00:50
idletask git for-each-ref --format="%(upstream:short)" $(git symbolic-ref HEAD) indeed shows the argument which could be used in this case00:51
felipec charon: ah :(00:53
ngw|away → ngw00:54
→ zoran119_ joined00:54
← JakeSays left00:54
← hummingkid left00:55
RobertLaptop sitaram you could update the install script to add the new user into the shell group and not need the 2nd key at all anymore. :)00:55
→ loincloth joined00:56
← vbgunz left00:58
← fynn left00:58
← zoran119_ left00:58
jelmer_ → jelmer00:59
→ multi_io joined00:59
→ aquabu joined00:59
← JasonWoof left01:00
← unomi left01:00
← loinclot_ left01:01
ngw → ngw|away01:01
multi_io hm...so... if I push a branch that is checked out in the target repo I'm pushing to, then the HEAD (i.e. the (pointer to the) checked-out commit) in that repo is advanced to the most recent pushed commit on that branch?01:01
← jablko left01:02
→ jablko joined01:03
← cousine left01:07
ngw|away → ngw01:08
→ exygen joined01:09
→ jinzhu joined01:09
← brian_panneton left01:10
← tedoc2000 left01:11
← nsussman left01:12
sitaram RobertLaptop: catch-2201:17
← zoran119 left01:18
→ JasonWoof joined01:18
← loincloth left01:18
→ loinclot_ joined01:18
← nadavoid left01:18
→ dgarr joined01:18
sitaram RobertLaptop: possible to break the catch-22 but downside: if something goes wrong within gitolite they might be locked out completely, so I have to make sure they have password access for emergencies01:19
RobertLaptop: nothing should go wrong, but being worried it might is a good thing :)01:19
→ nadavoid joined01:20
← vital left01:21
RobertLaptop Yea but then again. I somehow managed to make both the key's the same and was locked out anyway. Lukely for me that account was create just for git so I could SU in and fix things01:21
→ vital joined01:21
← cenuij left01:21
← felipe left01:21
→ babilen_ joined01:21
RobertLaptop sitaram ^^01:21
← nadavoid left01:23
RobertLaptop sitaram If you don't have admin access and you manage to cross the keys you are in bad shape.01:23
sitaram RobertLaptop: not sure how you did that. Gitolite requires a "shell access without password" key and it does not touch that -- the worst that can happen is that gitolite won't work for you, but the shell will (because even if you use the same key, the "shell" line comes first)01:25
RobertLaptop: I'd like to see a repeatable case of starting with a "shell access" key and locking yourslef out of that while installing gitolite01:25
→ cenuij joined01:26
→ tekky joined01:26
← jspiros left01:26
→ jspiros joined01:27
sitaram assuming ssh-add -l quirkiness is taken care of...!01:29
RobertLaptop It wasn't gitolite. It was me.01:29
sitaram RobertLaptop: and if I do what you first asked, it *could* be gitolite. I *never* want that :)01:30
RobertLaptop Sitaram It was about 10 crises ago so I can't remember what broken and how.01:30
sitaram I can look it up; but it was something to do with ssh-add -l IIRC01:31
were you the one who did everything as root? no that was someone else I think...!01:31
← jspiros left01:32
→ jspiros joined01:32
RobertLaptop I think it was more about me tiring to manage both a testing gitolite repo and a production gitolito repo01:32
from the same users01:32
sitaram that should work fine! It's even documented how to do that01:32
in particular, that should not result in any lock outs01:33
RobertLaptop Well I get my keys all mixed up.01:33
← idletask left01:34
sitaram aah well.. anyway, you see my problem? being able to say "gitolite cant lock you out" is important to me... so... I wont break that initial install's dependence on 2 keys01:34
→ idletask joined01:35
RobertLaptop It had nothing to do with gitolite and more with me tiring to do stuff manually.01:35
sitaram :)01:35
Tronic Should git filter-branch --tree-filter "script that modifies some files" automatically notice the modifications?01:35
← babilen left01:35
Tronic Because here it doesn't appear to do so.01:35
→ totty joined01:35
→ mugwump joined01:35
Tronic The documentation says that it will notice any new or deleted files, but it says nothing about modified files.01:36
← totty left01:36
RobertLaptop I took care of the issue by just using 2 users and not having to keep track of a bunch of keys.01:36
← jspiros left01:37
→ javatexan joined01:37
→ LiamH joined01:38
← bdowning left01:38
→ hipe joined01:39
← hipe left01:39
RobertLaptop siteram but in the end passwords would still have worked I just choice to su in and look around to see what I did.01:40
→ bdowning joined01:41
→ jspiros joined01:42
← hyperair left01:43
→ thiago joined01:44
→ godsflaw joined01:44
→ Tureba joined01:45
→ aconbere joined01:45
← justin-george left01:47
← tfarina left01:47
← peper left01:47
→ peper joined01:47
Tronic After the operation is complete, it says WARNING: Ref 'refs/heads/master' is unchanged01:47
... and nothing in the repository has changed, the changes are applied to the working copy, though.01:48
→ hipe joined01:50
→ tfarina joined01:50
← jspiros left01:51
→ tfarina_ joined01:52
← dreiss_ left01:53
→ JakeSays joined01:55
→ jspiros joined01:55
← Tank` left01:58
← hipe left01:58
→ hyperair joined01:58
← jessep left02:00
← jspiros left02:00
→ Tank` joined02:01
← tfarina_ left02:03
← nitrate left02:05
→ loincloth joined02:06
→ justin-george joined02:06
← intripoon left02:06
← thiago left02:08
Tronic I am starting to think that filter-branch is only suitable for adding/removing/moving files and not actually modifying them.02:09
← tfarina left02:09
→ nitrate joined02:09
→ hummingkid joined02:11
→ jspiros joined02:11
→ thiago_home joined02:11
me22 Tronic: so remove one then add it back?02:12
Tronic Add as a new commit after the processing, you mean?02:13
→ benbeecher joined02:14
pigeon is there a git command to show the top level git tree path?02:16
thiago_home git rev-parse --show-cdup02:16
→ jessep joined02:16
benbeecher I'm new to git and trying to understand the distrubted part of it - if I clone a repository and issue a git branches I only see master - shouldn't I have pulled over the remote repositories branches with the clone?02:17
thiago_home benbeecher: you did02:18
you cloned everything02:18
you have to understand the distinction between branches on the remote, your branches, and the local copies of the remote branches02:18
(the latter are often called "remote branches")02:18
do a git branch -r02:18
benbeecher aha02:19
← loinclot_ left02:22
benbeecher ok - this is probably a good place to drop what I'm doing and read the manual. :) Thanks!02:22
← iron left02:23
← hobodave left02:24
pigeon thiago_home: thanks02:26
→ VVSiz_ joined02:26
→ upul joined02:26
→ MetaCosm_ joined02:28
ngw → ngw|away02:32
← RobertMeta left02:33
ngw|away → ngw02:33
→ loinclot_ joined02:36
→ felipe joined02:37
→ hipe joined02:38
← parasti left02:39
→ whaley joined02:39
← VVSiz left02:44
← yzlin left02:45
← jlilly left02:47
→ yzlin joined02:47
← spearce left02:47
← jessep left02:50
← loincloth left02:52
→ AAA_awright joined02:52
ngw → ngw|away02:57
ngw|away → ngw02:57
← zackattack left02:58
ngw → ngw|away03:02
ngw|away → ngw03:02
← LiamH left03:04
→ dreiss_ joined03:05
← j416 left03:08
→ kpreid_ joined03:11
← javatexan left03:12
← Tureba left03:13
→ jlilly joined03:18
← coolcat left03:18
→ idle_task joined03:18
→ cytrinox_ joined03:20
← aziz left03:27
→ LiamH joined03:28
← warthog9 left03:28
← t0rc left03:28
← Paraselene_ left03:30
← thiago_home left03:31
← idletask left03:33
offby1 would never make a joke about sitaram's age03:35
→ t0rc joined03:35
sitaram would hit too close to home, huh?03:35
:)03:35
← t0rc left03:36
← cytrinox left03:36
cytrinox_ → cytrinox03:36
→ tarski joined03:43
← kpreid_ left03:45
→ kpreid_ joined03:45
offby1 glances around nervously.03:46
→ loincloth joined03:46
← tarski left03:48
← loinclot_ left03:50
→ tjaway joined03:52
← ereslibre left03:54
→ ajonat joined03:57
→ jessep joined03:59
← hummingkid left04:00
← kukks left04:00
← ngw left04:00
← LRN left04:04
→ LRN joined04:05
← mithro left04:06
← JM left04:08
← tjafk left04:08
Gitzilla wonders what offby1 has to be nervous about.04:11
← tekky left04:11
offby1 nothing, nothing at all; why, I ... uh ...04:14
<.-.<04:14
>.-.>04:14
← ajonat left04:21
← benbeecher left04:23
→ ajonat joined04:29
→ sumangurung joined04:35
← loincloth left04:36
→ loincloth joined04:36
← LiamH left04:37
→ meanburrito920_ joined04:38
→ j416 joined04:39
→ munichlinux joined04:40
→ pinnacle joined04:40
→ loinclot_ joined04:42
← whaley left04:44
→ ybloc joined04:48
→ hobodave joined04:49
→ fcarrijo joined04:49
← fcarrijo left04:50
→ owen1 joined04:51
→ tekky joined04:52
owen1 can i get rid of master and name one of my branches as the 'new' master?04:52
← Jak_o_Shadows left04:52
owen1 or cut some commits from the master and then merge it with a branch i have?04:54
← jablko left04:54
→ rchavik joined04:55
← loincloth left04:57
j416 owen1: man git-branch04:58
Gitbot owen1: the git-branch manpage can be found at http://git.or.cz/man/git-branch04:59
j416 search for flag -m04:59
it will let you rename a branch04:59
not sure what you mean by "cut some commits", but maybe man git-reset will help you04:59
Gitbot j416: the git-reset manpage can be found at http://git.or.cz/man/git-reset05:00
ybloc lol ^05:00
handy little guy05:00
→ hummingkid joined05:00
← FunkeeMonk left05:00
→ lockers joined05:04
← ashokie_bear left05:05
← lockers left05:05
← pinnacle left05:05
→ loincloth joined05:06
← owen1 left05:06
→ psankar joined05:07
← loinclot_ left05:09
→ owen1 joined05:09
owen1 i lost connection guys. anynoe replied?05:09
← aconbere left05:09
← madewokherd left05:11
← sumangurung left05:11
→ javatexan joined05:12
→ krynnotaur joined05:12
← dreiss_ left05:12
ybloc 20:58 j416: owen1: man git-branch05:13
Gitbot ybloc: the git-branch manpage can be found at http://git.or.cz/man/git-branch05:13
ybloc 20:59 j416: not sure what you mean by "cut some commits", but maybe man git-reset will help you05:13
Gitbot ybloc: the git-reset manpage can be found at http://git.or.cz/man/git-reset05:13
j416 thank you ybloc05:13
ybloc j416: np05:13
j416 13:59 j416: search for flag -m05:14
13:59 j416: it will let you rename a branch05:14
(git branch)05:14
← fcuk112 left05:17
← dgarr left05:18
→ roop joined05:19
→ cytrinox_ joined05:20
→ mithro joined05:20
→ FunkeeMonk joined05:23
← eletuchy left05:24
← godsflaw left05:25
owen1 the reason i need this is i have a good branch that i want to use. if i'll merge it with master things will not work as i want. i just want to get rid of this master.05:25
→ ankit9 joined05:26
owen1 ybloc: thanks, i'll look at git-branch manpage05:26
ybloc owen1: Be sure to thank j416, I only repeated what he had said after you left.05:27
j416 owen1: perhaps git-reset is what you are after then05:27
owen1 j416: i'll look into it. thanks05:28
j416 owen1: I take it that you want to make master look like something else?05:28
in which case it is very simple05:28
← MetaCosm_ left05:31
→ aconbere joined05:31
→ MetaCosm_ joined05:31
← MetaCosm_ left05:31
← aquabu left05:31
← javatexan left05:31
→ D[a]vey joined05:31
→ MetaCosm_ joined05:31
← MetaCosm_ left05:32
→ MetaCosm_ joined05:32
← MetaCosm_ left05:32
← justin-george left05:32
→ MetaCosm_ joined05:33
owen1 j416: yeah05:33
← MetaCosm_ left05:33
j416 owen1: git checkout master ; git reset <sha1> ;05:34
where <sha1> is what you want your master to be05:34
→ MetaCosm_ joined05:34
→ dgarr joined05:34
j416 it can be a sha1 of any commit, or the name of a branch05:34
for instance.05:34
ybloc Ah, neat, that was going to be my question.05:34
j416 :)05:35
ybloc Commit or branch sha1.05:35
j416 ybloc: any valid ref05:35
← cytrinox left05:35
cytrinox_ → cytrinox05:35
ybloc I see, neat tip. Thanks.05:35
j416 git reset HEAD^ ; < undo your last commit, for example05:35
← MetaCosm_ left05:35
j416 (won't touch work dir)05:36
→ MetaCosm_ joined05:36
owen1 j416: works. easy!05:36
j416 owen1: good good :)05:36
notice your work dir hasn't changed05:36
owen1 yeah05:36
j416 git status ; will report changes05:36
if you want to reset that as well, you can pass the flag --hard to git reset.05:37
you can reset it now by just doing: git reset --hard ;05:37
be sure to not have any changes you need05:37
→ vbgunz joined05:38
← vinse left05:40
→ xlistener joined05:41
→ charlenopires joined05:41
← vbgunz left05:43
→ nadavoid joined05:44
← nadavoid left05:44
→ brizly joined05:46
→ nadavoid joined05:48
← ybloc left05:48
← nadavoid left05:51
→ nadavoid joined05:52
← kmap left05:52
← nadavoid left05:52
→ becomingGuru joined05:54
← orafu left05:55
→ orafu joined05:56
← dgarr left06:02
← hobodave left06:02
← FunkeeMonk left06:03
→ hobodave joined06:03
→ gitster joined06:05
← wolog left06:07
← hobodave left06:07
→ amerine joined06:08
→ hobodave joined06:08
← tekky left06:11
→ ajonat_ joined06:11
← ajonat left06:12
← krawek left06:13
→ loinclot_ joined06:14
→ DavidKlein joined06:15
→ dreiss_ joined06:16
→ sh1m joined06:16
← loinclot_ left06:21
→ loinclot_ joined06:22
← dreiss_ left06:22
→ arod joined06:23
→ sis joined06:23
← sh1mmer left06:24
sh1m → sh1mmer06:24
← brettgoulder left06:24
← arod left06:25
← bigmack83 left06:26
← charlenopires left06:26
← hipe left06:26
← loincloth left06:30
→ d0ugal joined06:32
→ tekky joined06:33
← d0ugal left06:33
← segher left06:36
→ roop_ joined06:37
← D[a]vey left06:37
← roop left06:39
→ solofight joined06:40
→ calin joined06:41
← AAA_awright left06:41
← solofight left06:41
→ AAA_awright joined06:41
→ solofight joined06:42
← jessep left06:44
→ jessep joined06:45
← hummingkid left06:45
← j416 left06:45
→ j416 joined06:45
← j416 left06:47
→ j416 joined06:47
← ajonat_ left06:48
→ warthog9 joined06:50
→ mbroeker joined06:53
→ numberGrey joined06:58
babilen_ → babilen06:58
numberGrey Has anyone gotten this error before? git: 'pull' is not a git-command. See 'git --help'.06:58
Did you mean this?06:58
shell06:58
→ sis_ joined06:59
numberGrey I was trying to pull down to a small slice I had and am getting this on the pull command. I am pretty confused06:59
← Adlai left07:00
→ doener joined07:00
offby1 me too07:03
maybe the directory that holds the subcommands is missing, or unreadable, or something07:03
I'd try "strace -f -o yow git pull", then examine the file "yow" for clues07:04
... if you're using Linux, anyway07:04
on OS X you'd use "ktrace", but I forget the details. On Windows it's different again.07:04
← sis left07:05
→ mextex joined07:06
mextex → mutex07:06
→ hummingkid joined07:07
→ bigmack83 joined07:18
← meanburrito920_ left07:20
← hummingkid left07:20
→ AMorozov joined07:21
AMorozov Hi!07:21
How to configurate a branch to push with a different name to a remote?Right now I use smth like this: git push origin master:waved_processor to achieve what I need, but I would like to avoid explicit specification of branch names from command line.07:23
I have already set up branch master as this:[branch "master"] remote = origin merge = waved_processorand it actually works for pull'ing. Now I need this for pushing too.07:24
← JackWinter left07:25
doener AMorozov: you can set push.default to "tracking", then instead of pushing all branch heads that exist locally and in the remote repo, push will only push the checked out branch head, to the configured upstream branch07:25
AMorozov: of course, that means that you can only push a single branch head at a time07:26
← datechman left07:27
← JoeConyers left07:27
doener AMorozov: alternatively, you can set remote.origin.push to master:waved_processor, then pushes to "origin", will always default to pushing that branch head and renaming it07:27
AMorozov: and you can have multiple config entries for that key, so you can push more than one ref07:28
→ wolog joined07:28
→ icwiener joined07:29
→ JoeConyers joined07:29
AMorozov doener: thank you. push.default seems to be the solution for my case.07:30
← j416 left07:30
rtyler blast, where's spearce when I want to bother him :D07:33
← bigmack83 left07:36
→ zackattack joined07:38
→ bigmack83 joined07:39
← davido left07:40
← tekky left07:41
← AMorozov left07:41
→ tekky joined07:47
→ tehbaut joined07:50
→ patrickmclaren_ joined07:55
→ jceb joined08:01
→ tek joined08:02
← xlistener left08:02
← tekky left08:03
tek → tekky08:03
→ Sigma joined08:04
→ dreiss_ joined08:06
→ hobodave_ joined08:06
← hobodave left08:07
→ pantsman joined08:10
← mbernstein left08:11
→ RobertMeta joined08:17
← AkumaStreak left08:18
→ MetaCosm joined08:19
← psankar left08:19
→ Adlai joined08:19
← patrickmclaren_ left08:19
← numberGrey left08:20
→ loincloth joined08:20
→ fcuk112 joined08:20
← bigmack83 left08:22
→ maxter joined08:25
← RobertMeta left08:25
→ numberGrey joined08:26
→ droden joined08:26
← numberGrey left08:27
→ numberGrey joined08:28
← dreiss_ left08:33
← loinclot_ left08:35
← MetaCosm_ left08:36
← MetaCosm left08:39
← hobodave_ left08:40
→ Sonderblade joined08:40
→ MetaCosm joined08:40
← MetaCosm left08:41
→ MetaCosm joined08:41
← QshelTier left08:42
→ ngw joined08:48
← kristian42 left08:52
→ loinclot_ joined08:54
← sis_ left08:54
→ incredible joined08:55
→ kristian42 joined08:56
← loincloth left08:58
→ shruggar joined08:58
→ psankar joined09:06
→ j416 joined09:10
→ jelmer_ joined09:14
→ __iron joined09:16
← pantsman left09:16
→ corni joined09:17
→ Oejet joined09:20
→ idletask joined09:21
→ Patabugen joined09:21
← idle_task left09:22
idletask Hello everyone09:22
Patabugen Hey09:22
idletask I want to add an alias isremote that does git for-each-ref --format="%(upstream:short)" $(git symbolic-ref HEAD)09:22
But whatever combination I try in the config file, I can't seem to get it right :( The command by itself works, the alias doesn't...09:23
→ intripoon joined09:23
← nkuttler left09:23
Patabugen Can anyone explain how git clone --mirror works? I think I'd like to use it to backup my git, by having a cron job git fetch every X minutes, am I correct? And how does that differ from --bare or a regular clone?09:25
→ hummingkid joined09:26
Patabugen messed up the colours there eh09:26
idletask Well, OK, found09:27
You have to use the '!' alias form09:27
← loinclot_ left09:30
→ loincloth joined09:30
→ sgh joined09:30
→ Paraselene_ joined09:31
← fcuk112 left09:35
→ fcuk112 joined09:36
idletask Argh, but the ! form won't take arguments :(09:39
← JEEB left09:46
← unomi1 left09:49
wereHamster Patabugen: regular clones put the refs from the remote repository into refs/remotes/origin/, --mirror creates an exact mirror (refs/heads/foo in the remote repo is copied into refs/heads/foo in the local repo)09:49
← zackattack left09:50
→ unomi1 joined09:50
← j416 left09:50
→ rudi_s joined09:53
← jceb left09:54
Patabugen thanks wereHamster09:54
→ idle_task joined09:55
idle_task Argh, disconnected :(09:55
Anyone has seen my question?09:55
Patabugen I did, but haven't a clue! sorry09:56
by alias you mean a bash alias?09:56
← hummingkid left09:58
→ mtkd joined09:58
idle_task No09:59
What you can configure in git with alias.*09:59
Patabugen Then I'm afraid I'm completly helpless!10:00
← rchavik left10:00
idle_task I have a favorite alias of mine: git config --global alias.cdiff "diff --cached"10:00
But I want to know what remote branch, if any, a local branch tracks10:01
Right now I can do that only if I'm on the current branch using the lengthy command above with HEAD instead of $110:01
Patabugen Would it be acceptably to use git clone --mirror to create a backup, then git fetch to keep it up to date? And if the original gets borked I can git clone --mirror in the opposite direction to get it working again?10:02
← jessep left10:02
wereHamster idle_task: you want to know which remote branch your current HEAD tracks, right?10:02
Patabugen: yes10:02
Patabugen =D thanks!10:03
idle_task wereHamster: well, no, in fact, I'd like, say, "git showremote <thebranchhere>" to show what remote branch <thebranchhere> tracks10:04
For the current HEAD, I can do that already using a ! alias10:04
The problem is that the ! form won't take arguments, otherwise I'd just do refs/heads/$1 and it would work10:05
→ Axius joined10:05
idle_task I have tried this: whatremote = !git for-each-ref --format=\"%(upstream:short)\" refs/heads/$110:05
← Axius left10:06
idle_task Unfortunately, $1 is not expanded and this becomes refs/heads/10:06
Well, it is expanded to nothing10:06
← icwiener left10:06
← idletask left10:09
← rhett left10:10
wereHamster idle_task: you have to use !sh -c '...'10:13
see http://git.or.cz/gitwiki/Aliases for examples10:14
idle_task Aiie, quoting hell :p10:14
wereHamster: thanks!10:14
← Twisted_Mentat left10:15
← jelmer_ left10:15
→ tbuehlmann joined10:21
idle_task YES10:23
whatremote = !sh -c 'git for-each-ref --format=\"%(upstream:short)\" $([ -z "$1" ] && git symbolic-ref HEAD || echo refs/heads/$1)' -10:23
Thanks a lot, wereHamster10:23
→ khmarbaise joined10:23
→ loinclot_ joined10:24
wereHamster np10:27
→ jrockway joined10:27
idle_task It even takes the current branch if no argument is given10:29
Lovely10:29
← nitrate left10:30
→ sgh_ joined10:30
→ loinclo__ joined10:30
doener idle_task: I'd use: git rev-parse --symbolic-full-name --default HEAD $110:31
idle_task: that even won't explode when you're on a detached HEAD (symbolic-ref will, obviously, as HEAD isn't symbolic in that case)10:32
idle_task: ... that's to replace the stuff in the subshell, the result of course still needs to be fed to for-each-ref10:33
→ d0k joined10:34
GustavoR|aweh → GustavoRamos10:35
← mtkd left10:35
→ ustunozgur joined10:36
idle_task doener: trying that10:38
→ ixti joined10:38
← sgh left10:38
← doener left10:38
→ doener joined10:39
idle_task doener: yep, that works fine10:39
doener idle_task: :-) makes things a bit more readable (IMHO)10:39
← loincloth left10:39
idle_task I agree10:40
← ankit9 left10:43
idle_task I'm no advanced git user, unfortunately10:44
But I learn10:44
→ hipe joined10:44
← psankar left10:45
doener idle_task: no problem with that. I didn't mean to complain that you did it "wrong", just show how it can be done better10:45
→ nitrate joined10:46
idle_task doener: I didn't take it as a complaint, don't worry :p10:46
← loinclot_ left10:46
idle_task But I think this could be in the default git, somehow... Like git branch --whattracks or something10:47
Right now you have to either see the config file or do git remote show [-n] <remotename>10:47
doener idle_task: there was some discussion about master@{upstream} or so, but that somehow diead, I don't recall the reasons10:47
s/diead/died/10:48
idle_task Well, anyway - it's now in my toolbox and my git guide10:48
:p10:48
More annoyingly though, push lines have to be configured by hand10:50
It'd be nice, on a git branch -t, to say that the push side is to be configured along with the pull side10:50
doener idle_task: well, there's push.default = tracking, but that limits you to "push the checked out branch head"10:51
idle_task Err10:51
idle_task checks git-config manpage again10:51
doener idle_task: needs 1.6.310:52
→ hummingkid joined10:52
idle_task push.default is empty by default10:52
Well, I have 1.6.510:52
doener which means the same as "push.default = matching"10:52
→ erlehmann joined10:53
idle_task So, if I git branch -t foo bar/baz and push.default = tracking, it means that not only will git pull will pull from bar.baz, but git push will actually push to bar/baz as well?10:54
← mithro left10:54
→ zackattack joined10:54
doener idle_task: yes, if you run "git push" (no refspec, not sure whether giving a remote disables it, too)10:54
idle_task: ... and you have foo checked out, of course10:55
idle_task: i.e. "git push" will act like "git push bar foo:baz"10:55
idle_task: I'm pretty sure that remote.bar.push will override it though10:56
← vital left10:57
→ vital joined10:57
idle_task doener: well, that's something already10:57
doener: as a side note, I saw that if you configure a push line but rename the branch with git branch -m, the push line is not updated10:58
Is that on purpose?10:58
ngw → ngw|away10:59
doener idle_task: I guess it's "nobody thought that that be useful"10:59
idle_task Well, setting push.default to tracking is better anyway11:00
(imho)11:00
doener idle_task: dunno, I dislike "tracking" and "current"11:01
idle_task: too error prone. git checkout -b foo origin/master; *work*; git checkout maste; git push *DAMN!*11:02
ngw|away → ngw11:02
idle_task doener: ah, yes, it's true that you can have local refs with slashes in them11:02
doener idle_task: that's not what I meant. The important part was the typo in the second checkout (maste instead of master)11:03
idle_task: so the push ended up pushing "foo" to origin's master11:03
(instead of pushing master, as intended)11:03
idle_task Oh, so origin/master is actually refs/remotes/origin/master11:04
doener idle_task: the default "matching" thing is IMHO quite good. You have a set of branch heads you prepare to be good, and then push them out, and regardless of where you are, "git push" will only push out the "good" set11:04
idle_task: renames are only needed what you have more than one remote, and they have conflicting names. And then I prefer push.default = nothing, with manual default push refspecs11:05
idle_task doener: well, it becomes problematic if you have several read/write remotes, as I do - although, yes, "git push <theremote> <localref>:<remoteref>" solves the problem easily11:05
doener idle_task: as you usually have only a few public branch heads (say master, maint, next), that's not that troublesome11:06
idle_task: example: http://git.pastebin.com/m35ebb1c211:06
→ til joined11:06
doener idle_task: a "minimal risk" setup. You can only push the wrong thing with explicit refspecs, or when you mess up your local branch heads (and you can't really protect against that)11:07
idle_task doener: why the -f to git remote add, line 3?11:09
doener idle_task: that's "fetch", not "force"11:09
... yes, it's pretty damn misleading11:09
idle_task I just saw that in the manpage11:09
Should be -F, I guess :p11:09
doener idle_task: i.e. it saves a "git fetch public"11:09
→ ph^_ joined11:09
→ tsal joined11:11
← wolog left11:12
← jinzhu left11:12
→ ayaz joined11:13
← tsal left11:15
← khmarbaise left11:23
→ Yuuhi joined11:23
→ thiago_home joined11:24
ngw → ngw|away11:26
← loinclo__ left11:26
→ loincloth joined11:26
← ayaz left11:27
← ngw|away left11:28
GustavoRamos → GustavoR|aweh11:28
← hummingkid left11:30
→ kumbayo joined11:31
→ icwiener joined11:32
→ JEEB joined11:32
→ Helios joined11:38
← brizly left11:39
→ Alfonzo joined11:40
→ ngw joined11:41
fujin → xmasfu11:42
← hyperair left11:43
← Helios left11:46
→ Helios-- joined11:47
→ vbgunz joined11:48
ngw → ngw|away11:50
→ WinterWeaver joined11:53
← unomi1 left11:53
ngw|away → ngw11:53
→ unomi1 joined11:58
→ loinclot_ joined11:58
← sunil left12:01
← calin left12:02
→ bentob0x joined12:03
← loincloth left12:04
→ cousine joined12:04
→ khmarbaise joined12:05
← doener left12:07
→ doener joined12:07
← upul left12:09
← khmarbaise left12:12
← amerine left12:13
→ ereslibre joined12:15
ngw → ngw|away12:18
← zackattack left12:22
magcius When trying to use msysgit, I get: "No supported authentication methods available"12:23
→ sumangurung joined12:24
← numberGrey left12:24
→ kmartiin joined12:24
← ia left12:27
→ whaley joined12:27
← sgh_ left12:31
ngw|away → ngw12:31
→ x|ixti|x joined12:34
← sumangurung left12:35
← ixti left12:37
← shruggar left12:37
ngw → ngw|away12:38
ngw|away → ngw12:38
← roop_ left12:40
→ Octalot joined12:41
→ ia joined12:43
→ khmarbaise joined12:44
magcius huh.12:44
$ git remote show origin12:44
fatal: The remote end hung up unexpectedly12:44
→ sde_antrix1 joined12:45
← multi_io left12:46
idle_task magcius: what does git remote show -v says?12:48
Err12:48
git remote -v12:48
← selckin left12:49
← marcoecc left12:49
idle_task Question: a branch deletion can fail with "the branch you want to delete is not an ancestor of your current HEAD" - while I've read the git guide about this, I still don't understand what that means exactly12:50
Where does that message come from exactly? Where is the danger in deleting such a branch?12:50
→ kukks joined12:50
magcius idle_task, origin [email@hidden.address]12:50
thiago_home idle_task: well, it's just a warning to tell you that it's not an ancestor of your current HEAD12:51
i.e., it's not merged12:51
if you want to ignore the warning, use -D instead of -d12:52
idle_task magcius: are you absolutely sure about this URL? If you have gitweb on this repo, is this the actual push URL for this branch?12:52
magcius idle_task, yeah, it's what github says to use.12:52
hmm... cygwin didn't install ssh, do I need it?12:52
idle_task Well, yes you do :p12:52
That's the problem, I guess12:53
thiago_home: ah, so it's to avoid "dangling" heads?12:53
thiago_home idle_task: yes, and to let you know you haven't merged that branch yet12:53
idle_task thiago_home: OK, I _think_ I get it, but I have to make some experiments to be sure about that12:55
→ rchavik joined12:58
← jlilly left12:59
Ilari magcius: Remote end hung up unexpectedly immediately with ssh urls could indicate that executing ssh goes wrong.13:01
Blub\0_ if I have a remote named A, a branch named B which is supposed to be pushed into A as master13:02
Ilari magcius: Also incorrect values of $GIT_SSH can cause that (with cygwin, it should usually be blank).13:02
Blub\0_ like when I do: git push A B:refs/heads/master13:02
Ilari magcius: s/blank/not set/13:02
Blub\0_ how would I configure git to do that automatically that way?13:02
git config remote.A.push <what>?13:02
Ilari Blub\0_: 'remote.A.push B:refs/heads/master'?13:03
Blub\0_ oh right, I trued using 'git push B' then, but doing 'git push A' works13:03
idle_task I though that needed to be refs/heads/B?13:03
Blub\0_ s/trued/tried/13:03
Blub\0_ → Blub\013:03
magcius Ilari, same thing.13:04
Ilari, still can't git remote show origin13:04
Blub\0 ty13:04
magcius even though ssh is installed, my keys are correct (I can ssh to [email@hidden.address]13:04
cbreak did you ssh-add the key?13:05
magcius yeah13:05
hold on13:05
Ilari magcius: 'echo $GIT_SSH'? Blank?13:05
magcius Ilari, how do I unset an environment variable?13:05
thiago_home unset13:05
→ mtkd joined13:06
Ilari magcius: Yeah 'unset $GIT_SSH'.13:06
magcius $GIT_SSH or GIT_SSH?13:06
thiago_home without the $13:06
→ loincloth joined13:07
→ aziz joined13:07
Ilari Yeah, no $ there.13:08
→ Bass10 joined13:09
← loinclot_ left13:10
→ fermion_ joined13:11
→ _Krieger_1 joined13:11
→ loinclot_ joined13:13
→ sgh joined13:14
← jepler left13:15
← TDJACR left13:16
→ jepler joined13:16
← cousine left13:17
fermion_ → capndiesel13:17
→ LiamH joined13:18
→ bigmack83 joined13:20
→ Adlai` joined13:21
→ hummingkid joined13:22
ngw → ngw|away13:22
← Adlai left13:22
Adlai` → Adlai13:22
← drizzd left13:24
→ _buno_ joined13:24
→ drizzd joined13:24
ngw|away → ngw13:25
← _buno_ left13:26
_Krieger_1 i have a question about merging, i've described it here http://pastebin.ca/1725914 - please help me13:26
Ilari _Krieger_1: $faq non-bare may be relevant.13:28
Gitbot _Krieger_1: Pushing to non-bare repositories is discouraged. See http://git.or.cz/gitwiki/GitFaq#non-bare13:28
← loincloth left13:28
→ Sky[x] joined13:28
cbreak yeah, it seems you pushed to a repository with working directory13:29
so the working directory looks changed compared to the new head13:29
(that you pushed)13:29
because it's still the old one13:29
→ TDJACR joined13:32
← bigmack83 left13:32
← tg left13:33
→ tg` joined13:34
← nanothief left13:34
→ bigmack83 joined13:34
→ pantsman joined13:34
→ parasti joined13:35
→ petrux joined13:37
← jjuran left13:38
← petrux left13:38
→ comawhite joined13:38
_Krieger_1 Ilari, thanks, it helped13:38
comawhite I'm having issues with merging two branches. I created a branch called integration and pulled the merge request. I had some conflicts so I fixed them then did git add ., switched back to master and did git merge integration. but got Already up-to-date13:40
_Krieger_1 and what is recommended practice for setting up local repositories between dev group and upstream code storage?13:40
comawhite did I do something wrong?13:40
Ilari comawhite: You committed in order to conclude the merge?13:40
comawhite eh?13:40
Ilari comawhite: If you didn't, there's your mistake.13:41
cbreak git add just adds things to the index13:41
comawhite okay I'm confused now (n00b)13:42
← mtkd left13:42
Ilari comawhite: Presumably the state of repo is wonky, so 'git reset --hard' first (this is why you shouldn't merge with uncommitted changes).13:42
comawhite in integration or master?13:43
cbreak first I'd get to the correct branch13:43
Ilari comawhite: Doesn't matter much.13:43
comawhite: Then check out integration, and fetch + merge again.13:43
comawhite HEAD is now at fd3bb0d Changed tooltip to table (which was my last commit)13:44
erlehmann → self13:44
Ilari comawhite: 'git checkout integration', 'git pull <remote> <branch>'.13:44
comawhite: That should give some conflicts (since it did the last time).13:44
→ hobodave joined13:45
comawhite okay13:45
Ilari comawhite: Then resolve the conflicts, do 'git add' on conflicted files and finally 'git commit'.13:45
comawhite done13:45
Ilari comawhite: (no arguments to git commit).13:46
→ loincloth joined13:47
zorzar hey, is there a way to checkout severel tags or branches into subdirecotries of a working-copy?13:47
self → erlehmann13:48
Ilari zorzar: No sane way to do that.13:48
→ mtkd joined13:48
drizzd doesn't git-new-workdir do something like that?13:49
albeit not as a subdirectory13:49
→ iTron4 joined13:49
← khmarbaise left13:52
comawhite Ilari, hehe, I did the changes and commit but got error: Error building trees13:52
_Krieger_1 and what is recommended practice for setting up local repositories between dev group and upstream code storage? what is wrong in scheme i've set up?13:52
cbreak just make it bare13:52
make everything you want to push to bare13:52
_Krieger_1 how to do that?13:53
Ilari comawhite: Did you add all the conflicted files?13:53
comawhite yes13:53
cbreak with --bare when you clone13:53
Ilari comawhite: 'git status' shouldn't list any anymore.13:53
_Krieger_1 can i do that on already existing repo?13:53
← orafu left13:53
cbreak just clone again13:53
→ orafu joined13:53
_Krieger_1 but my local_repo already stores info about my own changes to sources13:54
comawhite Ilari, hehe forgot the . at the end of git add (heres output of commit) http://pastebin.ca/172593713:54
Ilari _Krieger_1: Mv the .git out of it and nuke the rest.13:54
cbreak _Krieger_1: can't you delete it, clone it, and just push again?13:54
Ilari _Krieger_1: 'mv foo/.git foo.git' or so.13:54
cbreak if you do what Ilari said, you might have to change the config file too13:55
Ilari comawhite: 'Ctrl-X' to exit the editor?13:55
cbreak there is a flag for bareness, but I am not sure how relevant that is13:55
Ilari Well, that's easy to change.13:55
comawhite :P13:56
okay now I do the merge yes?13:56
→ remi joined13:56
Ilari comawhite: Then after exiting it, 'git checkout master', 'git merge integration'. That shouldn't produce conflicts.13:56
comawhite thank you Ilari13:57
:D13:57
19 files changed, 1906 insertions(+), 696 deletions(-)13:57
_Krieger_1 bare = false13:57
gonna to hack that...13:57
thank you gyus for support13:57
← Paraselene_ left13:59
← til left13:59
→ mbernstein joined14:00
→ Paraselene_ joined14:01
← hummingkid left14:01
_Krieger_1 git-pull cannot be used without a working tree :(14:02
and how should i get changes from upstream? git fetch? as i get it, it'll receive recent commits from upstream and set HEAD to last commit. and what about my changes pushed to this local repo? how should i preserve them?14:02
Ilari _Krieger_1: Yeah, fetch.14:02
cbreak _Krieger_1: pull means merge14:02
without working tree, there's nothing to merge :)14:02
→ vbgunz__ joined14:03
cbreak I think you could get problems with resolving conflicts otherwise14:03
→ jelmer_ joined14:03
_Krieger_1 cbreak, i'm noob and i worry how to get consistent local repo with both upstream contributions and my14:03
i am tuned to upstream branch 'kamailio_3.0'; so clones of local_repo do so also14:04
← loinclot_ left14:04
cbreak why don't you push and pull directly to upstream?14:05
_Krieger_1 i push to local repo, and where will my changes go? as i understand, to untitled local branch?14:05
cbreak it should end up in a branch with the same name14:05
_Krieger_1 i simply don't have write access to upstream repo14:05
cbreak unless you change it14:05
← hipe left14:06
← becomingGuru left14:06
_Krieger_1 so when i push to local repo and then in local_repo if i `git fetch` i'll end up with simply that same one branch?14:07
but wait, there must be also `git merge` call after git fetch, as i have read somewhere14:07
what must be argument to git merge in my case?14:08
cbreak I don't think you can merge in a bare repo14:08
I've never tried14:08
_Krieger_1 let's assume then i still have non-bare repo14:09
cbreak then you can't push to it14:09
_Krieger_1 hm... feels you said sth very wrong14:10
→ rlb3 joined14:10
← mtkd left14:10
cbreak feel free to read the man page :)14:10
→ sumangurung joined14:10
_Krieger_1 you say i can't push to non-bare local repo :) but i have done it several times. sorry, i just didn't know that i can't :)14:11
cbreak oh... it's not that it's not possible14:11
it's just that the working directory will get out of sync14:11
and that will cause you problems14:11
_Krieger_1 git reset --hard helped me14:11
cbreak yeah14:11
it'll fix the working directory14:11
but it will also irrevocably nuke any local changes14:12
that aren't commited yet14:12
anyway, why do you even want to pull from a bare?14:12
can't you just pull from your normal repository, the one you work with?14:12
_Krieger_1 but, if you have a couple of minutes more for me, i want to ask for nearest usage problem that i foresee14:12
cbreak I have one working repository with working directory, and a few bares I push to14:13
(+ some more with working directories on other computers/vms)14:13
_Krieger_1 what i call local_repo, i need for storing my changes and to tell co-workers "to build a package you do `git clone /home/local_repo my_workcopy && cd my_workcopy && ./build.sh`"14:14
cbreak yeah, then you never need to pull from that14:15
you just push to it14:15
I have a few such repositories for syncing, I call them "web"14:15
_Krieger_1 no, i have to pull in it, to check out last commits from upstream14:15
cbreak why?14:15
→ nitrate_ joined14:15
cbreak why don't you pull form your normal repository?14:15
_Krieger_1 emm i don't understand you quite well14:16
cbreak you have a repository you work in, right?14:16
the one where you write your code, make your changes, and so on14:16
← jelmer left14:17
_Krieger_1 i do `cd /home/local_repo; git reset --hard; git pull` and thus i get synced with upstream development14:17
cbreak just pull from there14:17
_Krieger_1 then i can go to workcopy indented for package building, `git pull` and build newer package14:17
cbreak why don't you pull form your normal repository?14:17
_Krieger_1 from upstream community repo?14:18
cbreak yeah14:18
from everywhere you want14:18
_Krieger_1 because i have my own commits14:18
cbreak yeah, git pull is fetch and merge14:18
or if you really want to pull from an other repository than you work with14:19
← bigmack83 left14:19
cbreak just make one to pull and an other to push into14:19
the pull repo has a working directory14:19
_Krieger_1 if you can answer, `git pull` == `git fetch && git merge`, right? but merge takes an argument, what arg must be used to emulate git pull?14:19
cbreak and the other you push to doesn't14:19
_Krieger_1: pull also takes arguments14:19
_Krieger_1 but i use pull without them14:20
cbreak default args14:20
they get set up when you clone14:20
→ selckin joined14:20
cbreak you can use others if you want14:20
by default it pulls from the remote "origin" and merges depending on the branch's config14:21
→ bigmack83 joined14:21
_Krieger_1 ok, but merge requires mandatory args, what are they in case of invoking `git pull`?14:21
cbreak depends on the branch14:21
wereHamster git reads the config file to find out which branch to fetch and merge14:21
cbreak anyway14:21
_Krieger_1 so it is sth like `git fetch origin && git merge branch_name_workcopy_is_switched_to`, right?14:22
cbreak is there a reason why you can't pull from your normal repository?14:22
no14:22
_Krieger_1 yes, the reason is that I HAVE MY OWN COMMITS14:22
cbreak so what?14:22
that's not a reason14:22
← nitrate left14:23
jelmer_ → jelmer14:23
← sumangurung left14:23
cbreak merge merges.14:23
wereHamster d'oh :)14:23
← selckin left14:24
cbreak if you want, you can make different local tracking branches for the remote14:24
but if you really really want a separate repository to pull with, just make one. but don't push to it :)14:24
→ selckin joined14:24
_Krieger_1 i wonder how do you assume i'll build a package with my changes. maybe i should clone upstream repo, and...?14:25
apply my changes stored on filesystem in patch files?14:25
ngw → ngw|away14:25
ngw|away → ngw14:25
cbreak why?14:25
← solofight left14:25
cbreak sounds like a big waste of time14:25
_Krieger_1 i just can't understand how exactly you advise me to do14:26
← vbgunz__ left14:26
kukks _Krieger_1: have a look at the --track option e.g. for git branch14:26
cbreak you have a remote thingie, right?14:26
and a local repository you work with14:26
you make some commits there14:26
then you want to get the changes someone else made, so just pull from the remote thingie14:27
if you just want the remote thingie, make a branch from it14:27
_Krieger_1 no, i'd prefer making commits in workcopies cloned from local repo14:27
cbreak and you have only the remote changes without anything you did14:27
wereHamster why?14:27
→ project2501a joined14:27
cbreak well, it's your time :)14:27
_Krieger_1 because it can be not only me making changes to push to local repo14:27
cbreak ... and?14:28
you can pull from both if you want14:28
← vbgunz left14:28
→ khmarbaise joined14:28
← cesario_ left14:28
cbreak but anyway, just make a second repository to pull with. then you have three :)14:29
_Krieger_1 guys, as i understand, git is distributes system, so such tree-like commits flows should be normal, i can't get why you shame me for making my local repo for both pulling and pushing14:29
← JasonWoof left14:29
wereHamster as long as this local repo you'll be pushing/pulling to is bare, I don't see any problem14:30
cbreak I wouldn't expect merging in a bare repository to make sense14:30
→ nitrate__ joined14:30
_Krieger_1 then please teach me how should i merge upstream commits and my local development commits, in bare repo14:31
wereHamster have your local bare repo, clone it, make some commits in the clone, maybe pull from upstream to get the latest changes, and push back into your local bare repo14:31
cbreak as I said three or four times already14:31
wereHamster _Krieger_1: as explained several times, you can't merge in a bare repo14:31
cbreak pull from your normal repository14:31
I am not sure why you don't get that14:32
there should be something like a pastebin for sketches14:32
← capndiesel left14:33
_Krieger_1 i think because i'm not used to git, i've used svn for long time, and Mercurial for a little, and it seemed to me that distributed versioning systems allow what i was talking about14:34
cbreak they do.14:35
but you do it wrong :)14:35
dwmw2_gone → dwmw214:36
_Krieger_1 ok, anyway thanks for your time :)14:36
_rane is there something better than Tab key for inputting long paths for git commands like git checkout, add etc.14:36
would be cool if I could just write the filename14:36
cbreak http://www.twiddla.com/17401314:36
I guess that interactive sketch explain stuff doesn't work14:38
→ amitprakash joined14:38
amitprakash how can i export a git repo to svn?14:38
pantsman wrong way14:38
surely :P14:38
amitprakash pantsman, heh.. i am using git to save my work .. but the stupid office uses svn14:39
pantsman, trying to find a way to push my changes across14:39
bremner amitprakash: can you use git-svn?14:40
amitprakash bremner, i'll look into it, thanks a lot14:40
→ telemachus joined14:40
← nitrate_ left14:40
cbreak I think it is possible that a repository can be a git-repo and an svn-repo at the same time14:40
→ giallu joined14:41
← multani left14:42
← telemachus left14:45
→ altrux joined14:45
wereHamster cbreak: I'd pull directly into the local work repo when needed, and not use the 'pull repo' at all14:46
cbreak yes, me too14:46
but for some reason, he doesn't want to be cause... OMGLOCALCHANGES!14:46
→ paltman joined14:46
cbreak maybe he wants to have both his local modifications and a pure remote version in working directories14:47
→ paltman_ joined14:47
← x|ixti|x left14:48
← bigmack83 left14:49
← iTron4 left14:50
← munichlinux left14:56
→ hummingkid joined14:57
→ x|ixti|x joined14:59
cbreak http://www.dabbleboard.com/draw?b=Guest244239&i=0&c=474e2a593ba76dc6ddfdd890d0a6c9090b527240 seems like a better tool.15:00
Auto shape recognition!15:00
← DrNick left15:00
_rane but it's flash!15:00
cbreak hmm.15:02
it has no text either15:02
← sh1mmer left15:02
← paltman_ left15:02
← Lisimba left15:03
→ jelmer_ joined15:03
← paltman left15:04
← amitprakash left15:05
→ amitprakash joined15:05
ngw → ngw|away15:06
← warthog9 left15:07
← flaguy48 left15:10
bremner it seems to understand a bit of LaTeX15:10
→ warthog9 joined15:11
ngw|away → ngw15:11
← khmarbaise left15:13
← sgh left15:17
← hummingkid left15:17
ngw → ngw|away15:17
→ tychoish joined15:17
← EricInBNE_ left15:18
← kmartiin left15:19
→ paltman joined15:19
→ nessundorma joined15:21
→ voker57 joined15:22
→ beni- joined15:23
→ lucapost joined15:24
→ reprore joined15:26
← jelmer_ left15:27
→ dreiss_ joined15:27
lucapost hi, I have a problem with #git checkout -f, after push on remote repository, in remote repo I have excutable .git/hooks/post-receive with #git checkout -f, can anybody help me?15:28
→ hipe joined15:28
← BlindOracle left15:29
→ Xeross joined15:30
→ schacon joined15:30
Xeross Somehow git modified my file permissions if my file has a . at the start, how can I prevent this ?15:30
for example it makes my .htaccess files hidden15:30
← beni- left15:31
→ beni- joined15:32
← beni- left15:32
Pieter hidden is not a permission in git15:32
bremner or in linux15:32
→ sumangurung joined15:33
← Adlai left15:33
Pieter it is a convention for programs not to display files starting with a ., but that is entirely git-unrelated15:33
Xeross I'm talking windows15:34
somehow my .htaccess file gets assigned hidden15:34
causing my PHP IDE to not save the file15:34
saying permission denied15:34
← sumangurung left15:34
→ sumangurung joined15:34
cbreak must be some windows related problem15:35
Xeross hmm why would MSYSGIT assign it hidden :/15:36
cbreak just make a symlink to it15:36
then you can see it :)15:36
→ krawek joined15:36
Xeross I can see it15:36
cbreak then it's not very well hidden :)15:36
Xeross my ide shouldnt complain about not being able to write hidden files either :/15:36
charon Xeross: probably to fool windows into treating the file as hidden, like most *nix tools would15:36
Xeross It has the hidden permission in windows15:36
I want that disabled15:36
cbreak does windows have a SetFile command like mac os?15:37
→ luckyone joined15:37
luckyone hello all15:37
→ patrikf joined15:37
luckyone I have a quick question about git-daemon15:38
→ brizly joined15:39
wereHamster luckyone: this is irc, just ask15:39
Pieter 486390215:39
luckyone I am running ubuntu and when I try to run that, it can't find the command15:39
← paltman left15:39
thiago_home well, did you install git-daemon?15:40
wereHamster it = what, and can't find which command15:40
Pieter eh15:40
Xeross: http://repo.or.cz/w/git/mingw/4msysgit.git/commit/f95b4f00a6b3bfb64dae4a9d27bce4b8998562d115:40
cbreak shouldn't it be "git daemon"?15:40
luckyone thiago_home: there doesn't seem to be a package for it15:40
Pieter Xeross: Naturally, we make this behavior optional on core.hideDotFiles.15:40
luckyone thiago_home: I would figure it comes in git-core?15:40
thiago_home luckyone: where is the binary?15:40
→ khmarbaise joined15:41
cbreak git daemon works here15:43
and I only installed the basic git.git15:43
luckyone yeah - I am getting this this error - "sudo: git-daemon: command not found"15:43
cbreak binary is in /usr/local/bin/git15:43
pass the absolute path15:43
_rane OT: what's the opposite of trailing in programming context?15:45
wereHamster luckyone: what about 'git daemon' (without the dash)15:45
charon _rane: leading?15:45
wereHamster _rane: leading.. ?15:45
_rane right :P15:45
thanks15:45
cbreak trailing = following I thought15:45
context you said my name again15:46
cbreak the executable is in /usr/local/libexec/git-core/git-daemon, but I am not sure if you're supposed to call it directly15:47
luckyone wereHamster: I tried running "sudo -u git git-daemon --base-path=/home/git/repositories/ --export-all"15:48
cbreak lucapost:15:49
see above :)15:49
luckyone when I run it without the dash, just git daemon, no error comes back, but I also don't see a git process running and I can't clone my repo publicly15:49
Tommy[D]_ → Tommy[D]15:52
luckyone I just used the full path to the binary, and that worked - but I still can't seem to clone my repo15:52
wereHamster luckyone: what happens when you run 'git daemon' ?15:52
Ilari luckyone: Does 'netstat -an' show process listening?15:52
cbreak does it fulfill the conditions?15:53
like the special file it has to contain?15:53
← remi left15:53
wereHamster cbreak: he used --export-all15:53
cbreak hmm. right.15:54
then maybe it's a permission problem with the git user. or a path problem?15:54
or maybe a com problem15:54
or some other problem15:54
luckyone I have lots of problems :S15:55
cbreak type /nick unluckyone15:55
luckyone no kidding!15:55
← rchavik left15:55
→ vbgunz__ joined15:55
Ilari luckyone: Try to become git user and run: 'git daemon --base-path=/home/git/repositories/ --export-all --verbose'. Then leave it running and attempt to clone.15:56
luckyone: The git daemon should print some verbose output.15:57
luckyone so - when I run ps -ef | grep git, I see this running : /usr/lib/git-core/git-daemon --verbose --base-path=/var/cache /var/cache/git15:57
it looks like it is up, but pointed to the wrong base path15:57
cbreak maybe a problem with sudo15:57
Ilari luckyone: That's invoked from init scripts?15:58
→ Simoyd joined15:59
cbreak try adding an -- in your sudo call between the command and the rest16:00
Simoyd what's an easy way to check the state of a repository? How do I tell if I'm in the middle of a merge or rebase?16:00
_rane git status16:00
→ cuco joined16:00
Simoyd why does git status do everything and why do I keep forgetting about it? LOL16:00
luckyone I switched users to my git user, ran the command and got this: and fatal: unable to allocate any listen sockets on host (null) port 941816:01
cbreak now that's strange16:01
Ilari luckyone: Git daemon is already running.16:01
luckyone Ilari: I thougth I killed it16:01
cbreak or you have an execute protected environment16:01
that blocks you from allocating sockets16:01
← amitprakash left16:01
Ilari luckyone: Maybe initscripts respawned that git daemon after you killed it?16:02
cbreak like mac os x' firewall, or the sandbox-exec jails16:02
luckyone Ilari: you bet they did...16:02
blerg16:02
cbreak do you have lsof -i to show which sockets are allocated by which processes?16:03
Ilari luckyone: '/etc/init.d/git-daemon stop' (or whatever the name for the service was)?16:03
luckyone: Or it might use some weird framework...16:03
luckyone: Or uninstall 'git-daemon-run' package?16:04
luckyone I just uninstalled that16:06
→ vbgunz joined16:06
Ilari luckyone: If you still have git-daemon running, try to kill it and see if it comes back.16:07
luckyone that worked16:08
it is up now16:08
← lucapost left16:08
luckyone so, now what is the best way for me to make sure this starts correctly in the event of a reboot16:08
so I don't have manually login, switch to the git user, and start it?16:09
cbreak can't you modify the script that started it before?16:09
seems to have kept it alive ok :)16:09
Ilari luckyone: Or put some simple script into /etc/init.d and link it from /etc/rcX.d (or something like that).16:11
→ jfxberns joined16:11
Ilari luckyone: Or even put it into /etc/inittab...16:11
cbreak if you'd be on OS X, you'd write a launchd script16:11
that way, it git would only be started when someone actually requests the service16:12
and wouldn't run all the time16:12
luckyone cbreak: I had installed git-daemon-run before, but it did not work16:12
→ catalis joined16:13
← catalis left16:13
← WinterWeaver left16:13
→ catalis joined16:13
← schacon left16:14
luckyone cbreak: if I was on OSX, I would have a toliet made of gold too16:15
← shuffle2 left16:15
→ nessundorma_ joined16:15
cbreak :O16:15
I don't!16:15
→ ness1d0rma joined16:15
luckyone well, maybe that is just my list... rolex, toilet made of gold, mac fanboy16:16
:P16:16
I keed, I keed16:16
→ vbgunz_ joined16:17
→ datechman joined16:17
_rane how do I symlink to a git repo?16:18
← vbgunz_ left16:18
← sumangurung left16:18
_rane is it even possible?16:18
or do I have to symlink from git repo to external location and not the other way around16:19
cbreak ln -s?16:19
→ vbgunz_ joined16:19
_rane I did ln -s ~/.profile ~/git/repo/bash_profile and it didn't work as expected16:20
cbreak how?16:20
_rane I ended up having string '/Users/rane/.profile/' in origin's bash_profile16:20
I'll try doing it the other way16:21
cbreak just make a symlink that points into the repository16:21
→ shuffle2 joined16:22
→ madewokherd joined16:22
_rane I did, and it didn't work16:22
cbreak how did it not work?16:22
it's like a symlink to a normal file16:22
_rane didn't I just explain ..............16:22
cbreak because it is a normal file16:22
← krawek left16:23
cbreak ln -s whateveryourgitrepois/somefile.txt whereveryouwantthesymlink/somefile.txt16:23
then you have a symlink where ever you want it and it points wherever your repository is16:23
_rane that's the "other way around" I was talking about16:23
cbreak no16:23
_rane it is16:23
cbreak that's what I said16:24
_rane < _rane> | or do I have to symlink from git repo to external location and not the other way around16:24
cbreak make a symlink that points into the repo16:24
do NOT make one into the repo that points to the external location16:24
unless you want git to track the symlink16:24
and not the file contents16:24
tg` → tg16:24
← LiamH left16:28
→ kmartiin joined16:29
→ idletask joined16:29
← nessundorma left16:30
← vbgunz__ left16:31
← nessundorma_ left16:31
→ tedoc2000 joined16:32
→ LiamH joined16:35
→ vbgunz__ joined16:36
→ Pupeno joined16:37
← kmartiin left16:37
→ fynn joined16:38
fynn guys, 1.6.6 has been released.16:39
← whaley left16:40
→ kmap joined16:42
← idle_task left16:44
→ sumangurung joined16:44
→ Adlai joined16:45
← vbgunz left16:48
← vbgunz_ left16:51
→ cloudhead joined16:51
ness1d0rma → nessundorma16:55
← tedoc2000 left16:56
→ mtkd joined16:56
→ offby1 joined16:57
← przemoc left16:59
← altrux left17:00
← lu_zero left17:01
← idletask left17:02
← catalis left17:03
← cuco left17:05
→ amerine joined17:08
← amerine left17:13
→ babilen_ joined17:13
← babilen_ left17:14
→ babilen_ joined17:14
→ mavera joined17:17
← LiamH left17:18
← mavera left17:18
→ jelmer_ joined17:20
← jelmer_ left17:20
← vbgunz__ left17:22
← fynn left17:23
→ hummingkid joined17:24
→ mithro joined17:24
→ paltman joined17:25
← intripoon left17:25
← _Krieger_1 left17:25
→ Lisimba joined17:26
→ beni- joined17:27
← docl left17:27
← Alfonzo left17:27
← kpreid_ left17:28
→ InTheWings joined17:32
InTheWings my git ends on a "fatal: read error: Connection reset by peer" when fetching refs17:33
a clone works from the same server17:33
thiago_home fix the server17:33
← nessundorma left17:33
thiago_home is that ssh or git?17:34
InTheWings git://17:34
← mbroeker left17:34
thiago_home sounds like a server bug17:35
InTheWings Ends up after exchanging ids http://pastebin.com/m650753d317:35
thiago_home do you have access to it? Can you check if it logged a crash?17:35
InTheWings no access17:35
I'll ask17:35
← erlehmann left17:36
→ Alagar joined17:38
→ nsussman joined17:40
← beni- left17:40
→ beni- joined17:41
← MetaCosm left17:41
← hummingkid left17:43
→ jsallis joined17:44
← jsallis left17:45
→ jsallis joined17:45
← jsallis left17:46
→ tfarina joined17:46
← mithro left17:48
→ hyperair joined17:49
→ __skyl__ joined17:56
← Simoyd left18:01
← ia left18:03
→ przemoc joined18:05
ngw|away → ngw18:05
← icwiener left18:06
← hipe left18:08
→ hipe joined18:09
→ icwiener joined18:09
→ docl joined18:10
→ ia joined18:11
→ sh1mmer joined18:11
← pantsman left18:11
← rwohleb left18:12
→ rwohleb joined18:12
→ lightcap joined18:14
← paltman left18:17
← jelmer left18:18
→ jelmer joined18:19
← icwiener left18:19
ngw → ngw|away18:19
→ icwiener joined18:20
→ przemoc86 joined18:20
← rlb3 left18:21
→ wolog joined18:22
← sh1mmer left18:23
← lightcap left18:23
← przemoc86 left18:25
→ sh1mmer joined18:26
→ rootbit joined18:26
rootbit Hey there18:26
i need some help using git18:26
→ AkumaStreak joined18:26
rootbit can someone help me?18:26
ngw|away → ngw18:26
selckin !ask18:26
rootbit well18:27
whats the workflow i should use with git?18:27
I wanna create a patch for cyanogenmod18:27
but i think i didnt understand correctly how do submit the patch...18:27
i do clone18:28
now i have the repository18:28
and now what?18:28
selckin you replace return with ,18:30
Ilari rootbit: First, Make some logical chnage, commit it (if its larger change make multiple commits)...18:31
rootbit OK18:32
and then, push?18:32
i dont have to branch or anything?18:32
← Xeross left18:32
→ froschi joined18:32
→ cloudhea joined18:32
← babilen left18:32
babilen_ → babilen18:32
→ babilen_ joined18:33
Ilari rootbit: If you have permissions to. If not, you can either: 1) Put the changes in some public repo and send pull request, or 2) export the changes as patches and email them.18:34
→ przemoc86 joined18:34
ngw → ngw|away18:34
← doener left18:36
→ doener joined18:36
rootbit OK18:36
so I'm using github18:37
and doing a pull request18:37
now, how do i get the latest files from the repo?18:37
i wanna update all my files18:37
something like svn checkout18:37
Griffon26 I don't know github, but svn checkout would be like git clone18:38
→ coolcat joined18:38
rootbit OK18:39
← cedricv left18:39
← przemoc86 left18:39
rootbit how about git pull, what does that do?18:39
Ilari rootbit: If you have existing repository...18:40
→ froschi1 joined18:40
Ilari rootbit: pull is fetch + merge.18:40
→ Xeross joined18:40
_rane Ilari: maybe take a break? :) eaten any christmas ham yet?18:40
Ilari _rane: Yes, I have. :-)18:41
_rane great, merry christmas then!18:41
→ hummingkid joined18:42
← przemoc left18:42
→ snearch joined18:43
→ przemoc joined18:45
← cloudhead left18:46
→ spearce joined18:49
→ calin joined18:50
← beni- left18:52
rootbit Ilari, Thanks!18:54
fetch? whats that?18:54
→ segher joined18:54
offby1 ^-.18:55
that's supposed to be me raising one eyebrow18:55
← froschi left18:55
← sde_antrix1 left18:55
offby1 rootbit: "fetch" does more or less what it sounds like: copies stuff from the remote repository into the local one.18:56
→ lu_zero joined18:57
← tango_ left18:58
→ erikeldridge joined18:58
rootbit ok, how about rebase? when do i use that one?18:59
→ LiamH joined19:00
rootbit one more thing19:00
say i did i change and i dont like it19:01
how do i go back?19:01
sh1mmer is there a way to cherry-pick from a remote?19:01
Ilari rootbit: Rebase tears down the current branch and rebuilds it (from patches saved before tearing it down).19:01
sh1mmer: Fetch first.19:01
sh1mmer no tags19:01
I can pull, but then I have to unstage a bunch of crap19:02
rootbit Ilari, ok, so say i made changes19:02
and i dont like them and want to go back to the version in the repository19:02
how do i do that?19:02
← __skyl__ left19:02
← ustunozgur left19:03
Ilari rootbit: To reset your changes away: 'git reset --merge origin/master' (reset to master of upstream).19:04
← amirite left19:04
rootbit yay19:04
what does origin/master mean?19:04
Ilari rootbit: Refers to remote tracking branch: 'origin/master' meaning 'master' of 'origin'.19:05
→ chalkbag joined19:05
rootbit ok19:05
and what is considered master of origin?19:05
→ przemoc86 joined19:05
rootbit what i did clone from?19:05
ngw|away → ngw19:05
← bentob0x left19:06
Ilari rootbit: Origin is what you cloned from (unless you change that). 'master' is master branch.19:06
rootbit ok19:07
every git repository has a master branch?19:07
Ilari rootbit: Most do, since it is the default for first branch, but there is no technical requirement.19:08
rootbit ok19:08
Ilari rootbit: To display names of all known local mirrors: 'git branch -r'.19:08
rootbit I'm talking about remote ones19:08
and I want to merge into cyanogenmod19:09
http://github.com/cyanogen/android_frameworks_base19:09
here actually19:09
so I'm gonna fork it19:09
commit my change to that19:09
and do a pull request19:09
sounds right?19:09
Ilari rootbit: Merging happens between branches. And the branch to merge to is always the one that is checked out.19:09
rootbit sorry19:10
Ilari rootbit: Push your change to that (since you can't directly commit to it).19:10
rootbit want to commit to19:10
yeah, push into the fork19:10
and then, do a pull request19:10
right?19:10
Ilari rootbit: Commit is local operation. But in order to push, you need to first commit the change that gets pushed.19:10
← dreiss_ left19:10
Ilari rootbit: Sounds about right.19:10
← kumbayo left19:11
rootbit OK, great19:11
so ill try this now19:11
see if it works19:11
← przemoc left19:11
Ilari rootbit: If the repo to push to isn't the same you cloned, you should register new remote for it (man git-remote , subcommand 'add').19:12
Gitbot rootbit: the git-remote manpage can be found at http://git.or.cz/man/git-remote19:12
← icwiener left19:12
→ przemoc joined19:14
← przemoc86 left19:14
rootbit can i just change the value at git -config?19:15
Ilari rootbit: Yes.19:16
rootbit: (the URL setting for it).19:16
→ danopia joined19:16
Ilari rootbit: Remote is 1) Shorthand name for another repository and 2) Assigns place to store mirrors of remote branches.19:17
→ rhett joined19:19
← przemoc left19:19
rootbit git push19:20
fatal: No destination configured to push to.19:20
Ilari rootbit: 'git remote' says what?19:20
→ MetaCosm joined19:20
rootbit github19:21
→ Axius joined19:21
Ilari rootbit: 'git push github' then...19:21
rootbit tried that as well19:21
Ilari rootbit: 'git config remote.github.url'?19:22
rootbit http://pastebin.com/d1ce44afb19:22
→ FunkeeMonk joined19:22
rootbit as for your question19:23
[email@hidden.address]19:23
Ilari rootbit: What's the branch on local side called?19:23
rootbit no idea19:23
i didnt branch19:23
how do i check?19:23
Ilari rootbit: 'git branch' will show that.19:23
rootbit * (no branch)19:24
→ przemoc joined19:24
Ilari rootbit: 'git checkout -b <name-for-branch>'.19:24
rootbit what would the name be?19:24
← przemoc left19:24
Ilari rootbit: Pick one.19:25
rootbit just something i come up with?19:25
or the one in the repo19:25
?19:25
i want to submit to http://github.com/omri/android_frameworks_base19:25
→ przemoc joined19:25
Ilari rootbit: It must be new name (or the checkout will complain it exists).19:25
rootbit OK19:25
so omri_donut would work?19:25
→ loinclot_ joined19:25
Ilari rootbit: Maybe something short that describes what it's about?19:26
rootbit: (the change that is).19:26
rootbit ok19:26
bidi19:26
its a fix for bidi support19:26
so bidi could be it i guess19:26
Ilari rootbit: Yeah, fairly good one (git checkout -b bidi)19:26
rootbit so git checkout -b bidi19:26
Ilari rootbit: Now (no branch) should have disappeared from git branch and instead you have '* bidi'.19:27
rootbit ok19:27
← loincloth left19:27
rootbit yeah19:27
so now what?19:27
Ilari rootbit: 'git push github bidi'.19:27
rootbit wouldent that create a new branch there as well?19:27
Ilari rootbit: Yes.19:27
rootbit: (and that explicit what to push should even supress those warnings).19:27
*suppress19:27
rootbit thats not what i want to do19:28
i want to push it into donut19:28
dont i?19:28
Ilari rootbit: 'git checkout donut', 'git merge bidi'?19:28
rootbit oh19:28
i see19:28
now?19:28
or first commit it19:29
Ilari rootbit: Or does 'git branch' even show 'donut'?19:29
rootbit it dosnt19:29
Ilari rootbit: Commit first.19:29
rootbit its the branch on the server19:29
remote branch19:29
commited already19:29
i ment push first....19:29
Ilari rootbit: Maybe actually make proper checkout of donut first: 'git checkout -b donut origin/donut'.19:30
→ __skyl__ joined19:30
Ilari rootbit: Ugh. github/donut probably...19:30
rootbit: I.e. mirror of 'donut' of 'github'.19:30
rootbit Branch donut set up to track remote branch donut from github.19:31
Switched to a new branch 'donut'19:31
now what?19:31
Ilari rootbit: 'git merge bidi'.19:31
rootbit great19:31
worked19:31
and now what?19:31
→ przemoc86 joined19:32
Ilari rootbit: 'git push github' (throws some warnings but should work).19:32
rootbit yay19:32
worked19:32
Ill copy paste this chat for me for future refs19:32
because I'm sure ill forget something here19:33
← Axius left19:34
Ilari rootbit: The way to create local branch from remote tracking branch: 'git checkout -b <localbranchname> <remotetrackingbranch>'.19:34
rootbit ok19:34
so i do this19:34
then commit my change19:34
and push at the end19:34
right?19:34
Ilari rootbit: Any existing local branch can be switched to by 'git checkout <name>' (if you have uncommitted changes, that either fails or carries changes over).19:34
rootbit: Pretty much. You can make multiple changes before pushing (and also inspect the series before pushing).19:35
rootbit great19:35
→ ablemike joined19:35
rootbit and when i want to update my repository back to the remote version19:35
what do i do again?19:35
→ bugfux joined19:35
→ stamina_ joined19:35
→ lockd joined19:36
lockd how can I get a specific checkout hash?19:36
rootbit Thanks alot BTW!19:36
Ilari rootbit: 'git reset --merge <remotetrackingbranch>' (--hard also kills uncommitted changes).19:36
rootbit: Update remote tracking branches: 'git remote update'.19:37
rootbit: (it goes through all remotes).19:37
rootbit cool19:37
:-D19:37
rootbit learned19:37
rootbit is waiting for his patch to be pulled19:37
rootbit android is amazing!19:38
Ilari rootbit: (its actually commit). :-)19:38
→ ustunozgur joined19:38
← przemoc86 left19:38
← przemoc left19:38
Ilari rootbit: And pull is fetch and merge.19:38
→ przemoc joined19:38
rootbit semantic..19:38
but yeah, it should get pulled19:39
Ilari (and patches don't get pulled, they get appiled). :-)19:39
← MetaCosm left19:40
→ sh1m joined19:40
← bugfux left19:40
rootbit OK19:41
well then19:41
bath time for me19:41
thanks for all the help19:41
→ MetaCosm joined19:41
← przemoc left19:43
→ przemoc joined19:44
← ablemike left19:46
← sh1mmer left19:47
sh1m → sh1mmer19:47
VVSiz_ → VVSiz19:49
← magcius left19:49
→ magcius joined19:49
← __skyl__ left19:51
← stamina_ left19:52
← hyperair left19:53
← przemoc left19:55
→ przemoc joined19:55
← Sky[x] left19:58
→ Sky[x] joined19:58
→ Rolenun joined19:59
← reprore left20:00
→ foutrelis joined20:00
← przemoc left20:00
← Sky[x] left20:01
← hummingkid left20:01
foutrelis Hello. About a year ago I20:02
-.-20:02
→ przemoc joined20:02
foutrelis Somehow I hit the Return key too early. .-.20:02
offby1 Blame it on your cat; that's what I do.20:02
Rolenun hey, I was filling in all sorts of blanks....you're lucky I didnt finish the sentence for you :D20:02
foutrelis offby1: Rolenun :P20:03
That's what I get for playing around with filter-branch20:03
Pupeno How do I force a non-fast-foward push?20:08
→ Sky[x] joined20:08
foutrelis Well, a year ago I thought it would be a good idea to track a directory full of images used on a website along with its code. Now the repo has reached around half a GiB in size, most of which is images (the code history is about 30 MiB in size). To get rid of the images' history, I'm trying this command: http://dpaste.com/137477/ - which alters the commits and removes the images from the index. AFAIK, this operation shouldn't touch the wo20:09
→ MetaCosm_ joined20:10
foutrelis Pupeno: hmmm, push has a --force (-f) option but it's a bit dangerous so consult the man page first (git help push).20:11
→ przemoc86 joined20:15
ngw → ngw|away20:16
← MetaCosm left20:16
ngw|away → ngw20:16
← magcius left20:17
→ magcius joined20:18
→ icwiener joined20:18
← przemoc86 left20:20
← unreal left20:20
→ eletuchy joined20:20
← babilen left20:20
← przemoc left20:22
→ babilen joined20:24
→ Chillance joined20:24
→ becomingGuru joined20:24
← babilen_ left20:25
→ przemoc joined20:25
→ Gitzilla joined20:25
← Gitzilla left20:25
→ defectiv joined20:26
→ loincloth joined20:29
offby1 Pupeno: I think something like "git push remote +refs/heads/whatever:refs/heads/whatever" -- note the +20:29
← loinclot_ left20:30
← przemoc left20:30
→ przemoc joined20:31
→ WinterWeaver joined20:31
→ kmartiin joined20:31
Ilari Can't that be shortened as 'git push remote +whatever'?20:32
offby1 probably :)20:33
I can never remember the various defaults20:33
foutrelis looks angrily at `filter-branch --index-filter' for removing files from the working copy :<20:34
→ unreal joined20:37
← przemoc left20:39
→ przemoc joined20:39
← FunkeeMonk left20:42
← WinterWeaver left20:44
← hipe left20:47
cbreak wasn't that the point of filter-branch?20:47
foutrelis cbreak: But I'm using the index filter :(20:48
cbreak: specifically this command: http://dpaste.com/137477/20:48
I'm probably misunderstanding something :)20:49
→ |Inthewings| joined20:50
← defectiv left20:52
cbreak well, filter branch performs the command on every commit20:52
it rewrites history20:52
in your case, "path/to/directory" gets removed from the whole repository20:53
foutrelis Oh, so it's like that directory was never introduced and the working tree I'm left with represents that fact?20:54
← becomingGuru left20:54
cbreak I don't think it matters what your working directory is20:55
← przemoc left20:55
cbreak you can just check out what ever you want20:55
switch branches or what ever20:55
→ sensui joined20:55
→ przemoc joined20:55
cbreak yes, it's as if the directory never existed20:56
well, depending on which branches you filtered of course20:56
foutrelis I think I filtered all of them :)20:56
I still would expect the directory to remain intact though (and just become untracked).20:56
cbreak I don't know what it's supposed to do with the working directory20:58
I wouldn't expect anything20:59
← nsussman left20:59
cbreak well, if you want the directory back, that shouldn't be a problem20:59
foutrelis No, that's not an issue; I'm testing on clones of the repo.20:59
cbreak do something like git checkout HEAD@{1} to get an old version from the reflog and you have what ever you had before youdid what you did21:00
← tehbaut left21:00
cbreak (with a detached head)21:00
← przemoc left21:00
foutrelis Thanks for the input cbreak. I'm mostly asking to see if this is expected bahavior and whether I'm doing something the wrong way.21:01
→ kpreid_ joined21:05
← InTheWings left21:05
← chalkbag left21:06
→ tehbaut joined21:06
→ przemoc joined21:07
← project2501a left21:07
← sensui left21:11
← incredible left21:11
→ stewartl42 joined21:15
stewartl42 question about users... not sure what to search for... I need to set up an internal repository that my team can commit to, but I also want it set up so that at least one other person on the team has to approve the commit. doable?21:16
← kmartiin left21:16
cbreak I think I read something about that recently21:16
I would do it with two repositories21:16
... hmm... no, that's something else21:17
stewartl42 or can I do it with another VCS tool?21:17
cbreak http://github.com/sitaramc/gitolite21:18
with that you can limit access for certain branches21:18
but I am not sure if it can enforce what you want21:18
← icwiener left21:19
drizzd gerrit does review stuff21:21
stewartl42 we may have to just enforce this with internal process... I manage a team of 4 guys (plus me) who do server management and I want to keep configs in version control.21:21
if the tool won't do it for us.21:22
← yath left21:27
← foutrelis left21:27
← sumangurung left21:28
← brizly left21:28
← stewartl42 left21:28
→ psoo joined21:28
→ foutrelis joined21:29
foutrelis Stupid netbook crashed (I hope I didn't miss anything after my last message).21:29
cbreak I didn't write anything more. I've never used filter-branch myself :/21:31
foutrelis No worries. :)21:31
← psoo left21:32
→ psoo joined21:32
← docl left21:35
← __iron left21:36
→ kmartiin joined21:36
→ icwiener joined21:36
→ __iron joined21:36
← psoo left21:38
← tekky left21:38
← erikeldridge left21:39
charon foutrelis: g-f-b checks out the rewritten copy of HEAD, in the process of which it notices that your path/to/directory is no longer part of the current commit and thus should be deleted21:40
foutrelis: i think you can avoid this by detaching HEAD first, but it'll still disappear the second you check out the newly rewritten branch21:41
foutrelis That makes sense.21:42
← bambule left21:43
→ khmarbaise_ joined21:43
foutrelis Hum. :)21:44
← kmartiin left21:44
← calin left21:48
← jfxberns left21:50
← GustavoR|aweh left21:53
→ GustavoRamos joined21:53
→ jjuran joined21:53
→ durbin joined21:55
durbin hi everyone, are there any good tutorials out their to create a git server using the git:// protocol?21:57
← khmarbaise left21:58
khmarbaise_ → khmarbaise21:58
← bauruine left21:58
← patrikf left22:00
→ tedoc2000 joined22:00
→ pantsman joined22:00
← icwiener left22:01
→ r11t joined22:03
wereHamster durbin: <HEAD:Documentation/technical/protocol-common.txt>22:04
Gitbot [git protocol-common.txt]: http://tinyurl.com/yfttxjd [blob]22:04
wereHamster durbin: or take a look at the other files in that directory22:04
→ DrNick joined22:05
spearce wonders why durbin wants to write his own git server, aren't there enough libraries already that implement the protocol?22:05
→ kencur joined22:08
foutrelis I think he wants to set up a server, not write one.22:10
← tedoc2000 left22:11
← khmarbaise left22:12
durbin thanks guys, I think I found what I was looking for with the git-daemon. happy holidays!22:15
foutrelis Happy holidays to you too, durbin ^-^22:15
← kencur left22:17
→ whaley joined22:23
→ Twisted_Mentat joined22:26
→ godsflaw joined22:26
→ zackattack joined22:27
→ tekky joined22:29
← vital left22:31
← rudi_s left22:31
→ rudi_s joined22:32
→ vital joined22:35
← godsflaw left22:38
← thiago_home left22:38
← nitrate__ left22:39
← Sigma left22:42
→ vbgunz__ joined22:43
← snearch left22:45
→ godsflaw joined22:45
→ j416 joined22:46
← mtkd left22:47
← foutrelis left22:47
→ mtkd joined22:47
→ nanothief joined22:49
→ vbgunz joined22:52
← vbgunz__ left22:53
← MetaCosm_ left22:57
→ hummingkid joined23:06
← d0k left23:08
→ tedoc2000 joined23:09
→ Turias joined23:11
← Turias left23:11
← unomi1 left23:14
→ unomi1 joined23:14
← m104 left23:16
← __iron left23:16
→ __iron joined23:16
← imajes left23:16
xmasfu → fujin23:20
← ph^ left23:21
← nanothief left23:22
← x|ixti|x left23:22
→ Dec1129 joined23:23
← Oejet left23:23
← hummingkid left23:23
→ kmartiin joined23:27
← Chillance left23:29
← shuffle2 left23:30
← pantsman left23:32
gitster can somebody update the /title here?23:33
→ pantsman joined23:33
← whaley left23:34
← godsflaw left23:34
ChanServ set mode: +o23:35
gitster Thanks, and happy holidays without hacking ;-)23:36
← maxter left23:39
← giallu left23:39
→ HG` joined23:41
← pantsman left23:42
← HG` left23:43
← froschi1 left23:44
← kmartiin left23:46
← corni left23:48
→ ph^ joined23:50
← zackattack left23:51
← mtkd left23:54
→ sh1m joined23:55
→ michaels_ joined23:55
← sh1mmer left23:59
sh1m → sh1mmer23:59

Logs Search ←Prev date Next date→ Channels Documentation