IRCloggy #git 2012-11-22

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-11-22

crocket After I delete a hook from ~git/.gitolite/hooks/common and execute "gitolite setup", the symlinks to the hook aren't deleted from gitolite repositories.00:00
So there are wrong symlinks after then.00:00
← dedis left00:02
→ devsharpen joined00:02
← schnatta left00:03
← v0n left00:04
→ Plouj- joined00:05
→ gitnewb joined00:05
← aruiz left00:06
→ alunduil joined00:07
→ ninegrid joined00:08
← giallu left00:10
← opus left00:10
→ opus joined00:11
← Dweezahr left00:11
→ Dweezahr joined00:12
← maletor left00:12
← etcetera left00:13
← kerrick left00:14
← shruggar left00:14
→ etcetera joined00:15
← eijk_ left00:17
→ rchavik joined00:17
← rchavik left00:17
→ rchavik joined00:17
← ninegrid left00:19
→ ninegrid joined00:21
→ Raydiation joined00:21
→ JaredMiller joined00:23
→ chaiz joined00:23
← russt left00:23
← LekeFly left00:23
→ LekeFly joined00:24
← Linc left00:26
← juril left00:28
← tbrock left00:28
← Arokh left00:29
→ russt joined00:29
EugeneKay Yes, this is by design. Otherwise gitolite would remove any repo-specific hooks you may have added.00:30
Something like "find repositories/ -type d -name "*.git" -exec rm {}/hooks/foohook \;" will clean up the hook you're trying to get rid of00:30
← ninegrid left00:32
EugeneKay I use a custom hook-calling-hook in combination with a config variable, hooks.FooHook.SubHookName, to choose what hooks to execute on a per-repo basis.00:32
← LekeFly left00:33
→ acl_ joined00:33
← d2dchat left00:33
→ alvarezp joined00:34
← Synthead left00:34
← hyperair left00:35
← hwrd|work left00:35
← myx left00:36
→ p3rror joined00:36
← eletuchy left00:36
← e66 left00:37
alvarezp Hi guys. I have two files that usually have the same content, but it's not mandatory. I usually do a diff between the two and create a file with the diff and commit diff along with the content into git. However, when I see the patch in gitweb I see the diff all green. This is expected, of course, but not so useful. Do you know if git provides some tool to get around this?00:39
FauxFaux Why are you committing the diff, and not the two files seperately..?00:39
alvarezp FauxFaux, because I want to see the diff in gitweb. I'm not tracking code, I'm tracking text-based configs. I collect them once in a while. Two files should (but not must) be the same, and you know the rest.00:41
FauxFaux, so I subscribe to the gitweb RSS feed and monitor for config changes.00:41
FauxFaux, oh, and yes, I'm also committing both files separately.00:42
← RaceCondition left00:42
← Dweezahr left00:43
→ Dweezahr joined00:43
alvarezp Maybe what I'm looking for is some option in gitweb to always include a diff for the two files instead of committing the diff itself to the repo.00:45
FauxFaux gitweb can do diffs..00:45
RandalSchwartz cgit is prettier00:45
and far faster00:45
→ jttam joined00:46
alvarezp gitweb does diffs, but only between commits, not between files in the same commit.00:47
→ tbrock joined00:47
← etcetera left00:47
RandalSchwartz yeah, I don't know anything that does diffs between files in a tree00:48
← jttam left00:50
← fisted left00:50
FauxFaux Mmm, I thought gitweb could do it, but I can't find it.00:52
← wheezl left00:53
alvarezp I'm finding it's not hookable either, am I correct?00:54
RandalSchwartz, is cgit hookable?00:54
RandalSchwartz not sure00:55
there's some customization00:55
keep in mind cgit isn't gitolite00:55
it's a viewer00:55
so I don't know what "hookable" means there00:55
cgit is closer to gitweb00:55
at $previous_client, I deployed a major gitolite + cgit setup00:56
← Thra11_ left00:57
← _Vi left00:59
→ vmiklos joined00:59
FauxFaux The interenet seems to think blobdiff can do it, but I can't work it out from the code.00:59
← tbrock left01:00
FauxFaux goes to bed, as per half an hour ago's plan.01:00
alvarezp FauxFaux, good nite. Thanks for the help.01:00
→ maletor joined01:02
→ pfFred joined01:02
→ dougsland joined01:04
← dougsland left01:04
→ dougsland joined01:04
← opus left01:05
← pfFredd left01:05
→ noyb joined01:05
alvarezp Maybe if I hook "git diff" to show something more that really exists and "git pre-commit" to filter the phantom diff out just in case it wants to go back in... Not sure if that is hookable, though.01:05
→ eletuchy joined01:07
← pfFred left01:08
← Dweezahr left01:10
→ Dweezahr joined01:11
← thiago left01:12
→ _Vi joined01:12
→ LucasTizma joined01:12
← maletor left01:13
← setmeaway left01:14
→ kerrick joined01:15
← eletuchy left01:16
← Bootstrapper left01:16
→ hyperair joined01:20
← Dweezahr left01:21
→ Dweezahr joined01:21
→ xiangfu joined01:22
← beagleDude left01:23
→ nitrix joined01:24
→ mikepack joined01:25
→ AaronMT joined01:26
→ dermoth_ joined01:26
← AaronMT left01:26
← infynyxx left01:27
← ShadeTornado left01:27
→ AaronMT joined01:28
← kenperkins left01:33
→ archdori joined01:33
→ infynyxx joined01:33
→ flippo joined01:34
← nitrix left01:35
→ GeertB joined01:37
← daniel_- left01:38
→ etcetera joined01:41
→ hwrd|work joined01:42
→ eletuchy joined01:43
→ revyd joined01:44
→ jhutson456_ joined01:45
→ volante joined01:48
← OOP_Man left01:49
← alexim left01:50
volante anyone noticed on mac ports that 'git log --grep' doesnt seem to support extended regex or PCRE? any way i can fix that?01:51
→ OOP_Man joined01:52
← noyb left01:53
← eletuchy left01:53
SethRobertson Well, I thought it supported -P. I guess not01:53
→ jdunck joined01:54
volante oh, when i put -E my pattern works01:55
thats good t hen01:55
→ cyphase joined01:57
← mikepack left01:57
→ v0n joined01:59
← _Vi left01:59
volante is there a way for git log --grep to only apply its grep to the first line of the commit msg?02:00
→ kenperkins joined02:03
← nsanden left02:03
→ setmeaway joined02:03
→ SaCu joined02:03
→ fisted joined02:05
→ luc_ joined02:05
→ jdyin joined02:10
← tvw left02:10
← v0n left02:15
→ _Vi joined02:16
← etcetera left02:17
← Goles left02:18
← maqr left02:19
← Davey left02:19
→ eletuchy joined02:19
← davidbanham left02:19
← Raydiation left02:24
→ timj joined02:26
→ intripoon joined02:26
→ tmcmahon joined02:27
← dreiss left02:28
→ osmosis joined02:29
→ ninegrid joined02:29
→ eletuchy_ joined02:30
← devsharpen left02:30
← eletuchy left02:30
← hwrd|work left02:31
← dorkmafia left02:31
→ docai joined02:31
← kukks left02:33
← TeamColtra left02:35
→ thiago joined02:36
→ Bass10 joined02:40
→ archdori_ joined02:43
→ relipse joined02:43
← p3rror left02:46
← archdori left02:46
→ amiller joined02:49
→ Tommy[D] joined02:50
→ davidbanham joined02:50
→ bubbles10101 joined02:51
→ Vampire0 joined02:51
→ thinkdevcode joined02:53
→ Bombe joined02:56
→ Goles joined02:56
→ maqr joined02:57
← davidbanham left02:58
← senj left02:59
← _Vi left03:00
→ jackh joined03:00
← amiller left03:03
← sideone left03:05
→ Guest79895 joined03:07
→ jroc joined03:09
→ jcromartie joined03:10
← kerrick left03:11
← cybersphinx left03:11
→ davidbanham joined03:11
← jackh left03:13
← maqr left03:15
→ TeamColtra joined03:15
← ehsan left03:16
→ _Vi joined03:16
→ raek joined03:17
→ xpen joined03:17
→ skyf joined03:22
→ hwrd|work joined03:25
← skyf left03:27
← AaronMT left03:27
→ frogonwheels joined03:28
← frogonwheels left03:30
→ frogonwheels joined03:30
→ Chib joined03:31
← hwrd|work left03:32
→ riker2000 joined03:33
← madewokherd left03:35
← spiderweb left03:36
← Dreamer3 left03:36
→ madewokherd joined03:37
← SaCu left03:38
← Roots left03:39
→ SaCu joined03:39
← OOP_Man left03:40
→ nsanden joined03:40
← guampa left03:41
→ pheaver joined03:41
← nsanden left03:42
→ dhruvasagar joined03:43
→ archdori joined03:43
→ minusthetiger_ joined03:46
← archdori_ left03:47
→ relipse2 joined03:47
→ chuckharmston joined03:48
← relipse left03:49
→ wheezl joined03:49
← aristidesfl left03:50
← virako left03:55
→ virako joined03:56
← alvarezp left03:57
← Guest79895 left03:58
→ noyb joined03:59
→ Bootstrapper joined04:00
→ PCChris joined04:05
← Bootstrapper left04:06
← SBoudrias left04:08
← chuckharmston left04:08
→ hwrd|work joined04:10
← hwrd|work left04:10
→ ehsan joined04:11
→ chuckharmston joined04:11
→ Tegi joined04:11
← BadProphet left04:13
→ a-l-e joined04:13
← chuckharmston left04:14
spyro So I heard the canadians got their emergency syrup back04:19
← JoeAngel_ left04:19
← wheezl left04:21
← fisted left04:21
← Cassiel left04:22
→ Cassiel joined04:23
← virako left04:27
→ virako joined04:28
← jcromartie left04:29
← tmcmahon left04:30
→ blathijs joined04:31
→ gittish joined04:32
← icio left04:34
← TeamColtra left04:34
← Tommy[D] left04:34
← LucasTizma left04:34
→ woky joined04:35
→ delirium joined04:35
→ Tommy[D] joined04:35
→ skorgon joined04:35
→ EugeneKay joined04:36
→ gary_golden joined04:37
→ iamjarvo joined04:38
→ beautifulmind joined04:40
← chaiz left04:42
→ maqr joined04:42
→ jcromartie joined04:43
← jroc left04:43
→ BadProphet joined04:44
→ acrocity_ joined04:45
← Destos left04:45
← jdunck left04:45
→ Parhs8 joined04:46
← wbednarski left04:46
← infynyxx left04:46
→ dorkmafia joined04:47
acrocity_ → acrocity04:47
← jcromartie left04:50
→ Dreamer3 joined04:52
← Parhs8 left04:52
← BadProphet left04:54
← osmosis left04:55
← relipse2 left04:55
→ relipse joined04:55
→ Sigma joined04:56
relipse is there a way to do git commit and ftp all the files that were staged all in one script?04:56
→ duncanm joined04:57
DrPoole yes but ... i'd reconsider that choice.04:57
!deploy04:57
gitinfo Git is not a deployment tool. You can build one around it for simple environments. http://sitaramc.github.com/the-list-and-irc/deploy.html04:57
DrPoole or something04:57
DrPoole & fist pump04:57
DrPoole why ftp it? why not push it from git to a remote?04:57
→ milleja46 joined04:58
→ pretty_function joined04:58
→ doki_pen joined04:59
→ macrover joined05:00
← _Vi left05:00
← milleja46 left05:02
→ milleja46 joined05:02
← gitnewb left05:03
← minusthetiger_ left05:03
→ miyaken joined05:03
→ Caelum joined05:05
→ rurufufuss joined05:06
→ private joined05:08
private → Guest2336105:09
→ manchicken joined05:09
→ Febul joined05:09
manchicken Hey all, I have a question about version control in git: so I have my own site version controlled in git, but I want to be able to detach cakephp from my application so that when updates come I can update CakePHP independently from my code, and then fix any issues which arise. Do I need to write scripts to check them out into separate working directories and then symlink them over, or should I fork cakephp and just put my changes into my fork, o05:10
something else?05:10
relipse drpoole my webserver i'm not sure i can get git on there05:10
→ Linc joined05:12
← dermoth_ left05:12
← Sigma left05:12
→ dermoth_ joined05:13
← davidbanham left05:14
→ davidbanham joined05:14
← duncanm left05:17
Febul What's the difference between "git init" and "git init --bare" ?05:17
→ nitrix joined05:17
→ _Vi joined05:17
← milleja46 left05:18
→ duncanm joined05:18
→ smw_ joined05:18
smw_ → smw05:19
→ milleja46 joined05:19
EugeneKay Febul - !bare05:19
gitinfo Febul: an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/05:19
→ longbeach joined05:19
Febul Thanks05:19
→ BadProphet joined05:20
← macrover left05:21
Febul Is it possible to have someone check out to a git repository on my computer and make changes to the repository?05:23
check out remotely*05:24
EugeneKay No. They must clone it.05:25
You can have them send you a patch against a tarball of the repo, but that is not within git's knowledge.05:25
→ hafeez3000 joined05:26
← miyaken left05:27
BryanRuiz how do you list the branches available?05:28
EugeneKay man git-branch05:28
gitinfo the git-branch manpage is available at http://jk.gs/git-branch.html05:28
BryanRuiz tx EugeneKay05:28
EugeneKay You're probably looking for the -a flag, which will include remote branches which you have not yet created locally(git checkout foo)05:28
→ tdowg12 joined05:28
Febul A friend and I want to work on a project. We are in different locations, and want a VCS that'll allow us to make individual changes and get each others updates. What do you suggest I use?05:29
BryanRuiz lol05:29
git05:29
EugeneKay git is excellent for that, especially in concert with a central repository somewhere.05:29
Febul You said that my friend would have to clone the repo though.05:30
And then submit a patch.05:30
EugeneKay No, I said he could clone it OR submit a patch05:30
Febul Instead of simply committing his changes to the repo.05:30
frogonwheels Febul: It is possible to work with you pulling data from their repository, you're much better off using a central repo. !gitolite works well.05:30
gitinfo Febul: Want to host as many git repos (and users!) as you like, on your own server, with fine-grained access control? You want gitolite: https://github.com/sitaramc/gitolite - Documentation: http://sitaramc.github.com/gitolite/master-toc.html05:30
EugeneKay Those are two separate workflows05:30
He makes a clone of the repo, then pushes/pulls to a repo somewhere which you can also push/pull from/to. Or you can pull from each other.05:30
frogonwheels Febul: That's how git works. You clone the repo (it's very efficient) and work on it - then push/pull otherwise sync changes05:30
Febul Ah, alright.05:31
frogonwheels Febul: For eg - the crud that svn puts in your working directory under a multitude of .svn directories is often more than the whole clone git repo (under .git)05:31
Febul Is this possible without a central repository?05:32
← BadProphet left05:33
frogonwheels Febul: see my comment05:33
EugeneKay Yes, but it's a bit more challenging because you must both be online at once to fetch from each other05:33
You /can/ use git-bundle to send stuff between repos, but it's.... difficult.05:33
(via email)05:33
If cost is a problem(and you don't have a cheap VPS to use to host gitolite), then bitbucket's free tier may be an option for private projects.05:34
frogonwheels Febul: there are many options. As i said, you _can_ pull from their repo05:34
Febul Well I have a VPS. I'll just attempt to create a central repository on it.05:34
EugeneKay Well there you go. Use gitolite. Really. It's easier.05:34
frogonwheels Febul: should be easy enough .. just use gitolite -05:35
Febul I'll look into gitolite, but I'm curious as to how I go about doing it without it.05:35
EugeneKay git init --shared=group and filesystem permissions05:36
not terribly elegant or scalable05:36
Febul What are the disadvantages to that?05:36
EugeneKay They're covered in the gitolite Why? doc05:37
Febul I'll check it out. Thank you.05:37
→ infynyxx joined05:37
← bubbles10101 left05:38
← tdowg12 left05:39
→ andres_f joined05:41
← dhruvasagar left05:44
← hafeez3000 left05:45
→ Gentlecat joined05:48
← m0viefreak left05:50
→ qmanjr5 joined05:50
→ hafeez3000 joined05:52
← nitrix left05:52
→ segv_ joined05:52
→ nafg joined05:53
← Goles left05:54
→ blurrr joined05:54
→ ahri_ joined05:54
ahri_ → Guest1048505:55
← andres_f left05:55
← blurrr left05:56
→ blurrr joined05:57
qmanjr5 Is it possible to change the symbols Git uses for the Bash information?05:57
EugeneKay Sure. Copy the bash script and edit it as you like05:57
← o] left05:58
qmanjr5 Which script is it?05:58
→ relipse2 joined05:58
← noyb left05:58
→ o] joined05:59
→ BadProphet joined05:59
← _Vi left06:01
→ andres_f joined06:01
→ laurav joined06:01
→ Arokh joined06:02
← relipse left06:02
← hafeez3000 left06:02
Febul I'm on an Ubuntu VPS. How do I go about properly creating the user for gito-lite?06:02
→ Goles joined06:03
→ hafeez3000 joined06:05
← laurav left06:06
→ JohnBat26 joined06:07
qmanjr5 EugeneKay: The script I have is in my .bashrc file, and it calls __git_ps1, a function which isn't set in the .bashrc file.06:07
EugeneKay I honestly have no idea where it's kept. /usr/share/git perhaps06:08
I wrote my ps1 script myself ;-)06:08
qmanjr5 I see.06:10
← blurrr left06:11
← BadProphet left06:11
→ blurrr joined06:12
← Goles left06:14
← BryanRuiz left06:15
→ chuckharmston joined06:15
→ shreya joined06:15
→ _Vi joined06:18
→ BiggFREE joined06:19
→ diegoviola joined06:21
← Arokh left06:23
← beautifulmind left06:23
→ irqq joined06:23
← thelodger left06:24
← relipse2 left06:26
→ Tabmow joined06:28
→ chaiz joined06:29
→ beautifulmind joined06:32
→ unreal joined06:33
→ etcetera joined06:34
← hafeez3000 left06:35
→ tewecske joined06:35
→ hafeez3000 joined06:36
← BiggFREE left06:38
→ BadProphet joined06:39
→ shruggar joined06:40
← fuzzybunny69y left06:40
← beautifulmind left06:43
→ fuzzybunny69y joined06:45
→ soee joined06:46
← gittish left06:47
← hafeez3000 left06:48
→ fisted joined06:49
→ ThomasLocke joined06:50
→ hafeez3000 joined06:51
← BadProphet left06:52
cmn qmanjr5: if you installed via your package manager, it's in the same place as the completion scripts, /etc/bash_completion.d06:52
→ caseymcg joined06:56
→ eph3meral joined06:57
← xiangfu left06:59
→ pantsman joined07:00
← pantsman left07:00
→ pantsman joined07:00
← acl_ left07:04
← shruggar left07:05
→ mikepack joined07:05
→ RaceCondition joined07:05
← volante left07:06
→ laurav joined07:07
← etcetera left07:09
← chuckharmston left07:10
← sgambino left07:10
→ tjadc joined07:13
→ marthinal joined07:14
← Bass10 left07:17
← Cassiel left07:17
← Gx4ff left07:18
← fuzzybunny69y left07:18
→ BadProphet joined07:18
← GeertB left07:18
→ fuzzybunny69y joined07:19
→ Cassiel joined07:19
← fuzzybunny69y left07:20
→ Bass10 joined07:21
← laurav left07:21
→ cbreak-work joined07:22
→ papegaaij joined07:22
→ kennethreitz joined07:22
→ Goles joined07:24
→ glennpratt joined07:27
→ martinjlowm-lapt joined07:28
← Goles left07:29
→ dreiss joined07:29
← madewokherd left07:30
→ mmc joined07:31
→ dhruvasagar joined07:31
→ luc__ joined07:32
→ flijten joined07:32
→ fsvehla joined07:32
← BadProphet left07:32
← luc_ left07:33
→ arvind_khadri joined07:34
→ OOPMan joined07:34
← Bass10 left07:35
→ laurav joined07:35
← davidbanham left07:36
← Febul left07:38
← glennpratt left07:39
→ hotovson joined07:39
→ AdmiralSausage joined07:40
← AdmiralSausage left07:40
→ kerrick joined07:42
← irqq left07:42
← imrobert left07:42
→ xxc_michael joined07:42
← mmc left07:44
→ harrylynes joined07:45
→ mishok13 joined07:45
→ dpino joined07:46
→ rath-work joined07:48
→ hwrd|work joined07:49
← bauruine left07:50
← harrylynes left07:50
← |Freeman| left07:50
→ G0re2 joined07:50
→ tPl0ch joined07:53
→ rob_w joined07:58
→ BadProphet joined07:58
→ whitman joined07:59
← blurrr left08:00
← dreiss left08:01
← chaiz left08:02
← _Vi left08:02
← PaulCape_ left08:04
→ adamben joined08:05
← adamben left08:05
→ adamben joined08:05
← srji left08:05
→ suy joined08:05
→ davidbanham joined08:07
← archdori left08:08
→ booginga joined08:08
→ timj1 joined08:10
← o] left08:10
→ o] joined08:11
← BadProphet left08:12
→ ISF joined08:12
→ aisbaa joined08:12
← timj left08:13
→ Parhs joined08:15
← Parhs left08:15
→ Parhs joined08:15
→ BiggFREE joined08:16
→ saju_m joined08:17
← BiggFREE left08:17
→ blurrr joined08:17
→ zeppo joined08:18
→ _Vi joined08:19
→ __class__ joined08:19
→ jargon joined08:20
← G0re2 left08:22
→ dc5ala joined08:24
← davidbanham left08:24
→ davidbanham joined08:24
→ letharion joined08:24
→ legnaleurc_ joined08:26
→ JoeAngel_ joined08:26
← legnaleurc left08:26
← TomWij left08:27
→ TomWij_ joined08:27
→ BiggFREE joined08:27
→ svetlyak40wt joined08:28
← kerrick left08:29
→ tsdh joined08:29
→ eijk joined08:29
← Goplat left08:30
→ afuentes joined08:31
→ jceb joined08:32
← Sky[x] left08:33
→ BadProphet joined08:35
← nafg left08:38
← pheaver left08:38
→ Sigma joined08:39
← jjang left08:39
→ jlopez joined08:39
→ h0bbit joined08:41
← mishok13 left08:41
← dorkmafia left08:43
← pantsman left08:43
← thiago left08:43
→ berserkr joined08:45
← hwrd|work left08:45
← hafeez3000 left08:48
→ kerrick joined08:49
→ nafg_ joined08:49
← delirium left08:51
→ resmo joined08:51
→ robotmay joined08:51
← robotmay left08:52
← Sigma left08:53
← nafg_ left08:54
← mikepack left08:56
whitman → whitman_08:58
→ TheHaven joined08:58
→ shruggar joined08:58
whitman_ → whitman09:01
← _Vi left09:02
→ LimeBlast joined09:03
← maqr left09:04
→ hafeez3000 joined09:04
→ zenx joined09:05
whitman → whitman_09:06
→ mishok13 joined09:06
← Vile left09:07
whitman_ → whitman09:08
→ chussenot joined09:08
→ Eclesia joined09:10
Eclesia hi09:10
→ Element9 joined09:10
whitman → whitman_09:11
→ marc_kdab joined09:11
→ mlb- joined09:11
Eclesia question : how can I pull all changes from the server, all commits AND new branchs ?09:11
EugeneKay you fetch refs, which are tags and branches. These point to commits09:12
→ psoo joined09:12
whitman_ → whitman09:12
Eclesia EugeneKay: one fetch for each branch ?09:13
EugeneKay If you haven't mucked with your fetchspec since creating the remote, 'git fetch $REMOTE' will fetch branches for $REMOTE09:13
No, one fetch will cover all branches on that remote.09:13
If you want the tags you will also need to use 'git fetch --tags $REMOTE'09:13
→ alkino joined09:14
→ mmc joined09:14
eph3meral is there any reasonably simple way (one command-ish?) to reset a file on a branch to the state it was in just prior to branching? that is, undo all the changes to a file done on a current branch?09:14
instead of fast-forward, I want a rewind09:14
a rewind to where my branch split off from master09:15
sajbar eph3meral: you want the version from master?09:15
eph3meral I mean I figure I suppose I can lookup the exact commit numbers and do a manual e.g. git checkout somefile.foo COMMITHASHHERE09:15
EugeneKay Yes. 'git checkout $COMMIT -- foo/bar'09:15
eph3meral sajbar: yeah I've been contemplating just doing it by hand, like copy paste style09:16
Eclesia eph3meral: hg update thefile -r wantedrevision ... (for mercurial)09:16
EugeneKay You /could/ use merge-base to find the point where it was branched off, but it's usually easier to just peek at the !lol really quck.09:16
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all09:16
eph3meral but I'd rather rewind/revert any commits I've made rather than making yet another commit over the top of my changes09:16
EugeneKay Use the --hard flavor of !reset09:16
gitinfo A good resource explaining git-reset is http://git-scm.com/2011/07/11/reset.html09:16
EugeneKay Gah, damn bot. !resets09:17
gitinfo tl;dr of man git-reset: --soft moves HEAD, --mixed moves HEAD+index, --hard moves HEAD+index+work-tree, -- foo.txt will !unstage09:17
→ skul joined09:17
→ orafu joined09:17
eph3meral EugeneKay: well I don't want to lose other changes in this branch, just one or two files09:17
→ Cromulent joined09:17
EugeneKay Then you'll need to make a new commit from where you are09:17
← oojacoboo left09:18
eph3meral ah ok09:18
← eletuchy_ left09:18
eph3meral I might just merge my changes in to a new branch by hand, one that doesn't have those two files09:18
or rather, that has not changed those two files09:18
→ eletuchy joined09:19
→ _Vi joined09:19
EugeneKay If it's an unmerged topic branch you can reset --soft back, create a new branch, and then checkout everything except the file(s) you want to keep.09:19
Actually, I guess u don't need to create the new branch. I need liquor.09:19
s/u/you09:19
I also can't typpe.09:19
→ eletuchy_ joined09:20
→ mentero joined09:20
eph3meral heh09:21
I will probably need liquor in about 12 hours :)09:21
EugeneKay Relevant: http://eugenekay.com/img/codingdrunk.jpg09:22
Wait, that one's a png09:22
http://eugenekay.com/img/codingdrunk.png09:22
← saju_m left09:22
EugeneKay I am /really/ out of it tonight.09:22
← rob_w left09:23
Eclesia EugeneKay: git fetch --tags , will this pull all stuffs, nothing missing ?09:23
← eletuchy left09:23
→ bauruine joined09:23
EugeneKay Eclesia - No, it pulls just tags. Consult man git-fetch for exact behaviour.09:23
gitinfo Eclesia: the git-fetch manpage is available at http://jk.gs/git-fetch.html09:23
→ dvide joined09:23
Eclesia isn't there a command to pull everything ?09:24
EugeneKay You can modify your fetchspec to grab branches and tags at once, but it is not the default.09:24
→ Cork- joined09:27
Cork- → Cork09:27
EugeneKay Note that the default behaviour of fetch DOES grab tags which are "on" the branches you have fetched, which are typically the tags you care about. One-off tags(not in any branches history) are the ones that need --tags to grab.09:27
Eclesia strange default behavior if you ask me09:28
EugeneKay Not really - it grabs what you're interested in.09:29
→ Xethron joined09:29
→ dcorbin_work joined09:29
← dcorbin_work left09:29
→ dcorbin_work joined09:29
Eclesia ok so, git fetch --all will pull any update on the current branchs I already have. and --tags possible new branchs unrelated. so git fetch --all --tags should do what I want right ?09:30
→ _Qman joined09:31
EugeneKay No; that is not what --all does.09:31
→ Sigma joined09:31
EugeneKay Go back and read the man page if you want exact behaviour of each switch09:31
Eclesia "Fetch all remotes."09:32
that's all it fucking say in the doc09:32
Silex "git bisect run" is a blessing \o/09:32
EugeneKay "fetch all remotes" sounds nothing like "fetch everything from the one remote I give you" ;-)09:32
And !fsck09:33
gitinfo [!profanity] Hey! This is a family-safe channel, so keep it frakking clean you fierfekker!09:33
→ maqr joined09:33
→ mikecmpbll joined09:33
EugeneKay See also the syntax at the header - note how --all is on its own line, with no [<repository>]09:33
→ jlg13 joined09:33
EugeneKay This indicates that it is incompatible with specifying a remote09:33
← mikecmpbll left09:34
← iamjarvo left09:35
Eclesia I think I'm just going to use a hg-git command mapping tool, to have normal commands.09:35
→ mikecmpbll joined09:35
Eclesia already wasted to much time on migrating repos to git.09:35
EugeneKay "normal" depends solely upon perspective. And you can always !refund09:36
gitinfo If you are not satisfied with git, or the support provided by the volunteers in #git, you are entitled to a full refund of the purchase price, and are invited to use another VCS. Elsewhere.09:36
Eclesia and i'm going to, will stay on mercurial for a couple more years.09:37
← hafeez3000 left09:37
EugeneKay Enjoy!09:37
Eclesia thanks for the help and your patience, and sorry for disturbing. ++09:38
← Eclesia left09:38
jast so much happiness <309:38
Bombe :)09:38
→ blami_ joined09:38
EugeneKay I LOVE YOU ALL WITH A GREAT HUGE LOVE09:38
→ xpen_ joined09:38
FauxFaux I have a love tax; you have to send me nekkids.09:39
→ bux joined09:39
EugeneKay You may wish to rethink that09:39
FauxFaux I don't plan to look at them or anything, just blackmail material in case you stop loving me.09:40
→ JrCs_ joined09:40
→ hwrd|work joined09:41
→ robbyoconnor joined09:42
→ hafeez3000 joined09:42
← xpen left09:42
→ Vile joined09:43
← maqr left09:46
← hwrd|work left09:46
→ theForce joined09:46
theForce hi09:47
→ hwrd|work joined09:47
→ giallu joined09:47
theForce question about git-svn: when i chmod +x a file and commit that, will this +x also be pushed to the svn repository when i "git svn dcommit"?09:47
→ aphro joined09:53
→ Hounddog joined09:53
Silex when I "git commit --fixup" a bunch of commit, I know I can then "EDITOR=cat git rebase -i --autosquash origin/master". Can I simply "git rebase --autosquash origin/master" instead?09:53
← aphro left09:53
← BiggFREE left09:55
jast Silex: no09:55
← infynyxx left09:55
jast but you can do this: git config --global autosquash '!EDITOR=cat git rebase -i --autosquash'09:56
and then this: git autosquash origin/master09:56
Silex jast: alright, thanks09:57
jast whoops09:57
Silex oops?09:57
jast actually: git config --global alias.autosquash ...09:57
Silex yeah, I'm editing my .gitconfig anyway so09:57
:)09:57
git aliases are handy10:00
→ txomon|home joined10:00
→ musonic joined10:01
→ jgomez joined10:02
→ robustus joined10:04
← jlg13 left10:04
← hyperair left10:05
← laurav left10:05
→ the_cybersphinx joined10:06
→ rob_w joined10:06
← zeppo left10:06
→ zeppo joined10:07
→ Davey joined10:08
→ hoschi joined10:09
← rob_w left10:09
mmc wereHamster: do you remember me saying that "git symbolic-ref" is not good enough, that I still prefer cat-ing the file? https://gist.github.com/b37f6e3ddc5652dd7e71 symbolic-ref somehow returns the last ref.10:12
→ rob_w joined10:13
← musonic left10:14
→ laurav joined10:15
andres_f → andres10:15
→ wheezl joined10:16
← Cromulent left10:16
→ thyseus joined10:16
← jdyin left10:17
→ Xizor joined10:18
→ marhaban joined10:20
← manchicken left10:20
← Sigma left10:22
→ Anders_J joined10:22
→ maqr joined10:23
→ volta joined10:26
← TheHaven left10:28
→ achadwick joined10:30
← caseymcg left10:30
← maqr left10:32
→ houman joined10:32
→ daniel_- joined10:33
← daniel_- left10:33
→ daniel_- joined10:33
houman Hi, I have commited and pushed some changes to my repository. Can I now go back to three revisions before just to test something without commiting anything?10:35
FauxFaux git checkout -B temp HEAD~310:36
→ Sigma joined10:36
→ devsharpen joined10:36
← luc__ left10:36
→ newbie999 joined10:37
← RaceCondition left10:39
→ myx joined10:40
← hoschi left10:40
→ RaceCondition joined10:40
← svetlyak40wt left10:41
← xpen_ left10:41
→ svetlyak40wt joined10:42
→ AdrienBrault joined10:43
jast git checkout HEAD~3 (git checkout yourbranch to go back afterwards)10:43
houman Thanks guys. :)10:44
← docai left10:44
wereHamster mmc: cat-ing the file won't work if the ref is packed. But.. well.. that is your problem then.10:45
→ davidban_ joined10:47
← shreya left10:48
→ p3rror joined10:49
← davidbanham left10:50
← marhaban left10:50
mmc wereHamster: sure. But maybe you can find out a way to get the real "value" of the symbolic ref?:)10:51
→ Cristen joined10:51
→ caddoo joined10:51
mmc wereHamster: but yes, I can have a look at the git sources.10:51
← AdrienBrault left10:52
← martinjlowm-lapt left10:53
→ LekeFly joined10:53
← LekeFly left10:54
Cristen Hi everyone, I setup a git like that : local copy (VM with linux mint) and remote --bare repo. I then cloned the --bare repo on my remote to access the files. But when I try to pull on the cloned repository it says : your local changes would be overwritten by merge. I don't get it can anyone explain what's wrong ?10:54
← _Qman left10:55
Cristen Do I need to git clone each time I push to the bare repo ?10:55
← Sigma left10:57
→ maqr joined10:57
→ LekeFly joined10:58
wereHamster mmc: you can ask on the mailing list if they'd add a option to git-symbolic-ref to return the first ref instead of the last.11:00
Cristen: you have local changes to files. Why? And what do you want to do with them?11:01
← eletuchy_ left11:01
wereHamster also, why do you need to access the file?11:02
Cristen well the remote is my production server, with a --bare repo I don't see any files(only git indexes) so do my server. The changes were only made on the VM machine (on my computer) I tried to push and update my remote server with the changes11:03
→ pfFredd joined11:03
← LekeFly left11:04
← rob_w left11:04
Cristen so how do I update my website then ? Do I git clone the bare repository everytime I push the changes made on the VM ? or is there any other way ?11:04
→ rob_w joined11:04
← rob_w left11:05
→ rob_w joined11:05
→ Milossh joined11:06
→ marhaban joined11:06
← ISF left11:06
→ chaiz joined11:06
→ milli joined11:07
→ jlg13 joined11:08
→ dharrigan joined11:08
cbreak-work Cristen: cloning is for getting a new copy of a repository11:09
you only need to do it once11:10
← Cassiel left11:10
Cristen so cbreak-work how do I update my files on the remote server once I cloned the bare repo ?11:10
→ Cassiel joined11:11
← daniel_- left11:13
houman sorry guys, I have merged my master with a previous branch to test something. Now I would like to undo this merge. (I haven't pushed anything yet) How do i do this please?11:13
→ eletuchy joined11:15
cbreak-work Cristen: you can pull if you want to merge11:15
← Guest10485 left11:15
cbreak-work or pull --rebase if you want to rebase11:15
if you never make local changes, you can also just git remote update && git reset --hard @{u}11:16
→ nizeguy joined11:17
Cristen k thx11:17
→ angelsl joined11:18
jast houman: have you done any other commits after merging?11:18
← jlg13 left11:18
houman jast: No I haven't. Therefore, is this approach correct? git reset --hard origin/master11:20
→ SuperrMann joined11:22
← Cassiel left11:22
← hotovson left11:24
← hafeez3000 left11:24
→ asakura joined11:24
→ elik joined11:25
→ hotovson joined11:27
← Chib left11:30
→ xiangfu joined11:32
← blurrr left11:32
jast houman: if you don't have any other unpushed commits you wanted to keep (nor any uncommitted changes), then yes, that's the way to go11:32
→ Cassiel joined11:32
→ marhaban1 joined11:34
← marhaban left11:35
← mikecmpbll left11:35
← rob_w left11:35
← fsvehla left11:37
← tjadc left11:39
← wheezl left11:39
← sluther left11:43
→ daniel-s joined11:44
← Cassiel left11:45
→ icio joined11:45
→ Cassiel joined11:46
→ tinti joined11:46
→ blurrr joined11:47
→ sentinal8473 joined11:49
→ Sigma joined11:52
← dougsland left11:52
→ timini joined11:53
→ Ryback_ joined11:54
timini how can I merge a detached HEAD into master branch?11:54
jast timini: write down the commit ID (e.g. git rev-parse HEAD); then switch to master and merge that11:54
or cherry-pick things or whatever11:54
→ babilen joined11:55
← _Vi left11:55
timini jast, thanks :) thats exactly the kind of thing that would have taken me an hour of messing arround to find out for myself!11:55
jast FWIW, a more convenient way to see all kinds of history info, including commit IDs, is 'git log'11:56
nevyn timini: git checkout -b mybranch to make a new branch then merge mybranc h11:57
← Cassiel left11:57
timini :) thanks11:57
← OOPMan left11:57
→ Cassiel joined11:58
→ mikecmpbll joined11:58
→ RaceCondishun joined12:00
→ barq joined12:01
nevyn timini: so label your detached head then use that label to merge it into master12:02
← RaceCondition left12:02
→ _Vi joined12:02
timini Nevyn , give us a clue how can i label mea head? :P12:02
→ fanno joined12:04
← RaceCondishun left12:05
← Cassiel left12:06
→ Cassiel joined12:07
→ fuzzybunny69y joined12:08
houman jast: Thank you :)12:08
→ dougsland joined12:09
← yshh left12:10
fanno hello everyone, i am member of a open source project where i have to modify a script on out server the creator is unable to help (busy) the script is trying to pull using --rebase i get message saying that i cant rebase because it is out of date (in the scripts function that is expected.) what pull command would i need to look for inorder to "force" the server "working repo" to be updated to the current repo on github ? i know that push12:11
nevyn timini: git checkout -b mybranch12:11
← icio left12:11
← xxc_michael left12:12
← Cassiel left12:12
← kennethreitz left12:12
crocket How can I delete a hook from gitolite?12:12
fanno nevyn: would that also update from the github ? i thought checkout was only to switch between local branches ?12:12
nevyn: wops .. i missed that message was not for me =( sorrrryyyyy !12:13
← sentinal8473 left12:13
← hwrd|work left12:13
nevyn scripts shouldn't pull and rebase12:13
→ Cassiel joined12:14
nevyn it's insane12:14
fanno: the script should probably fetch and reset --hard12:14
← gary_golden left12:14
fanno nevyn: well that is why i have to change it because it is not working as it should =)12:14
nevyn so the answer is fetch and reset.12:15
pull doesn't do this12:15
pull is fetch and merge or fetch and rebase12:15
timini If I've just commited how can I diff that commit to the previous one?12:15
nevyn timini: git diff HEAD^12:15
or do you want the actual diff of the commits?12:16
like what changed between the two changes.12:16
→ sentinal8473 joined12:16
→ wheezl joined12:16
→ jackh joined12:17
fanno nevyn: am i correct assume that --hard is similar to --force ?12:17
← _Vi left12:17
→ shihan joined12:17
timini so HEAD^ is the latest commit in the staging/cached area?12:18
→ oso96_2000 joined12:18
→ troyt joined12:19
← jlopez left12:19
← xiangfu left12:22
→ xiangfu joined12:23
wereHamster timini: HEAD^ is the first parent of HEAD12:24
and HEAD is the commit you have currently checked out12:25
→ replore_ joined12:25
← chussenot left12:27
→ LekeFly joined12:28
→ _Vi joined12:28
→ gary_golden joined12:29
← adamben left12:29
← chaiz left12:29
← jackh left12:29
← angelsl left12:30
→ jackh joined12:30
← thyseus left12:30
→ thyseus joined12:31
→ bitkiller joined12:32
→ AdrienBrault joined12:32
← pretty_function left12:32
→ subhojit777 joined12:34
→ yshh joined12:35
← BadProphet left12:36
← dhruvasagar left12:36
→ BadProphet joined12:37
← _Vi left12:37
→ angelsl joined12:37
← AdrienBrault left12:37
← fuzzybunny69y left12:39
→ AdrienBrault joined12:39
← babilen left12:40
nevyn fanno: no.12:41
fanno: !gcs12:41
gitinfo fanno: [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://sitaramc.github.com/gcs/12:41
← svetlyak40wt left12:41
← BadProphet left12:42
→ Goles joined12:42
← Cassiel left12:42
→ Cassiel joined12:44
→ RaceCondition joined12:44
← RaceCondition left12:44
→ RaceCondition joined12:44
→ JSharpe joined12:45
→ M4renz joined12:47
← M4renz left12:47
→ Marenz joined12:47
Marenz Greetings12:47
I try to use git dch to update my changelog for a ubuntu package. For some reason it always wants to append "ubuntu1" to the version number and after it did that, it fails to find the tag anymore (because that obviously doesn't have ubuntu1 appended) How can I stop it from appending ubuntu1?12:48
FauxFaux git dch is nothing to do with git.12:48
Marenz ok12:49
→ jkremser joined12:50
→ chussenot joined12:50
← aetcore_ left12:50
→ jlopez joined12:50
← ninegrid left12:51
jast Marenz: the script is from the git-buildpackage package. check its docs.12:52
probably some kind of ubuntu customization12:53
← Cassiel left12:57
→ eijk_ joined12:57
→ Cassiel joined12:58
← angelsl left12:59
← jfs left12:59
← eijk left12:59
→ angelsl joined12:59
→ leandrosansilva joined13:00
→ pandeiro joined13:01
← jlopez left13:02
← fanno left13:02
→ svetlyak40wt joined13:02
→ oojacoboo joined13:03
sqz how can I add a particular branche, from a remote repo to an existing repo? so far I tried: git remote add --track master foo_remote [email@hidden.address]13:03
→ mklappstuhl joined13:03
← AdrienBrault left13:03
sqz which works..but I get only the master..renaming the 'master'-part to the particular branch also doesnt work13:03
← chussenot left13:04
→ fuzzybunny69y joined13:04
← oojacoboo left13:05
→ AdrienBrault joined13:06
← Xizor left13:06
← Cassiel left13:06
← maqr left13:07
→ Cassiel joined13:07
→ icio joined13:07
→ lausi joined13:07
→ aristidesfl joined13:07
→ RaceCondishun joined13:08
← lausi left13:08
→ chussenot joined13:08
← RaceCondition left13:09
RaceCondishun → RaceCondition13:09
← RaceCondition left13:09
→ RaceCondition joined13:09
→ jlopez joined13:11
→ TeamColtra joined13:13
→ revagomes joined13:14
← psoo left13:16
→ jaeckel joined13:17
← milli left13:17
→ BlueChip joined13:17
→ thelodger joined13:18
← PCChris left13:19
← AdrienBrault left13:19
BlueChip I wanted to clone a single (10MB) directory of git repo ...but git apparently cannot do that ...so I cloned all 770MB of the repo to find that 640MB of it is in the ".git" directory ...can someone explain this please ?13:20
→ chuckharmston joined13:21
esc BlueChip: .git directory contains the repository13:21
← pandeiro left13:21
esc so, all previous versions13:21
stored cleverly13:21
→ yakko joined13:21
→ milli joined13:22
esc BlueChip: you can pass the --depth argument to git clone13:22
BlueChip: man git clone13:22
gitinfo BlueChip: the git-clone manpage is available at http://jk.gs/git-clone.html13:22
BlueChip a) OUCH! and b) for a given definition of "clever"13:22
→ chaiz joined13:22
← yakko left13:22
esc clever means, it doesn't just store the versions as is, but computes the changes (deltas) between individual versions, to store less13:22
← davidban_ left13:22
bremner also, clever assumes your goal is version control, which seems to be true only about 50% of the time around here.13:23
← danillonunes left13:23
bremner grumbles13:23
BlueChip What i want is to grab the Raspberyy Pi bootfiles in such a way as I can keep them updated ...but to do that I have to clone everything that has ever happened to the Raspberry Pi firmware13:24
→ AdrienBrault joined13:24
→ jiku joined13:24
bremner esc already answered that.13:24
→ babilen joined13:25
BlueChip That wasn't a question - and I am reading the url now13:25
esc as for keeping up-to-date, i belived you can pull into a shallow clone, but may be mistaken, any one else know for sure?13:26
→ les_sylvains joined13:26
← svetlyak40wt left13:27
← mikecmpbll left13:27
BlueChip how well does git deal with binary diffs?13:27
→ svetlyak40wt joined13:27
→ guampa joined13:29
wereHamster BlueChip: same way as text diffs13:29
← AdrienBrault left13:29
→ DoniRS joined13:29
BlueChip bdiff can be a nightmarish algorithms - just wondered if it used its own algorithm or a standardised one13:30
s/ms/m/13:30
wereHamster git uses the same algorithm for text and binary files13:30
jast you mean the stuff for delta compression or for displaying diffs?13:30
← chuckharmston left13:31
esc BlueChip: git doesn't deal very well with binary files13:31
BlueChip delta generation (such as `bdiff`)13:31
→ OOPMan joined13:31
BlueChip cheers - I imagine that is why the RPi firmware repo has bloated13:31
← svetlyak40wt left13:31
wereHamster yes, that's a good guess13:32
jast it depends on the binary files, really13:32
BlueChip well, yes13:32
← mklappstuhl left13:32
esc i suppose one could use a rolling checksum to split the file into chunks and then diff the chunks, like rsync does it13:32
jast if they're compressed (as many files are), no off-the-shelf delta compression will help13:32
esc: that's actually slightly less efficient than what git does13:32
→ psoo_ joined13:33
jast except it compresses faster13:33
BlueChip indeed :( ...I don't know much about the firmware blobls, I hear there is a RE project afoot13:33
esc jast: oh really?13:33
jast in any case, you *did* run 'git gc' prior to complaining, right? :)13:33
← pfFredd left13:33
jast esc: git uses sliding window LZ-style compression over a window of several objects13:33
BlueChip I am new to git - `git gc` is new to me ...so: no :/13:33
jast with straightforward assumptions geared towards delta applications13:34
all right13:34
→ kukks joined13:34
jast 'git gc' does housecleaning, including doing delta compression13:34
← kukks left13:34
→ kukks joined13:34
jast you'll want to run it every now and then13:34
← RaceCondition left13:34
BlueChip I guess LZ is good a CPU saver, but not much of a compressor - the age old weigh-off :)13:35
jast LZ is fairly good for compression13:35
→ Zenopus joined13:36
← Zenopus left13:36
jast I mean, of course if we bring in bit prediction and stuff like that... sure, you can do much better, but it's also two orders of magnitude slower13:36
→ alegen joined13:36
jast in any case, for delta compression, you can do much, much worse13:37
plus I can't really think of other compression algorithms that translate so easily to generating deltas13:38
BlueChip delta generation is an art form in and of itself13:39
→ R1KRDO joined13:40
← R1KRDO left13:41
← subhojit777 left13:41
→ R1KRDO joined13:41
← Milossh left13:43
jast honestly, it might have been a better choice to just use xdelta13:43
bit too late for that, though13:43
→ thierryp joined13:43
→ fanno joined13:43
BlueChip I'm sure Linus made his choice carefully based on any number of criteria13:44
→ RaceCondition joined13:44
jast I highly doubt that ;)13:44
BlueChip lol13:44
→ Thra11_ joined13:44
← dharrigan left13:44
jast fun fact: fossil, self-proclaimed git contender, has its own delta generator, too, which outputs text-based delta instructions13:44
esc jast: whats the deal with fossil anyway13:45
BlueChip "There's always another way" lol13:45
jast it... exists13:45
BlueChip lol13:45
→ mklappstuhl joined13:46
esc great fossil is such a common term, i'm having trouble putting it into google trends13:47
← russt left13:47
bremner it sounds like version control for old people. But I thought CVS had that niche locked up.13:47
BlueChip lol13:47
esc http://www.fossil-scm.org/index.html/doc/trunk/www/quotes.wiki13:49
→ Zenopus joined13:49
BlueChip "Git approaches the useability of iptables, which is to say, utterly unusable unless you have the manpage tattooed on you arm."13:49
that's one *fat* programmer13:50
esc yeah and a very tiny font13:50
← RaceCondition left13:50
→ Arokh joined13:51
→ nitrix joined13:52
→ davidbanham joined13:53
→ _Vi joined13:54
→ marc_kdab_ joined13:54
→ tbrock joined13:54
mmc wereHamster: FYI: symbolic refs (i.e. those pointing at other refs ,not direct SHA1), are not included in pack-refs.13:55
so my approach (cat-ing the file) is safe.13:55
→ sq-one joined13:57
→ iamjarvo joined13:57
BlueChip Am I correct in believing it is impossible to pull a section of a repo ...even with depth 1, I am still being forced to download 133MB to obtain the 3MB i actually want13:57
← marc_kdab left13:58
→ Villadelfia joined13:59
← robbyoconnor left13:59
→ Milossh joined13:59
→ SeySayux joined13:59
wereHamster mmc: where is that documented?14:00
→ Bass10 joined14:00
wereHamster BlueChip: yes. But isn't it better to use a web interface to download the one file you need?14:00
→ hyperair joined14:00
← gary_golden left14:00
→ gv joined14:01
← davidbanham left14:02
← sq-one left14:02
← tbrock left14:02
esc damn, anyone have the oneline to clone all repos one has access to from gitolite?14:02
→ ebouchut joined14:03
→ maqr joined14:04
← babilen left14:04
→ mikecmpbll joined14:04
→ Error404NotFound joined14:04
sitaram esc: v3?14:04
→ robbyoconnor joined14:04
→ gonzzor joined14:05
esc sitaram: ssh bbpgit info | grep R | cut -f2 | while read line ; do ; git clone bbpgit:${line}.git ; done14:05
→ sq-one joined14:05
esc sitaram: v3.1-28-gc666473 to be exact14:05
sitaram perfect14:05
esc although it fails on the wild ones, but that doesn't matter much14:05
→ RaceCondition joined14:06
esc and you could probably use somtheing like "^\ R.*" for the regex14:06
but quick and dirty is ok14:06
sitaram: BTW, did you see the new version of git-bit-picture?14:06
sitaram esc: I did; it's nice. I also could not remember what it was I asked for last time :(14:06
esc :(14:07
if you remember, let me know! :)14:07
wereHamster esc: what is it?14:07
esc wereHamster: a visualisation tool for git: https://github.com/esc/git-big-picture14:07
i just released version 0.9.0 two days ago14:08
→ tbrock joined14:10
← iamjarvo left14:10
gonzzor esc: Thanks, just the tool I needed. :)14:10
← maqr left14:11
esc gonzzor: cool!14:11
← Cassiel left14:11
← zeppo left14:11
esc although i am having some trouble running the graphviz utility 'dot' on larger repositories14:11
gonzzor How large is larger?14:12
← JaredMiller left14:12
esc i am running just dot on the git.git repo now for >24 hours14:12
wereHamster llinux kernel large?14:12
gonzzor Ouch..14:12
esc yeah, it hangs with 40.8 % memory usage and one core at 100%14:12
wereHamster esc: is the problem in your tool or in dot itself?14:12
esc wereHamster: well, the --graphviz option produces the graphviz syntax only14:13
→ riker2000_ joined14:13
esc that takes 30 seconds on git.git14:13
i then run dot on that, and it's been taking for ever14:13
wereHamster esc: how many nodes/edges does the graph have?14:13
→ bartek_ joined14:13
esc one sec14:13
comps do git aliases support parametrization and default values? .. ie. something like ${1:-HEAD} in bash14:13
esc wereHamster: 500 nodes roughly14:14
but 30k edges14:14
→ Cassiel joined14:14
← gv left14:14
wereHamster oh. maybe if you try a simpler layout engine for dot it'll be faste?14:14
→ gv joined14:15
mmc wereHamster: in the code:) pack-refs.c handle_one_ref () /* Do not pack the symbolic refs */ if ((flags & REF_ISSYMREF)) return 0;14:15
esc wereHamster: so, I am assuming it's dot, but maybe there is something wrong with the input file14:15
→ AaronMT joined14:15
esc wereHamster: yeah, i just discovered this recently, so i'm still evaluating options14:15
→ russt joined14:15
← riker2000 left14:16
esc i want to see first if this ever runs to completion, but the halting problem is giving me grief ;)14:16
→ dharrigan joined14:17
← dharrigan left14:17
→ dharrigan joined14:17
BlueChip wereHamster : How? And no, it is better to have the files in a dir where I can type "update" and the directory updates14:17
→ fisted_ joined14:18
← aef left14:18
→ infynyxx joined14:18
BlueChip --depth has cut 500MB off the download, but the git folder is still 80MB and I am grabbing 128MB of files I don't want/need14:19
← infynyxx left14:19
BlueChip I have read it is impossible to clone a subset of a project ...I read you must clone the whole project, then trim it to requirements14:20
← fisted left14:21
fisted_ → fisted14:21
← skul left14:21
← Cassiel left14:21
← psoo_ left14:21
wereHamster BlueChip: that is true.14:21
→ psoo_ joined14:21
→ Cassiel joined14:22
→ m0viefreak joined14:22
← JSharpe left14:22
← leandrosansilva left14:22
BlueChip wereHamster: So how do I clone only a subset of folders within a repo?14:22
← TomWij_ left14:23
wereHamster BlueChip: it is impossible.14:23
BlueChip ah! <cries a little>14:23
→ TomWij joined14:23
→ leandrosansilva joined14:24
← bartek_ left14:25
BlueChip If I fork the repo and strip out all the crap I don't want/need - can I instruct github to keep my repo up to date from the source repo?14:25
BlueChip starts to think laterally about the problem14:25
→ pansdr joined14:26
kinlo does gitx have any irc channel?14:26
← jackh left14:27
→ techhelp joined14:28
wereHamster BlueChip: no. *you* have to keep it up to date14:29
← virako left14:29
BlueChip I feel a cron job coming on - lol14:29
→ else- joined14:30
→ chussenot_ joined14:31
← techhelp left14:31
→ techhelp joined14:31
← techhelp left14:32
← leandrosansilva left14:32
→ witul joined14:32
→ leandrosansilva joined14:32
→ techhelp joined14:32
BlueChip is --depth 0 more shallow than --depth 1 ?14:32
← witul left14:33
← chussenot_ left14:33
← chussenot left14:33
← sq-one left14:34
→ chussenot joined14:34
→ bubbles10101 joined14:34
BlueChip it appears --depth 0 is ignored14:34
← xiangfu left14:35
BlueChip or maybe the % indicator is files, not bytes14:35
← arvind_khadri left14:35
← fuzzybunny69y left14:35
BlueChip ah yes, 2%=50MB, 10%=60MB14:36
→ ninegrid joined14:36
→ gain joined14:37
→ maqr joined14:37
→ JaredMiller joined14:38
→ lacrymology joined14:38
→ aruiz joined14:38
← eijk_ left14:39
→ eijk_ joined14:40
← marhaban1 left14:40
psoo_ → psoo14:42
← chussenot left14:45
← Zenopus left14:45
← maqr left14:45
← h0bbit left14:46
→ dvsharp joined14:46
→ sjhuang joined14:47
← hotovson left14:47
→ hotovson joined14:49
← mmc left14:49
← devsharpen left14:49
← marthinal left14:49
→ krosenvold joined14:50
→ adamben joined14:50
← adamben left14:50
→ adamben joined14:50
→ aetcore joined14:52
← jiunec left14:52
← jiku left14:52
→ cenuij joined14:52
← cenuij left14:52
→ cenuij joined14:52
← Guest23361 left14:53
→ davidbanham joined14:54
→ babilen joined14:54
→ madewokherd joined14:55
← Milossh left14:55
← Cassiel left14:55
← aristidesfl left14:56
→ Cassiel joined14:56
→ pandeiro joined14:57
← Sigma left14:58
← ehsan left14:58
→ ehsan joined14:59
→ ccapndave joined14:59
→ hafeez3000 joined15:00
← hafeez3000 left15:00
ccapndave Hey everyone - I am having some confusion deleting stuff from a collection. I want to delete everything older than a certain timestamp and am using Logs.remove( { timestamp: { $lt: (1).hour().ago() } } ); but nothing is getting deleted. If I do Logs.find( { timestamp: { $lt: (1).hour().ago() } } ).fetch(); then I can see loads of objects matching. Does anyone have any ideas?15:01
← davidbanham left15:02
→ Logi joined15:02
mgedmin that looks like a mongodb question15:02
← soee left15:02
mgedmin this is a git channel15:02
→ zeppo joined15:03
→ Febul joined15:04
→ ShadeTornado joined15:04
Febul → Guest5524815:04
ccapndave oops15:05
Sorry15:05
Meant to post in #meteor15:05
(blush)15:05
→ Mode-M joined15:05
← ShadeTornado left15:05
→ ojacobson joined15:05
→ ShadeTornado joined15:06
← flijten left15:06
→ BryanRuiz joined15:10
← gv left15:10
← tbrock left15:10
← leandrosansilva left15:10
→ infynyxx joined15:11
→ maqr joined15:11
← infynyxx left15:12
← replore_ left15:13
← milli left15:14
→ Sky[x] joined15:15
→ tbrock joined15:15
← thinkdevcode left15:15
→ rob_w joined15:15
← rob_w left15:15
→ wubino joined15:17
← mentero left15:17
← Thra11_ left15:18
→ marhaban joined15:18
← fanno left15:19
← thierryp left15:19
← maqr left15:19
← angelsl left15:19
→ milli joined15:19
→ replore_ joined15:20
← jcao219 left15:20
← marhaban left15:21
→ pfFredd joined15:21
→ flijten joined15:21
← mastro left15:22
← Cassiel left15:23
→ Cassiel joined15:23
→ svetlyak40wt joined15:24
→ cakehero joined15:24
← ehsan left15:25
→ angelsl joined15:26
→ thiago joined15:26
→ Chillance joined15:27
← zeppo left15:28
← milli left15:28
← robbyoconnor left15:29
← Goles left15:29
→ jcao219 joined15:30
→ milli joined15:30
→ xpen joined15:30
← ShadeTornado left15:30
← kpreid left15:30
→ riker2000 joined15:32
→ vpopov joined15:33
wubino can I branch a master repo that uses a different git server?15:33
← BlueChip left15:33
→ v0n joined15:33
wubino basically can I use bitbucket for master branch and github for public branch?15:34
bremner you can push a local branch to whatever remote repo you want15:34
← ccapndave left15:35
← riker2000_ left15:35
→ Desproges joined15:36
→ Gx4 joined15:37
→ jds_ joined15:38
jds_ Heya15:38
→ NoDLL joined15:38
→ _ivar_ joined15:39
← Cassiel left15:39
jds_ I guess I'm reading the manpage for git-lsfiles wrong, but I expected "git ls-files -c -o" to print both tracked and untracked files15:40
Instead, it just prints tracked files15:40
NoDLL Hello, if I have a windows user with spaces to which I need to give permissions to a gitolite repository, How should I provide such username at the config file?15:40
← tbrock left15:40
→ abrkn joined15:40
sitaram NoDLL: the windows userid has nothing to do with the gitolite userid15:40
NoDLL: read the second link in !gitolite_ssh15:40
gitinfo NoDLL: See http://sitaramc.github.com/gitolite/sts.html for steps to troubleshoot ssh/gitolite. See http://sitaramc.github.com/gitolite/glssh.html for how a single "real" userid can play host to multiple "virtual" users using ssh keys.15:40
abrkn i merged a config file into master from my prod branch (which has passwords) by mistake. is there a way to undo that?15:40
NoDLL sitaram thanks15:41
← v0n left15:41
← Linc left15:42
→ spaceonline joined15:45
→ nizeguy_ joined15:45
→ maqr joined15:45
← nizeguy left15:46
→ Fingolfin joined15:46
← m0viefreak left15:46
→ mmc joined15:47
→ marhaban joined15:48
← Logi left15:48
→ infynyxx joined15:49
→ Cassiel joined15:50
→ riker2000_ joined15:51
← Cassiel left15:51
→ tzanger joined15:51
Fingolfin is it just me or is the git mailing list dead? There were no mails for the past 20 hours or so (including one I sent), and I don't see any posts in the various list archives, either...15:51
tzanger good morning15:51
→ senior75151 joined15:52
← senior75151 left15:52
→ ehsan joined15:52
← svetlyak40wt left15:53
tzanger I have a question... I have two git repos. A contains subdirectories sub1, sub2 and sub3, and B contains code (with revision history) that contains code that belongs in sub2, as a different branch.15:53
Is there any way to create a branch in A that I can inject the code and history from B into A/sub2?15:53
they should have never been separate repos15:53
← riker2000 left15:54
← maqr left15:54
→ davidbanham joined15:54
tzanger B/ should be A/sub2/src15:54
_ikke_ tzanger: Look at sub-tree merge15:54
tzanger _ikke_: ok, thank you15:54
→ skyf joined15:55
← aruiz left15:55
← LekeFly left15:55
→ daniel_- joined15:56
→ v0n joined15:56
→ Cassiel joined15:56
← wubino left15:59
→ chussenot joined15:59
← R1KRDO left16:00
← chaiz left16:00
→ ethanol joined16:00
← infynyxx left16:00
→ torjus_ joined16:00
← newbie999 left16:01
← wheezl left16:01
← davidbanham left16:03
← Cassiel left16:03
_ikke_ Fingolfin: It's not just you16:03
Fingolfin aha. good. I mean, bad. ;)16:04
← xpen left16:04
← chussenot left16:04
← mikecmpbll left16:04
← tsdh left16:04
→ NL1GLB joined16:04
Fingolfin just when I write my first email in a couple of months, it breaks down... coincidence??? ;)16:04
→ Cassiel joined16:04
← NL1GLB left16:04
→ infynyxx joined16:04
_ikke_ haha16:05
Last mail I have is from Junio, 19 hours ago16:05
← revagomes left16:05
→ chussenot joined16:05
→ flavius joined16:05
→ danillonunes joined16:05
← danillonunes left16:06
→ relipse joined16:06
← chussenot left16:06
← infynyxx left16:06
→ danillonunes joined16:06
← Cristen left16:06
→ dreiss joined16:07
← jcao219 left16:07
← aisbaa left16:08
← cbreak-work left16:09
→ infynyxx joined16:10
→ revagomes joined16:11
Fingolfin yeah, same here. OK, so it's Junio's fault then ;)16:11
→ riker2000 joined16:12
_ikke_ haha :D16:12
← papegaaij left16:12
→ PaulCapestany joined16:12
← cakehero left16:12
→ martinjlowm-lapt joined16:13
← TeamColtra left16:14
← bauruine left16:14
← riker2000_ left16:15
← angelsl left16:15
→ BadProphet joined16:15
→ angelsl joined16:15
→ aruiz joined16:15
← hyperair left16:15
← angelsl left16:16
← infynyxx left16:16
→ hoschi joined16:17
← OOPMan left16:19
→ OOP_Man joined16:19
→ tjadc joined16:20
→ maqr joined16:20
← ehsan left16:20
← spaceonline left16:20
→ ehsan joined16:21
← Gx4 left16:22
← rath-work left16:23
← OOP_Man left16:24
← Hounddog left16:24
← dpino left16:24
→ OOP_Man joined16:24
→ wheezl joined16:24
→ nioncode joined16:24
→ heinrich5991 joined16:24
→ Thra11_ joined16:26
→ TeamColtra joined16:26
→ fbe joined16:27
fbe hi16:27
gitinfo fbe: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.16:27
→ neiz joined16:27
← maqr left16:28
→ imrobert joined16:28
→ spaceonline joined16:29
→ davidbanham joined16:29
← bux left16:30
neiz hello, are there any config options which may help with a repo that won't clone? I clone, authenticate, and git creates the root folder - and then hangs while doing something with the .git folder. I have tried increasing the buffer size to no avail16:31
← revagomes left16:31
_ikke_ neiz: !repro16:31
gitinfo neiz: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session. This will help immensely with troubleshooting.16:31
wereHamster neiz: pastebin the whole output16:31
fbe i have a local repo with 2 branches - master and newfeature. i'm developing in newfeature most of the time. i'm keeping my newfeature branch up2date with git merge master frequently - so i have now 4 or 5 merge master into newfeature. is it possible to rebase the newfeature branch after those merges? i want to squash the complete development line of this branch to one commit.16:32
wereHamster fbe: yes.16:32
fbe ok, what do i have to do for this?16:32
wereHamster git rebase master16:33
← RaceCondition left16:34
← ThomasLocke left16:34
fbe wereHamster: ah!16:36
→ RaceCondition joined16:36
jds_ Can I get git-lsfiles to show both cached and 'other' files ?16:37
← torjus_ left16:37
_ikke_ and -co doesn't work?16:37
according to the manual it should16:37
fbe now he added all my commits of my branch on top of the latest master commit and i have a new fresh branch with all my old branch commits and i can now squash :-)16:37
nice! thanks wereHamster16:37
← davidbanham left16:37
→ jamesflorentino joined16:38
← jamesflorentino left16:38
← jkremser left16:39
← RaceCondition left16:39
← giallu left16:39
← danillonunes left16:40
→ danillonunes joined16:41
← skyf left16:41
jds_ _ikke_: Yeah, that's what I though. It doesn't seem to - "git lsfiles . -o" shows me 'other' files, and "git lsfiles . -c" shows me tracked files, but '-co' just seems to give me tracked16:41
→ itatitat joined16:41
← tPl0ch left16:42
Nevik jds_: have you tried git lsfiles -c -o .16:43
→ selckin joined16:43
← flijten left16:44
→ demure joined16:45
Nevik jds_: "git ls-files -co" works for me; what does it do for you? error message?16:46
jast "but '-co' just seems to give me tracked"16:46
→ manchicken joined16:46
→ MacGyver joined16:46
← manchicken left16:46
→ manchicken joined16:46
← MacGyver left16:46
→ MacGyver joined16:46
→ madduck joined16:46
← madduck left16:46
→ madduck joined16:46
Nevik oh, sorry, missed that16:46
→ WakiMiko joined16:47
← jceb left16:47
→ Cromulent joined16:47
Nevik nevertheless, it works for me16:47
jds_: what's your git version16:47
→ RaceCondition joined16:47
→ NoiseEee joined16:48
← v0n left16:48
→ revagomes joined16:48
→ arvind_khadri joined16:49
NoiseEee hey, i'm working on a new-feature branch, but needed to fix something on master (where i'll eventually merge new-feature into). I also want that fix in my new-feature branch, so I cherry-picked the commit into my new-feature branch. When I eventually merge new-feature into master, will Git be smart enough to recognize there is NOT a conflict in the two files... ie; does the hash of the cherry pick help or will it be a conflict because both files wer16:50
→ marhaban1 joined16:51
← marhaban left16:51
← psoo left16:52
NoiseEee turkey day16:52
← webdev left16:53
Nevik i think part of your line got cut off16:54
it ended with "does the hash of the cherry pick help or will it be a conflict because both files wer"16:54
NoiseEee thanks... "...were changed on both branches?16:54
→ maqr joined16:54
_ikke_ NoiseEee: See man git patch-id16:55
gitinfo NoiseEee: the git-patch-id manpage is available at http://jk.gs/git-patch-id.html16:55
→ chisler joined16:56
NoiseEee _ikke_: use that after the merge, when its reporting a conflict?16:56
_ikke_ NoiseEee: No, it's a mechanism git uses to check if two commits basically do the same16:57
NoiseEee or are you saying create a patch instead of cherry-picking the commit from master into new-feature?16:57
→ bux joined16:57
NoiseEee oh16:57
so then i should be good to go?16:57
_ikke_ yeah16:57
NoiseEee thanks16:58
→ Shusshu joined16:58
→ arietis joined16:58
← booginga left16:59
demure for git commit, if there are multiple files that changed, can they have individual messages?16:59
ojacobson demure: the message is per-commit17:00
NoiseEee demure: if you commit individual files at once17:00
commit the ones you want to group together with a message, etc17:00
ojacobson so if you want multiple messages, you need to commit the files one at a time (and try to pick an ordering that produces a series of "good" commits rather than a bunch of broken intermediate states) or your future self will be annoyed when they have to fix a bug introduced in that series of commits :)17:00
← relipse left17:01
← rchavik left17:02
← timini left17:02
demure okay, so aside from doing more timely commits in the future, can I choose to only commit one file at a time?17:02
← maqr left17:02
wereHamster sure.17:03
→ jcao219 joined17:03
← Shusshu left17:04
demure ah, i give the path, after the message17:04
_ikke_ You can even commit parts of files17:04
← arietis left17:05
→ pheaver joined17:07
← Guest55248 left17:07
_ikke_ I seem to have completely misunderstood what git cherry reports17:08
← Caelum left17:08
NoiseEee _ikke_: hmm?17:08
→ Caelum joined17:08
← doki_pen left17:08
← pheaver left17:08
← milleja46 left17:09
← Arokh left17:09
_ikke_ I did a git cherry topic | grep ^- and wonders why I saw commits that I expected in the current branch17:09
→ arietis joined17:09
_ikke_ wondered*17:09
→ twobitsprite joined17:09
← ehsan left17:09
→ doki_pen joined17:10
→ TheMoonMaster joined17:10
→ milleja46 joined17:10
← kermit left17:11
→ thinkdevcode joined17:11
→ ehsan joined17:11
→ kermit joined17:11
← neiz left17:12
← marhaban1 left17:14
→ rgr joined17:14
← mklappstuhl left17:14
→ Innocentus joined17:15
← babilen left17:15
→ Goplat joined17:17
← Davey left17:17
← les_sylvains left17:19
← PaulCapestany left17:19
← itatitat left17:20
← pfFredd left17:21
→ Fuxx joined17:23
← NoiseEee left17:23
← o] left17:24
→ PaulCapestany joined17:25
→ Sigma joined17:26
→ leeN joined17:26
← gain left17:26
← achadwick left17:27
→ Hounddog joined17:27
→ R1KRDO joined17:29
→ maqr joined17:31
→ thierryp joined17:32
← thierryp left17:32
→ torjus_ joined17:33
→ Arokh joined17:34
← RaceCondition left17:34
← afuentes left17:34
← LimeBlast left17:35
← maqr left17:35
→ yhager joined17:37
→ daniel_-_ joined17:37
→ swiety joined17:37
→ gittish joined17:39
← daniel_- left17:39
← jgomez left17:39
← mishok13 left17:39
← suy left17:39
→ legumbre_ joined17:40
→ mklappstuhl joined17:40
→ lonewulf` joined17:43
→ psoo joined17:44
→ jbub joined17:44
→ pheaver joined17:45
→ mastro joined17:45
← TeamColtra left17:47
→ AdrienBrault joined17:51
← BryanRuiz left17:51
← caddoo left17:51
→ mirage335 joined17:53
mirage335 I need to modify a code in a bunch of branches from a single remote repository (IQEmu github repo), then push those changes back to the separate remote branches they belong in.17:54
← psoo left17:54
mirage335 Is there an easy way to handle multiple remote branches?17:54
← nioncode left17:54
← gittish left17:55
← legumbre_ left17:56
← Innocentus left17:57
→ legumbre_ joined17:57
← Goplat left17:57
_ikke_ Not really automated17:57
← OOP_Man left17:57
_ikke_ In git, you most of the time operate on one branch at the same time17:58
→ wanders joined17:58
_ikke_ mirage335: but things like git cherry-pick allows you to copy changes from one branch to another17:58
→ gv joined17:58
mirage335 _ikke_: Thanks.17:59
← thinkdevcode left17:59
← gusnan left18:00
← timj1 left18:03
← bux left18:04
← bgerber left18:06
← torjus_ left18:06
← swiety left18:06
← manchicken left18:07
→ TeamColtra joined18:07
← alkino left18:07
→ sirdancealota joined18:08
→ tolland joined18:08
→ dinkytoy joined18:08
tolland i have a git repo in the base of my home directory with a wildcard excluding most of the files for example ~/Desktop18:09
→ ShadeTornado joined18:09
tolland so git ignores desktop, but if you cd into Desktop and do "git status" even though its not added, it still returns "git status"18:09
← ShadeTornado left18:10
→ ShadeTornado joined18:10
tolland so I can kind of see why this would happen, but it causes eclipse to perceive ~/workspace as being part of a git repo, even though its excluded18:10
← replore_ left18:10
_ikke_ tolland: it returns git status?18:10
cbreak tolland: it's part of a git repo18:11
tolland oops, so git status, returns the status of the repo, in a directory excluded from the repo18:11
cbreak tolland: everything with a .git in the same or a parent level is inside a git repo18:11
← SirCmpwn left18:11
cbreak tolland: git status has nothing to do with it18:11
→ SirCmpwn joined18:11
← pheaver left18:11
tolland so there is no .git dir in Desktop18:12
$ find ~/Desktop -name .git | wc -l18:12
018:12
← daniel_-_ left18:13
tolland but git status returns the status of the parent directory repo18:13
← chisler left18:13
→ Jippi joined18:13
cbreak tolland: doesn't matter18:13
tolland: everything with a .git in the same or a parent level is inside a git repo18:13
tolland even if its in gitignore18:14
cbreak gitignore has nothing to do with it18:14
tolland it sounds like it should do18:14
cbreak the only thing gitignore does is hide untracked things from git18:14
tolland it sounds like the git repo should ignore it18:14
cbreak nothing more, nothing less18:14
the repo ignores it...18:14
it won't show up in git status18:14
tolland maybe you should rename it to githidesuntrackedfilesfromgit18:14
cbreak if you try to git add it, git will complain18:14
and so on18:14
if you don't want something to be inside a git repository18:15
then MOVE IT OUT18:15
easy.18:15
tolland i will do, im just here to bitch a bit first18:15
;-)18:15
ojacobson tolland: ignores are "I don't want to track this", not "this isn't part of my repo"18:15
it works broadly the same way in every SCM tool18:15
svn's kind of the odd one out because until recently svn tracked "is part of repo" on a per-directory basis18:16
cbreak with the difference that git's interpretation is safer18:16
if git gets told to track and ignore something at the same time, it will track it18:17
I heard svn will ignore it, even if it is told to track it18:17
so you might lose data18:17
← aruiz left18:17
→ Goles joined18:17
→ _iron joined18:18
ojacobson cbreak: that wasn't true when I last used svn (it would never ignore tracked files) around 1.618:19
→ RaceCondition joined18:20
→ OOPMan joined18:21
→ marthinal joined18:24
tolland a work around seems to be to create an empty git repo in the ~/workspace dir18:24
so the eclipse projects are submodules of that.18:24
is that going to cause other problems?18:25
→ les_sylvains joined18:25
→ ISF joined18:25
→ OOP_Man joined18:26
← alunduil left18:26
← OOPMan left18:27
osse tolland: how often do you use the repo you have in your home directory?18:27
← JoeAngel_ left18:27
osse tolland: just once or twice a week for syncing your dotfiles? or very often?18:27
← rurufufuss left18:28
← shruggar left18:28
← danillonunes left18:29
→ aruiz joined18:29
→ alunduil joined18:29
→ startling joined18:29
startling what's the best way to convert some parts of a repository to git annex? remove them from history (they're pretty large) and then re-add them with annex?18:30
← dc5ala left18:30
startling also: I have a ~/code/ directory that has a million repositories in it. Right now I just rsync to my backup drive; is there a better solution to this?18:31
tolland osse: so i could probably do without it18:31
Nevik startling: whats wrong with rsyncinc them ?18:32
osse tolland: hmm. that sentence makes me think you wrote something else that I can't see.18:32
← NoDLL left18:32
← alunduil left18:32
← skorgon left18:33
→ alunduil joined18:33
startling Nevik, I don't need to keep all these files on my laptop, but I'm hesitant to get rid of some without a system I can trust to tell me there's a copy somewhere18:33
Nevik startling: if you have remotes, the copies are there; otherwise, yes, just move them somewhere else18:34
← Cromulent left18:34
bremner startling: probably there is no better way than removing the objects from history and then annexing them.18:34
← Goles left18:34
Nevik git repos are self-contained; to use them you only need git available to the active system18:34
← fisted left18:34
→ bgerber joined18:34
→ skorgon joined18:34
startling Nevik, sure, but going throught my ~200 directories and adding remotes and syncing them all would be a pain18:35
→ techhelp2 joined18:35
Nevik here's a fun question (i dont have a concrete case of this, just thought of it) -- does git complain when time goes backward (i.e. system time incorrect, new commit earlier than the previous one) ?18:35
startling: as i said, move the repo to your backup drive, and youre fine18:35
_ikke_ I don't think git will care18:36
afaik commit time is only meta data18:36
Nevik startling: or copy it to several backup locations if that makes you feel safer18:36
_ikke_: thought so18:36
← Sigma left18:36
startling Nevik, yeah. was hoping there was something that would take care of it for me; oh well18:36
→ danillonunes joined18:36
startling bremner, okay, that works.18:36
_ikke_ Only stat info might confus git18:36
Nevik yeah18:36
cbreak each git commit has two time stamps18:37
the commit time and the authorship time18:37
_ikke_ yeah18:37
cbreak neither needs to be later than any of its parent commits'18:37
osse tolland: anyway, what I wanted to say is this: I have a hacky solution to this problem where I have a shell function that just toggles the name of the git dir between .git and .git-off18:37
Nevik startling: there are things that git can do for you, but if you want to backup the whole local repo, just compress it with whatever you like, and put it in a safe spot18:37
_ikke_ cbreak: Does git use these dates anywhere internally?18:37
startling Nevik: sure18:37
cbreak yes18:38
← techhelp left18:38
cbreak for displaying dates18:38
Nevik lol18:38
→ cwillu_at_work joined18:38
← rhl left18:38
Nevik display != internal18:38
cbreak or things like reflog lookup18:38
or date-order18:38
Nevik thats more like it18:38
← gv left18:38
Nevik so it might confuse things, but it wouldnt directly break anything18:38
very git'ish18:38
← zenx left18:38
cbreak you can change them if you want18:39
Nevik yeah18:39
cbreak Nevik: man git-commit18:39
gitinfo Nevik: the git-commit manpage is available at http://jk.gs/git-commit.html18:39
cbreak look at --date18:39
and the *_DATE env vars18:39
Nevik yeah18:39
← PaulCapestany left18:39
← icio left18:40
Nevik internet, y u so slow :<18:40
tolland osse: yeah, so I mainly created the repo there so I could learn how xfce was storing its configs in my ~/.* files18:40
jast my line is capped to 2 mbit/s down and 128 kbit/s up18:40
tolland so i could actually do without it18:40
jast due to bad SNR18:40
Nevik damn18:40
jast occasionally the modem will decide to cap to 1 mbit/s18:41
→ v0n joined18:41
cbreak my line's capped at 100mbit down, 7mbit up :(18:41
Nevik jast: the dorm i live in has a 100mbit connection, but the fiber node it's connected to is oversold, so during peak hour (weekdays, ~7-9pm), it drops really bad18:41
jast poor cbreak18:41
Nevik just now i dropped down to around 1Mbit or so18:42
or maybe 218:42
hard to tell with multiple devices18:42
→ aristidesfl joined18:42
← aristidesfl left18:42
← Hounddog left18:42
← startling left18:42
← bubbles10101 left18:43
Fingolfin ah, seems the git ml is alive again18:43
_ikke_ Oh, cool18:43
← legumbre_ left18:43
_ikke_ Are all those mails in the mean time just lost?18:43
→ h0bbit joined18:44
→ aristidesfl joined18:44
← RaceCondition left18:45
→ fdel joined18:45
→ OOPMan joined18:45
→ RaceCondition joined18:45
← OOP_Man left18:45
→ Goles joined18:46
← SuperrMann left18:46
← aristidesfl left18:46
Fingolfin _ikke_: no idea... well, there is one from 9 hours ago... perhaps there are more waiting in a queue?18:46
← Vile left18:47
Fingolfin emailed the vger postmaster some time ago, but did not yet get a reply18:47
_ikke_ possible18:47
Fingolfin there are several mails I know were sent but are missing18:47
← Goles left18:47
Fingolfin I know because I got a CC to a not subscribed email address of mine, that is18:47
→ aristidesfl joined18:47
← aristidesfl left18:48
→ aristidesfl joined18:49
Fingolfin gtg, cya18:49
← Fingolfin left18:49
→ flijten joined18:49
→ nobitanobi joined18:49
← aristidesfl left18:50
nobitanobi Hi. I have the following .gitignore: https://gist.github.com/4132531 but everytime I modify the .gitignore it appears in Changes not staged for commit: - why is that??18:50
→ babilen joined18:51
_ikke_ nobitanobi: Because you are tracking the file18:51
→ marhaban joined18:51
_ikke_ nobitanobi: (you have git added and comitted it)18:51
git doesn't ignore tracked files18:52
(ignoring means you don't want to track something, so ignoring something tracked is basically a conflict)18:52
→ Sigma joined18:52
→ hinst joined18:53
← berserkr left18:53
← volta left18:53
→ PaulCapestany joined18:53
← p3rror left18:54
← tjadc left18:54
→ tjadc joined18:54
← sentinal8473 left18:55
← marhaban left18:56
→ j416 joined18:56
→ Innocentus joined18:56
fdel I have 2 versions of a git repository: v1 with only branches starting at master's HEAD and v2 pristine version with the same HEAD18:56
I have a "error: .git/objects/pack/pack-58...f5.pack SHA1 checksum mismatch" when running "git fsck --full --strict --progress" on v118:56
Is there a way I can "repair" v1 with v2?18:56
→ daniel_-_ joined18:57
← diegoviola left18:58
→ cilly joined18:58
← thelodger left18:59
← DoniRS left18:59
→ bauruine joined19:00
fdel (or simply repair v1)19:02
← barq left19:02
nobitanobi _ikke_ thanks19:03
← marthinal left19:03
nobitanobi I have two remotes and I see that I am in the branch "master", but when I try to do git diff master integration/master I get the following: "fatal: ambiguous argument 'integration/master': unknown revision or path not in the working tree."19:05
Why is that happening?19:05
← vpopov left19:05
nobitanobi Can't I compare my local master to the remote master?19:05
imMute nobitanobi: separate them with a ..19:05
nobitanobi: master..integration/master19:05
→ private joined19:05
imMute might be a ... and/or reversed order, depending on what you want to see, exactly19:06
private → Guest4697719:06
nobitanobi I think is because I don't have a local tracking branch19:06
→ avjpl joined19:07
EugeneKay git branch -a19:07
nobitanobi just master.19:07
Tried to do this though: git branch --track master_integration integration/master19:07
← mklappstuhl left19:07
nobitanobi and got: fatal: Not a valid object name: 'integration/master'.19:07
← Tegi left19:07
imMute origin/integration/master ?19:08
nobitanobi why origin?19:08
imMute or whatever your remote name is19:08
oh, is your remote name "integration" ?19:08
nobitanobi [remote "integration"]19:08
url = [email@hidden.address]19:08
fetch = +refs/heads/*:refs/remotes/integration/*19:08
yes19:08
imMute 1) don't paste. 2) 'git fetch integration'19:08
→ berserkr joined19:08
nobitanobi imMute, may I ask why do I need to do a fetch?19:09
I have already done a pull19:09
← OOPMan left19:09
imMute to fetch the remote refs.19:09
→ diegoviola joined19:09
← avjpl left19:09
imMute did you do a pull from a different remote?19:09
→ OOPMan joined19:09
nobitanobi well, I did from "production", but when trying to create the local tracking branch of production, got the same fatal19:09
← _Vi left19:10
nobitanobi dang it, now I did the fetch and got exactly what I didn't want19:10
* [new branch] master -> integration/master19:10
imMute which was?19:10
nobitanobi now my master is tracking that remote right?19:10
SethRobertson yes19:11
imMute that's easily changed.19:11
← Ryback_ left19:11
SethRobertson fetch didn't do that or anything19:11
nobitanobi SethRobertson: I would say before doing the fetch, my master was a local branch19:12
← ISF left19:12
imMute nobitanobi: integration/master (full name: refs/remotes/integration/master) IS the remote tracking branch. you get those by doing a fetch of that remote19:12
nobitanobi: you have to have that tracking branch in order to do diffs with it.19:12
→ Kre10s_ joined19:12
ojacobson nobitanobi: 'fetch' did not touch your master branch (refs/heads/master). It copied the remote's master branch (remote's refs/heads/master) to a "remote tracking" branch in your local repo named integration/master (refs/remotes/integration/master).19:13
Your local master branch is unchanged.19:13
nobitanobi ojacobson: ok.19:13
→ tchan joined19:13
← tchan left19:13
→ tchan joined19:13
imMute ojacobson: correct me if i'm wrong, but the "master" in the thing nobitanobi pasted is actually referring to the master on the remote, correct?19:13
Kre10s_ hey. I'm trying to clone a git repo over gitolite/ssh on windows. I have installed msysgit. I am told msysgit will generate an ssh public key for me... where do i find it so that i can send it to the admins?19:14
← houman left19:14
imMute Kre10s_: AFAIK, it doesn't do it automatically. use ssh-keygen or PuTTYgen to make one.19:15
nobitanobi thanks guys, I am going to try to figure out19:15
jast in msysgit's shell, try: cat ~/.ssh/id_rsa.pub19:15
nobitanobi what's going on :)19:15
ojacobson imMute: yes, it is19:15
jast if that errors out, you probably don't have an automatically generated key :)19:15
ojacobson (remote branch name) -> (local remote-tracking name)19:15
imMute ojacobson: okay, that might be part of why nobitanobi is confused19:15
nobitanobi: git was telling you that it was creating a remote tracking branch (called integration/master) that is tracking the branch "master" on that remote19:16
nobitanobi ok!19:16
now that makes sense19:16
imMute nobitanobi: your confusion comes from that there is a "master" on both your repo and the remote19:16
nobitanobi right19:16
I believe so19:16
I was just trying to have a local master branch19:16
and two tracking branch from the two remotes19:16
imMute right, which is what you now have19:16
nobitanobi yup19:17
imMute if you do a git branch -a you should see master, integration/master, and production/master19:17
nobitanobi well, I screwed a little bit because of this:19:17
imMute (the first being a local branch, the other two are remote-tracking branches)19:17
nobitanobi https://gist.github.com/413259419:17
→ svetlyak40wt joined19:17
nobitanobi check the fetch, it says heroku instead of production19:17
imMute ah19:17
nobitanobi going to change that :)19:18
imMute in that case the remote is called "production", but it makes remote-tracking branches with the "heroku/" prefix19:18
nobitanobi so if when I do a fetch of a remote I want the name of the branch to be master_remote19:18
imMute no19:18
you dont19:19
nobitanobi why?19:19
imMute because then it looks like a local branch19:19
← osse left19:19
imMute unless... do you want to actually *check out and work on* that remote branch?19:19
nobitanobi I was thinking on doing that yes19:20
otherwise, why is it usefull to have the tracking branches?19:20
what would be a good workflow?19:20
work on the local one and merge on the remote?19:20
and then push?19:20
→ pheaver joined19:20
nobitanobi merge on the remote tracking one19:20
I mean19:20
ojacobson nobitanobi: 'git fetch' and 'git push' should be the only things touching remote-tracking branches19:21
imMute then you want to do somehting like git branch [-t] master_remote remote/master19:21
ojacobson to start from production/master and make some changes, use 'git checkout -b some-local-name production/master' or that git-branch stanza imMute suggests19:21
nobitanobi ojacobson: what about git pull?19:21
imMute nobitanobi: you can't checkout remote-tracking branches. they are merely so you know what state the remote repo is at.19:21
ojacobson nobitanobi: git pull uses 'git fetch' and 'git merge' under the hood.19:21
→ _huoxito joined19:21
imMute which is why pull = fetch + merge. the fetch updates your tracking-branch (so you get the latest changes from the remote) and then merges those changes into your local branch19:23
nobitanobi (I'm reading all this awesome information...)19:23
I am pretty much lost now19:24
dang it19:25
imMute about what?19:25
nobitanobi best way to work with two remotes.19:25
imMute okay, using your production and integration remote (where integration is a QA-like setup??)19:25
→ dr_diamond joined19:25
nobitanobi that's what I am trying to19:26
yes19:26
imMute okay, so you probably want to let devs push to integration whenever - so they can test their changes in a production-like environment19:26
← dr_diamond left19:26
← blami_ left19:27
→ Vile joined19:27
nobitanobi and right now I have the following .git/config: https://gist.github.com/413262019:27
imMute: right. I want to push to integration19:27
imMute so devs would branch from integration/master to work on features, and push back to that when they're done with a feature (merging or rebasing along the way to get other's changes)19:27
nobitanobi but I am confusd about the set up in the local19:27
ok19:27
← laurav left19:27
nobitanobi so the first thing is doing a fetch from both integration and production19:27
and then branching out from those19:27
imMute no, noone should be branching from production19:28
nobitanobi branching from integration19:28
from local integration/master19:28
← cyphase left19:28
imMute then, when integration/master gets into a state where you want to move/upgrade it to production, then someone branches from integration/master, merges it into production/master and then pushes it to production/master19:28
nobitanobi perfect19:29
but the first step19:29
imMute if you never pull from or modify production/master, the merge should always be a fast-forward19:29
nobitanobi ok19:29
awesome.19:29
Let me ask you one last thing19:29
right now I am in an empty git repository with this https://gist.github.com/413262019:29
imMute only one person (the guy who "promotes" integration to production) should even need production as a remote19:29
nobitanobi that's myself..19:29
because I am actually the only one dev now :P19:30
imMute ah, then the "other devs" are merely theoretical.19:30
→ dr_diamond joined19:30
nobitanobi well, imMute there is a friend of mine joining soon19:30
I hope that theoretical comes practical19:30
→ harrylynes joined19:30
imMute so, he probably only needs to work with integration19:30
nobitanobi now that I am in an empty local .git repository with this config: https://gist.github.com/4132620 — what would be the first step to do19:31
?19:31
git fetch integration?19:31
← dr_diamond left19:31
→ dr_diamond joined19:31
nobitanobi right now if I do git branch, I don't get anything. Is completely empty.19:31
→ Targen joined19:31
imMute to start a new dev repo? just clone integration19:31
← harrylynes left19:31
nobitanobi I am already in a empty git repo,19:32
imMute which does all the config setup and creates a branch called master that tracks integration/master19:32
nobitanobi a local branch called master that tracks the local integration/master?19:32
imMute then what you probably want to do is git checkout -b master integration/master (or, equivalently, git branch -t master integration/master ; git checkout master )19:32
→ chris64 joined19:32
← Targen left19:33
← svetlyak40wt left19:33
nobitanobi but first I need to do a fetch of integration right?19:33
imMute uh, yes19:33
otherwise, integration/master doesn't exist19:33
← martinjlowm-lapt left19:33
← OOPMan left19:34
nobitanobi imMute: I really appreciate all this tutorial you are doing.19:34
→ OOP_Man joined19:34
nobitanobi I think I never understood this so easily19:34
I just did git fetch integration19:34
imMute nobitanobi: it took me a while to get used to it, too.19:34
nobitanobi and at the end I got this: * [new branch] master -> integration/master19:34
however when I do git branch, I get nothing19:35
wereHamster nobitanobi: git branch -a19:35
→ Nikoli joined19:35
nobitanobi right, I get the two remotes19:35
imMute right, that's telling you, "hey, I just made a remote-tracking branch called integration/master that tracks the branch called master on the remote you just fetched"19:35
wereHamster git fetch fetches into remote tracking branches.git branch without any flags show slocal branches19:35
nobitanobi oh okok...19:35
→ fanno joined19:35
nobitanobi I guess it would be more clear if it was integration/master -> master19:35
imMute nobitanobi: that "master" refers to "master" *on the remote*19:35
nobitanobi local -> TO -> remote19:35
guys, this was such a lesson.19:36
imMute technically, I think it should be a <-> since the two are equivalent (at the time of the fetch)19:36
nobitanobi I'm going to finish configuring this.19:36
thank you very much19:36
← segv_ left19:36
nobitanobi I hope I can help you back someday19:36
imMute (well, equivalent except only one of them is actually usable)19:36
IMO, people should rewrite tutorials so that master is only used on one repository - to avoid this kind of confusion.19:37
→ icio joined19:37
→ LekeFly joined19:40
← daniel_-_ left19:41
→ gusnan joined19:41
fdel Is it possible to repair a pack with a SHA 1 checksum mismatch?19:41
fanno hi all i am still having problems making a server script to force a update of a repo to the same version as the remote reop .. how do i do that. only way o can make it happen is to delete the repo and do a new clone ... =(19:42
← jcao219 left19:42
wereHamster fdel: copy the pack from a backup19:42
imMute fanno: the script is calling something like 'git pull' ?19:42
← techhelp2 left19:42
fanno imMute: no i have been using fetch --all and then should reset --hard origin/*branchname* not work ?19:43
imMute fanno: probably19:44
fanno the issue is i get this error message fatal: unable to read tree 0ae5bf67531c7.....19:44
← Nikoli left19:45
← qmanjr5 left19:45
→ cyphase joined19:46
→ mklappstuhl joined19:47
← h0bbit left19:49
→ Nikoli joined19:49
→ mikepack joined19:51
← samir left19:52
→ noyb joined19:53
→ samir joined19:54
← Nikoli left19:55
← AdrienBrault left19:56
← diegoviola left19:56
← TeamColtra left19:57
→ beagleDude joined19:58
→ AdrienBrault joined19:59
← icio left20:00
→ sluther joined20:00
→ sq-one joined20:01
← AdrienBrault left20:01
→ victorbjelkholm joined20:02
← noyb left20:02
→ russt_ joined20:02
→ AdrienBrault joined20:03
← flijten left20:03
← victorbjelkholm left20:03
← russt left20:03
russt_ → russt20:03
← nitrix left20:04
→ Nikoli joined20:04
→ etcetera joined20:06
→ m0viefreak joined20:06
→ lolfrenz joined20:07
→ TheJH joined20:09
_ikke_ fanno: git fsck20:10
→ noyb joined20:10
← nizeguy_ left20:10
← _huoxito left20:11
→ riker2000_ joined20:12
→ michagogo joined20:12
gitinfo set mode: +v20:12
→ sewo joined20:12
michagogo Question: is there a way, in a windows batch file, to check whether or not `git pull` changed anything?20:13
→ nitrix joined20:13
michagogo In other words, I want to issue a git pull command, and then do one thing if it says "already up to date" and another thing if it does something else20:14
I already tried checking errorlevel, but apparently already up to date doesn't count as an error20:15
← riker2000 left20:15
wereHamster michagogo: you should not run pull from an unattended script20:15
michagogo wereHamster: Not unattended20:15
Kre10s_ imMute, thanks for the tip. spoton. seems ssh-keygen comes with msysgit when you install it.20:15
wereHamster michagogo: well, then compare HEAD before and after, and check whether the working tree has conflicts20:16
→ hpa joined20:16
michagogo wereHamster: Hmm?20:16
Nevik lol20:16
michagogo doesn't know a lot about git20:16
wereHamster michagogo: pull=fetch+merge. merge changes HEAD, if HEAD has changed, then pull changed something20:16
sewo Question: two branches: master and mine, mine has master plus cherry picks plus some own changes. is there a way to list all the cherry picks in mine ? or some master/mine log diff command ? something that could help me find out which cherry picks I made in the past20:16
Nevik michagogo: then you probably should read up a bit before plunging into the endeavour of using batch files of all things to script it with :P20:17
wereHamster michagogo: before=<value of HEAD>; git pull; after=<value of HEAD>; if before != after then ...20:17
michagogo Basically, what I have now pulls a repo, and then copies a couple files out and runs javac on them, and then runs java on the package20:17
I'd like to be able to skip the copy and javac parts if nothing has changed to save time20:18
Nevik then just do what wereHamster said20:18
michagogo How do I do that?20:19
wereHamster michagogo: man git-rev-parse20:19
gitinfo michagogo: the git-rev-parse manpage is available at http://jk.gs/git-rev-parse.html20:19
← dr_diamond left20:19
wereHamster the rest you have to figure out yourself.20:19
← setmeaway left20:20
→ rob_w joined20:20
Nevik or pay someone to work with the ugliness that is batch files, lol20:20
→ gv joined20:21
sewo can I make a diff between two branches ?20:21
_ikke_ yea20:21
michagogo Nevik: Is there any better way to do it?20:21
Nevik michagogo: alternatively, learn how to script in windows powershell, or learn bash script and use the git bash that comes with msysgit20:21
wereHamster sewo: git diff <branch1> <branch2>20:21
sewo thx20:21
→ z00mer joined20:22
→ dr_diamond joined20:22
→ setmeaway joined20:23
michagogo "git rev-parse --verify HEAD"?20:23
→ sam__ joined20:24
→ guardian joined20:25
guardian hi20:25
→ shruggar joined20:25
_ikke_ guardian: !hi20:25
gitinfo guardian: [!welcome] Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see http://jk.gs/git/ Take backups (type !backup to learn how) before taking advice.20:26
guardian I made a commit in a branch that has been merged into master. I would like to find that commit, with git log -p20:26
← nitrix left20:26
guardian but it doesn't seem to show what's been made in the branch before being merged20:26
is there an option for that?20:26
wereHamster git log --full-history20:26
→ _huoxito joined20:27
guardian thakn you20:27
← sjhuang left20:28
→ psoo joined20:29
→ sjhuang joined20:31
→ Ose joined20:32
← hinst left20:34
Ose complete noob here, assume I know nothing: can I do a login thing on the git bash (i'm on windows btw) so that I don't need to do the username/password thing every time I push my changes?20:35
← noyb left20:35
→ jimmyeatworld joined20:35
← guardian left20:35
→ guardian joined20:35
→ marshall joined20:35
marshall hey git20:36
← OOP_Man left20:36
gitinfo set mode: +v20:36
arex\\ What git commands accept a git repo URL as a parameter? git clone, git ls-remote, more?20:36
marshall I've done a git checkout at a certain commit in my repo. how do I go to the next one? I'd like to walk back up the history to the last commit I made.20:36
← z00mer left20:37
Nevik arex\\: all that accept remote names, too20:37
fetch, push, etc20:37
← sewo left20:37
arex\\ I'm looking to compare the execution time of the same git command against two different remote repos20:37
Wondering what command(s) to use20:37
ojacobson arex\\: use ls-remote, fetch, and push20:38
→ GeertB joined20:38
ojacobson most remote interactions eventually hit some transport and upload-pack or receive-pack eventually, those three exercise that the most directly out of the porcelain commands20:38
arex\\ Ok, nice20:38
ojacobson (you can use clone rather than fetch, if you don't mind having some fixed overhead for creating a new repo locally in your measurements)20:39
wereHamster arex\\: what exactly do you want to compare? Latency to open a connection? The pack/unpack speed of the remote host?20:39
← dr_diamond left20:39
arex\\ Specifically, I want to compare using two different addresses to a repo (reverse proxy url vs "regular" url)20:39
Someone suggested one seemed faster than the other, day to day20:40
I just want to measure20:40
Nevik cool idea20:40
← Innocentus left20:40
arex\\ I think I got what I need, thanks guys (so far :)20:41
→ dzan joined20:41
← sluther left20:42
→ pantsman joined20:43
← pantsman left20:43
→ pantsman joined20:43
← GeertB left20:43
← jlopez left20:44
→ sluther joined20:44
→ kvda joined20:46
→ marhaban joined20:46
← russt left20:46
← marhaban left20:47
→ rednaks joined20:48
→ techhelp joined20:49
→ cin_ joined20:50
→ Thra11 joined20:50
← cin_ left20:50
→ cinatic joined20:50
← les_sylvains left20:51
cinatic hi20:51
gitinfo cinatic: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.20:51
cinatic what is the best way to change the url from a submodule from git:// to ssh:// (i want to commit changes from the submodule directly)?20:51
_ikke_ cinatic: update it in the .gitmodules file, and then git submodule sync20:52
← beagleDude left20:53
← Thra11_ left20:53
→ Glados__ joined20:53
gitinfo set mode: +v20:54
Glados__ Mornin. I want to "merge" my last two commits into one. Is that possible? I only have a local copy, I never push.20:54
→ svetlyak40wt joined20:55
cinatic _ikke_: awesome thank you20:55
→ russt joined20:55
→ davidbanham joined20:55
m0viefreak yes Glados__20:56
git rebase -i HEAD~220:56
← fanno left20:56
m0viefreak an editor pops up with20:56
pick 12731 commitA20:56
pick 27347 commitB20:56
change second pick to squash20:56
save and exit20:56
Nevik also, !tias20:57
gitinfo Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://sitaramc.github.com/1-basic-usage/tias.html may help with git-specific TIAS.20:57
Nevik and !backup20:57
gitinfo Taking a backup of a git repository is always a good idea, especially when taking advice over IRC. Usually, the best way to TACTICALLY back up a git repo is `git clone --mirror`. However, some unusual maintenance might require `tar cf repo-backup.tar repodir`. Testing in a clone is also an excellent idea. See also http://sethrobertson.github.com/GitBestPractices/#backups20:57
← R1KRDO left20:57
→ hachque joined20:57
→ R1KRDO joined20:57
Nevik Glados__: those are good advice when trying things like this out, so you can play a bit and see what does what20:57
Glados__ Thank you m0viefrak and Nevik!20:57
awesome20:57
Nevik np ;)20:58
← Sigma left20:58
m0viefreak heres a workflow question: assume i pull upstream changes into my local master, and now want to go though all the new changes one by one20:59
→ dr_diamond joined20:59
m0viefreak whats the best (commandline) way to do that?20:59
→ daniel_-_ joined20:59
m0viefreak ive been using something like git log -p --reverse HEAD@{1}..21:00
← Thra11 left21:00
m0viefreak but im missing a way to "jump" from commit to commit21:00
← mikepack left21:00
→ marix88x joined21:01
EugeneKay Going backwards is easy. Forward not quite so much, but still doable21:01
← marix88x left21:02
m0viefreak problem is, the whole thing is in a | less pager, and if one commit is huge i have to keep pressing PageDown21:02
EugeneKay Oh, you want to see diffs21:03
m0viefreak yes21:03
Glados__ m0viefrak: Turns out I cant do it atm, I have unstaged changes, that I would like to commit later and not now. Any fix ?:P21:03
EugeneKay Glados__ - !stash21:04
wereHamster m0viefreak: you can use /^commit to jump to the next commit21:04
EugeneKay Useless bot. man git-stash21:04
gitinfo the git-stash manpage is available at http://jk.gs/git-stash.html21:04
← pandeiro left21:04
→ hwrd|work joined21:04
EugeneKay wereHamster - he wants to view diffs, not checkout21:04
→ marix88x joined21:04
m0viefreak oh, yeah, havent thought of a simple less search21:04
ojacobson m0viefreak: might be easier if you do it the long way21:04
git fetch origin; git log -p master..origin/master21:04
wereHamster EugeneKay: I know.21:04
EugeneKay Oh, I see what you're saying21:04
EugeneKay hides under rock21:04
m0viefreak thats a good idea wereHamster21:04
probably good enough to skip some irrelevant huge-ass commit21:05
← marix88x left21:05
ojacobson or even git log --stat master..origin/master and then git show the commits that are "interesting", if they're the less-frequent case21:05
← R1KRDO left21:06
→ watussi joined21:07
m0viefreak hm yea, invovles a lot of copy pasting tho21:08
← JohnBat26 left21:08
← Sky[x] left21:10
→ asaf joined21:11
Glados__ m0viefreak : I did stash apply, now I should merge?21:11
→ barq joined21:11
m0viefreak after appliying the stash, you are in the previous state21:11
do whatever you want21:11
git stash; <rebase thing i explained earlier>; git stash apply21:12
→ Thra11 joined21:12
Glados__ Please check this out, http://imgur.com/MkaoO21:12
→ AbdolHosein joined21:12
← hachque left21:13
→ hachque joined21:13
Glados__ that looks right?21:14
m0viefreak uhm, dont know21:14
→ Advant joined21:15
AbdolHosein hi to all21:15
gitinfo AbdolHosein: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.21:15
AbdolHosein are anyone here developer of git?21:15
Advant I had deleted a file locally, but somehow it was pushed to remove repository. I deleted file manually, then did git rm to remove reference to hit. I then committed and did a git push, but the file is still showing on my remote repository. How can I get rid of it?21:16
Nevik AbdolHosein: you can just ask your question anyway21:16
someone might know where to point you21:16
← revagomes left21:17
AbdolHosein ok, tnx, it was for making friendship with git developers, coz i wana to know git core; surely will ask certain question later, In sha Allah.21:18
← eijk_ left21:18
→ eijk__ joined21:18
→ sebrock joined21:19
← etcetera left21:19
arex\\ Oh, seems like I have to specify -min -max -avg21:20
m0viefreak Glados__: if the master branch is correct now, you can get rid of the stash using git stash clear21:20
arex\\ I thought the default was to calculate everything21:20
→ giallu joined21:21
→ ankitS joined21:21
Nevik arex\\: we have no idea what youre talking about21:21
arex\\ That's ok, I'm used to that :)21:21
I got it working now anyway21:22
I'll paste it, just for completeness21:22
http://pastie.org/private/jqgbi9zupvptoeofdtmaw21:22
← Advant left21:22
arex\\ I wish it calculated mediam too21:23
median*21:23
← AbdolHosein left21:23
← fdel left21:24
→ Xizor joined21:25
← __class__ left21:25
← Mode-M left21:25
→ maqr joined21:26
← a-l-e left21:26
→ ampz joined21:27
→ kzh joined21:27
← wheezl left21:27
→ marhaban joined21:27
← cenuij left21:27
→ jiunec joined21:27
→ user12 joined21:28
→ flijten joined21:29
← user12 left21:29
← _iron left21:31
→ miphe joined21:35
← marshall left21:40
← j416 left21:41
← arietis left21:42
← myx left21:42
→ beagleDude joined21:43
JPeterson what does --bare in "git init --bare" do?21:43
FauxFaux JPeterson: man git init21:43
gitinfo JPeterson: the git-init manpage is available at http://jk.gs/git-init.html21:43
→ Synthead joined21:43
crocket JPeterson, "man git-init" will man you up.21:43
gitinfo JPeterson: the git-init manpage is available at http://jk.gs/git-init.html21:43
← sebrock left21:43
← svetlyak40wt left21:44
JPeterson no it doesnt21:44
"Create a bare repository." doesnt mean anything more than --bare21:44
crocket JPeterson, --bare means a bare repository.21:44
FauxFaux And Google has no idea what a bare repository is?21:44
crocket JPeterson, In a bare repository, you can't checkout.21:44
JPeterson ok i guess i wont use it21:45
crocket There is no working directory in a bare repository.21:45
← agile left21:45
crocket JPeterson, If you host your git repositories on a server, you need bare repositories.21:45
← michagogo left21:45
→ Turicas joined21:45
imMute JPeterson: if you want to push to a repository, it needs to be a bare repository21:46
crocket A hosted repository shouldn't have a working directory.21:46
JPeterson ok i guess ill use bare21:46
sjk grins21:48
← legnaleurc_ left21:48
← danillonunes left21:48
→ legnaleurc joined21:48
→ danillonunes joined21:49
→ Hounddog joined21:49
crocket JPeterson, Also, to make an offspring, you need a bare woman.21:49
I like bare.21:49
JPeterson i see no reason why women shouldn't always be bare21:50
→ klj613 joined21:50
FauxFaux How would you mark them as your property otherwise?!21:50
crocket JPeterson, If they should always be bare, the apparel industry will go broke.21:50
JPeterson (besides being fat)21:51
← leeN left21:56
← psoo left21:56
→ icio joined21:57
← WinstonSmith left21:58
→ myx joined21:58
← sirdancealota left21:59
→ jcao219 joined21:59
JPeterson why does git clone complain "info/refs not found" from a http "git init --bare" but not on a local "git init --bare"?21:59
→ _Vi joined22:00
← AdrienBrault left22:00
FauxFaux Doesn't git clone have more output than that?22:00
→ WinstonSmith joined22:01
← sluther left22:01
JPeterson the info/refs is not there, but that's expected, git init --bare doesnt create it22:02
→ AeroNotix joined22:02
AeroNotix can I have a remote set up like: remote add name user@$(command) ?22:03
cbreak why bother?22:03
imMute AeroNotix: what on earth for?22:04
AeroNotix because I have a remote that changes IP22:04
imMute AeroNotix: so use dynamic DNS.22:04
cbreak use a domain name.22:04
→ noyb joined22:04
cbreak or an ssh alias22:04
AeroNotix I'll look into those22:05
thanks22:05
cbreak domain names are easier22:05
if you have a mac, they pick their own name via mDNS22:05
AeroNotix from the preliminary stuff I am reading it sounds it's for LAN only22:06
?22:06
Nevik if you have a mac, you have a fuckload of pointless zeroconf traffic22:06
dermoth_ → dermoth|home22:06
cbreak yes, it's local network only by intention22:06
unless you have a router that routes local broadcast22:06
which is quite unusual22:06
AeroNotix then no, this needs to be over the internet22:06
cbreak then use a free dynamic dns service22:07
I use dyndns22:07
AeroNotix looking into it22:07
JPeterson "git --git-dir=../bare init --bare; git clone ../bare .; cat ../bare/info/refs" return for example "cat: ../bare/info/refs: No such file or directory". but if "../bare" is replaced with a http path git clone return the message "fatal: http://.../info/refs not found: did you run git update-server-info on the server?" why and how do i fix this?22:07
← _Vi left22:07
← davidbanham left22:08
AeroNotix seems like I can replicate what this dyndns malarky is doing by just having one static IP and some bash scripts22:08
cbreak JPeterson: fix what?22:08
AeroNotix: you said you had a dynamic IP22:09
imMute JPeterson: did you run update-server-info on the server?22:09
JPeterson cbreak: git clone int he command where "../bare" is replaced with a http path22:09
imMute: no why should i?22:09
AeroNotix cbreak: I have one static I can use22:09
imMute JPeterson: oh I dunno, the error message asked if you did, so it's probably important22:09
cbreak JPeterson: you can clone via http if you have a server that supports smart http22:09
or if you have a dumb http server with a git repo in which git update-server-info was ran22:09
JPeterson ok thx22:10
cbreak I recommend ssh though22:10
AeroNotix oh also, anyone know a good resource for editing the numbers at the top of a hunk edit?22:11
→ _Vi joined22:11
imMute AeroNotix: the what?22:12
cbreak why do you want to edit those?22:12
they are just marker for diff22:12
AeroNotix but when you do a git add -p then edit the hunk, I mean22:12
cbreak no need to edit them22:12
just leave the numbers alone :)22:12
AeroNotix huh? Pretty sure you do↵22:12
cbreak nah22:13
edit the text22:13
imMute AeroNotix: pretty sure you don22:13
AeroNotix wut22:13
cbreak you can add + lines, or remove lines22:13
_ikke_ If you edit them, the patch won't apply anymore22:13
cbreak or remove the -22:13
just don't touch the numbers22:13
AeroNotix right22:13
_ikke_ Those numbers are starting points, not endpoints22:14
→ fuzzybunny69y joined22:14
← Dweezahr left22:14
→ Dweezahr joined22:14
imMute what is this horseshit?? 'git add -p' Can't locate Error.pm in @INC22:15
← yshh left22:16
← dreiss left22:16
frogonwheels imMute: add-p must be a perl module. is perl not installed properly?22:16
→ jfs joined22:16
← jfs left22:16
→ jfs joined22:16
imMute frogonwheels: it sure as hell should be.22:16
cbreak sounds like it can't locate Error.pm in @INC...22:17
what ever that means.22:17
imMute cbreak: Error.pm isn't installed, that's what it means.22:18
frogonwheels imMute: what system?22:18
imMute frogonwheels: Arch22:18
→ drizzd_ joined22:18
_ikke_ imMute: Have installed git-git, or the precompiled version?22:19
imMute wait, no, thats the Ubuntu 12.04 system22:19
either way, I installed Error.pm and it works fine22:19
→ user12 joined22:21
→ cybersphinx joined22:21
→ gary_golden joined22:21
← user12 left22:21
← techhelp left22:21
← drizzd left22:22
→ techhelp joined22:22
→ gittish joined22:24
→ qmanjr5 joined22:25
← the_cybersphinx left22:25
← Ose left22:25
qmanjr5 I just got "__git_ps1: command not found" error from Bash, after using that command for the past week or so. It's in my .bashrc. Anyone have any insight?22:25
imMute qmanjr5: did you update any bash or git related things?22:25
← gary_golden left22:27
frogonwheels qmanjr5: I think there was a slight change in where that was sourced from iirc.. or you may need to source the file yourself .uumm.22:27
→ m0ltar joined22:27
frogonwheels qmanjr5: it's up to your distro how that file gets sourced22:28
qmanjr5 imMute: No. no updates at all today.22:28
← sq-one left22:28
qmanjr5 frogonwheels: The weird thing is that it was working about 20 minutes ago.22:28
imMute qmanjr5: open a new shell?22:28
qmanjr5 Having looked through my commit history (I keep dotfiles on github) nothing that would affect git_info has been changed22:28
frogonwheels qmanjr5: hmm.. strange22:28
qmanjr5 imMute: Tried. Relogged as well.22:28
← dinkytoy left22:29
← watussi left22:29
← flijten left22:30
→ mishok13 joined22:30
← rob_w left22:31
← Dweezahr left22:31
→ Dweezahr joined22:31
qmanjr5 Even weirder, the only time I get the "__git_ps1: command..." error is when I source .bashrc while in a git repo22:32
Otherwise, nothing.22:32
→ yshh joined22:33
← sirdancealot left22:33
→ sirdancealot7 joined22:34
qmanjr5 I've sourced /etc/bash_completion_d/git in .bashrc, still nothing22:35
→ etcetera joined22:35
→ smanuk joined22:38
RichiH qmanjr5: i know this is not what you are asking, but zsh has _extensive_ prompt info for git22:38
just saying22:38
qmanjr5 Heh. I used zsh for a while22:38
Wasn't for me.22:38
I've used Bash since first coming to Linux. Too used to it to change to a whole new shell22:38
← smanuk left22:39
→ smanuk joined22:39
← smanuk left22:39
→ smanuk joined22:40
← smanuk left22:40
→ smanuk joined22:41
← cinatic left22:41
→ JSharpe joined22:41
← smanuk left22:42
→ ISF joined22:43
← danillonunes left22:44
← ojacobson left22:44
← etcetera left22:44
← Glados__ left22:45
JPeterson how do i use sshpass with git?22:45
→ tenmilestereo joined22:46
← Bass10 left22:46
RichiH ssh-add ~/.ssh/id_*[^pub]22:46
→ etcetera joined22:46
← ankitS left22:47
← tenmilestereo left22:48
→ w00tner joined22:48
← AaronMT left22:48
← marhaban left22:49
→ marhaban joined22:49
← spaceonline left22:50
→ tenmilestereo joined22:50
← sam__ left22:52
← mishok13 left22:53
← berserkr left22:53
← longbeach left22:53
← Dweezahr left22:54
→ davidbanham joined22:54
→ Dweezahr joined22:54
→ berserkr joined22:54
← gittish left22:55
← nobitanobi left22:55
→ philips_ joined22:56
← jcao219 left22:57
← Dweezahr left22:58
→ Dweezahr joined22:59
← chris64 left22:59
← robustus left23:02
← ampz left23:05
→ davidban_ joined23:06
← davidban_ left23:07
← _Vi left23:07
→ jcao219 joined23:08
← davidbanham left23:08
← etcetera left23:09
kilk → orwhal23:09
→ kennethreitz joined23:09
← marhaban left23:12
← pantsman left23:15
← techhelp left23:16
→ Khisanth joined23:18
→ sluther joined23:19
JPeterson can i use http with --git-dir as in "git --git-dir=http://.../.git log"?23:20
← v0n left23:23
FauxFaux No.23:23
← Hounddog left23:23
→ _Vi joined23:24
cbreak JPeterson: git directories are in the local file system23:25
← kennethreitz left23:26
eph3meral bash is a pain to get working right with git branch reporting23:26
← beagleDude left23:26
eph3meral zsh is very easy in that regard23:26
← sluther left23:26
eph3meral also, I like that zsh will still complete things even if I make typos23:26
comps it has its flaws23:33
→ robbyoconnor joined23:34
eph3meral so far I haven't really encountered any23:34
← tenmilestereo left23:34
eph3meral then again I don't push my shell super hard23:34
w00tner when i install GIT on windows... do i set it on opcion: 1. bash only 2.- from the window command prompt or 3.- run git and included unix tools fromt win command prompt23:36
→ lethee joined23:37
FauxFaux w00tner: Doesn't it have a recommendation?23:37
eph3meral w00tner: it depends on what you want23:37
w00tner: if you don't know what you want, I would actually recommend git bash personally23:37
w00tner i just code for some guys they use git23:38
→ Internet13 joined23:38
w00tner just to update scripts23:38
bash only will do it?23:38
FauxFaux uses the latter; means that when you accidentally run a unix command from a cmd shell it kind of works.23:38
eph3meral they all will, but I recommend option #123:38
w00tner is it going to work in cmd.exe ?23:39
eph3meral no23:39
FauxFaux What do you think?23:39
w00tner i think no23:39
eph3meral git bash is nicer, no colors in cmd.exe for example23:39
trivial, possibly, but it matters tome23:39
w00tner so you first install GIT. and then you install GITHUB or am i all wrong ?23:40
i mean github is just the service to host the files23:40
eph3meral you're all wrong23:40
frogonwheels w00tner: I use option 2 (if you want to be able to use git from cmd.exe)23:40
w00tner thanks frogon23:40
← jimmyeatworld left23:40
w00tner i just installed github for windows and login... but if i got to console and type "git clone repourl"23:41
git is not installed... so i first install GIT with option 2 ?23:41
offby1 the suspense is killing me23:41
← kermit left23:41
→ glennpratt joined23:42
offby1 w00tner: I wouldn't be surprised if github for windows has a special "run a git shell" command somewhere, and that nothing will work unless you use that command to start your console.23:42
← adamben left23:42
← glennpratt left23:42
→ dreiss joined23:42
w00tner ok, i will read more about it thanks23:43
→ SBoudrias joined23:43
eph3meral good luck getting your ssh keys to work23:44
→ kermit joined23:45
w00tner thanks for the help23:46
← hotovson left23:46
← Turicas left23:46
Akufen w00tner: try rightclicking in explorer (or on a folder perhaps)23:47
should say something like "git bash here"23:47
you can't just use it in the console you start with running "cmd"23:47
← Jippi left23:48
← Internet13 left23:49
→ adamben joined23:49
→ glennpratt joined23:50
→ hotovson joined23:51
← miphe left23:51
→ Goplat joined23:53
← JaredMiller left23:54
← jcao219 left23:55
frogonwheels w00tner: if you use option 2, it installs a 'git.bat' and 'gitk.bat' in the path which wrappers the real git.23:55
→ Internet13 joined23:55
eph3meral that all depends on how he installed it23:55
which I don't think even he knows what he did23:55
→ ijuma joined23:56
← hotovson left23:56
frogonwheels w00tner: if you want a layer of GUI insulation try Smartgit and/or Git Extensions23:56
← klj613 left23:56
← glennpratt left23:56
offby1 guis are for the weak!23:56
frogonwheels offby1: :) they have their place.23:57
RichiH guis are for people with too much time, or for people who consume picture/video-based media23:57
← Synthead left23:58
frogonwheels RichiH: guis _can_ save time. Knowing when to use them, and when not to, is the trick.23:58
→ spaceonline joined23:58
frogonwheels RichiH: for eg. git gui vs git commit -p ... I'll take the former where it is available.23:58
← berserkr left23:59
comps -p ?23:59
frogonwheels comps: man git-commit23:59
gitinfo comps: the git-commit manpage is available at http://jk.gs/git-commit.html23:59
comps oh23:59
that's new23:59
frogonwheels not particularly23:59

Logs Search ←Prev date Next date→ Channels Documentation