IRCloggy #git 2015-05-05

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.

2015-05-05

← whitby left00:00
← apurcell left00:00
← Ryanar left00:01
← cdown_ left00:01
→ modocache joined00:02
← SimonNa left00:02
← Impaloo left00:02
→ cdown joined00:03
→ Sonicbit joined00:04
→ e^0_ joined00:04
→ vgarg joined00:04
← beaconwriter left00:04
← Joseph__Silber left00:04
← vgarg left00:04
← sgen_ left00:05
→ dstarh joined00:06
→ ixjlyons joined00:06
← m0ltar left00:06
← modocache left00:06
← dstarh left00:07
← f3lp left00:07
← akiva left00:08
← robustus left00:08
← micechal_ left00:08
← baweaver left00:09
← jgardella left00:10
← mjuszczak left00:10
→ Impaloo joined00:10
← devoldmx left00:11
→ robustus joined00:11
→ duderonomy joined00:12
AMERICAN_PSYCHO → AMERICA__00:12
← Akagi201 left00:12
→ otter768 joined00:13
→ devoldmx joined00:13
→ baweaver joined00:13
→ ashokraj_ joined00:14
→ rcn joined00:15
→ jason237 joined00:15
← mizu_no_oto left00:15
→ sohail joined00:15
← FreezingCold left00:16
← PeterBooker left00:16
← stantonk left00:16
→ ErKa joined00:17
← otter768 left00:17
← ashokrajar left00:17
← MattMake_ left00:18
← EvilPenguin left00:18
Gianormagantrous Am I correct to assume that this http://www.git-scm.com/book/en/v2/Git-on-the-Server-Setting-Up-the-Server does give a user (given that said user has his public key in the user git authorized_keys file) access to every git repository that the user git has access to?00:19
→ Ryanar joined00:20
→ DerisiveLogic joined00:21
→ treehug88 joined00:21
← DerisiveLogic left00:21
→ DerisiveLogic joined00:21
Gianormagantrous With the authorisation schema presented in this tutorial, is every project bound to have a different unix user (git-shell bound)?00:22
← s8321414 left00:22
← devoldmx left00:22
→ f3lp joined00:22
← cdown left00:22
← r00tWearsRedHats left00:23
→ cdown joined00:23
→ MattMaker joined00:23
→ devoldmx joined00:24
← EminenceHC left00:25
→ r00tWearsRedHats joined00:25
← dsantiago left00:26
← rubyonr__ left00:26
← nottombrown left00:26
← dreiss left00:26
← cdown left00:28
→ nottombrown joined00:29
→ geomyidae_ joined00:29
→ zequence joined00:29
← AMERICA__ left00:30
← Quevin left00:30
← diegoviola left00:34
→ nottombr_ joined00:34
← nottombrown left00:34
→ mizu_no_oto joined00:35
← ashokraj_ left00:35
← bollullera left00:35
→ ashokrajar joined00:35
→ devoldmx3 joined00:38
← harish left00:38
← yqt left00:39
→ trang joined00:40
← ewong left00:41
← devoldmx left00:41
← gsingh93 left00:42
→ ewong joined00:44
→ soul11201 joined00:45
→ chrisgeorge joined00:45
← AaronMT_ left00:46
← cagedwisdom left00:47
← treehug88 left00:47
← nottombr_ left00:47
← mostlybadfly left00:48
← soul11201 left00:50
→ clarkpan joined00:51
→ ahr3n joined00:51
← clarkpan left00:53
← devoldmx3 left00:54
→ devoldmx joined00:55
← StuartMI left00:55
→ clarkpan joined00:56
← Sonicbit left00:56
← denete_ left00:57
← baweaver left00:57
← rcn left00:57
→ JosephSilber joined00:58
← Syzik left00:58
← JosephSilber left00:58
→ JosephSilber joined00:59
→ cagedwisdom joined00:59
← devoldmx left01:00
← Sasazuka left01:01
→ modocache joined01:02
→ oojacoboo joined01:05
← mikiones left01:05
← Vampire0 left01:05
← duderonomy left01:05
→ diegoviola joined01:06
→ dsantiago joined01:06
→ mikiones joined01:06
→ baweaver joined01:06
→ watabou joined01:07
← modocache left01:07
→ weiyang joined01:07
→ Vampire0 joined01:08
← hypera1r left01:09
→ devoldmx joined01:09
→ gsingh93 joined01:10
→ hyperair joined01:10
← mikiones left01:10
← tvw left01:12
→ Jelmer_ joined01:14
→ Akagi201 joined01:14
→ hahuang65 joined01:15
→ rubyonrailed joined01:15
← Wulf left01:19
← jokester left01:20
e^0_ what are context lines in context diff ?01:22
→ skorgon joined01:23
deltab lines that aren't changed but help recognise where the changes fit in01:23
← excelsiora left01:24
→ edude03 joined01:25
e^0_ deltab: ok so unchanged lines are known as context lines ..01:25
→ cppking joined01:25
→ mjuszczak joined01:26
deltab right01:26
they're the ones that start with a space rather than + or - or @01:27
→ stantonk joined01:27
→ denete joined01:27
→ EminenceHC joined01:27
→ m0ltar joined01:27
→ bb010g joined01:28
gitinfo set mode: +v01:28
← rubyonrailed left01:29
→ hackel joined01:29
← ashokrajar left01:30
cppking hello guys , what's the appropriate way to add post-receive hook into a repo, just go to bare repo and modify it?01:30
→ linuxboytoo joined01:30
← daedeloth left01:31
→ devoldmx3 joined01:32
← EminenceHC left01:32
→ jokester joined01:32
← stantonk left01:32
← denete left01:33
← CheckDavid left01:34
← devoldmx left01:34
hackel I need some advice on best practice for maintaining a fork. I've created separate topic branches for each change I've made (for upstream PRs), but need to have each of them applied for my project, so I thought I would maintain a branch just for my specific project that applies the changes from each of these topic branches to the latest upstream. How should I be maintaining them? I was fetching upstream and rebasing on each topic branch,01:34
but this is quite time-consuming and probably doesn't make sense.01:34
← edude03 left01:34
← Jelmer_ left01:35
← edmundinho left01:35
← oojacoboo left01:36
ldlework hackel: are you actively utilizing these branches for building/running?01:36
if not, its probably not critical to keep each branch you're working on updated all the time01:36
just do it when you start working on that branch, its just two commands.01:36
this is not to say there is a better way, I don't know of one01:37
hackel ldlework: No, I'm really just thinking of them as patch files.01:37
ldlework hackel: then it only matters that you rebase when you're either submitting them for review/merge, or when you want to do additional work on them01:37
It might not even matter for the second case, if your work doesn't change anything that has changed since you last rebased/branched01:38
→ ThinThread joined01:40
ThinThread hm. im new to git and after creating my first repo realize i want to do it under a different user. can i move it?01:40
← thiago left01:40
← ErKa left01:40
← linuxboytoo left01:41
hackel ldlework: So basically, I would just merge the changes from the topic branches if/when they change and not worry about rebasing?01:41
← gopar left01:41
hackel ldlework: I actually cherry-picked the specific commits from those branches into my project branch, but that probably wasn't necessary.01:42
kadoban ThinThread: repos are just files, you can move it, change ownership, etc., git won't care. Just make sure it's readable/writable as the user you want to use to mess with it.01:42
← pheaver left01:43
→ zacts joined01:43
← pks left01:43
← ixjlyons left01:44
→ nowhere_man_ joined01:44
← delinquentme left01:45
← nowhereman left01:45
→ jstimm joined01:45
→ pks joined01:45
← iamtakingiteasy left01:45
ldlework hackel: update when you work. update when you submit for review. there's probably no need to have something manage this for you.01:45
→ Sal joined01:45
Sal hi can someone help me?01:46
i renamed a file from viewincomes to viewIncomes01:46
and now it does commit it01:46
← imv left01:46
→ Dorf joined01:47
← lqi left01:47
Sal i get : pathspec 'viewIncomes' did not match any file(s) known to git.01:47
→ lqi joined01:48
kadoban Sal: Tell git about the move: 'git mv viewincomes viewIncomes', then you'll have to commit for it to actually record that change in a commit.01:48
Briman → Briman|off01:48
Sal i'm using hit from intellij01:48
and i haven's seen anything for that01:49
e^0_ deltab: ok :)01:49
Sal kadoban, any of these commands: http://i.imgur.com/OiR8S9x.png01:50
kadoban Sal: *shrug* figuring out a gui is up to you. Not many people use them here.01:50
Sal oh01:50
kadoban Sal: IMO you should learn the command line, it's much more powerful and sane than any git gui I know about.01:50
Sal this is what i find really strange01:51
→ beaconwriter joined01:51
← majorseitan left01:51
Sal there are always more and more command line tools01:53
hackel ldlework: Thanks for the advice01:53
Sal didn't steve say that the future would be a mac with a mouse?01:53
milki mac and mouse01:54
Sal anyway, thanks for your help.01:54
→ edude03 joined01:54
hackel Sal: Steve also thought his users were too stupid to handle a second mouse button. Not someone you want to be taking advice from!01:54
Sal :)01:55
kadoban Sal: Well, git is highly related to linux, especially since linus wrote the thing to start with. So it'd be safe to say that the general 'git' community has different feelings on that.01:55
Sal yep, i understand that01:55
→ jonesinator joined01:56
kadoban But regardless, I just don't know of a GUI that could have a prayer of keeping up. Git commands are pretty intricate01:56
→ rubyonrailed joined01:56
ldlework tig is amazing01:56
it doesn't do everything but it sure does 80% of what I do with git day to day01:56
and its curses, so its just keybind based (in the terminal)01:57
→ gopar joined01:57
→ eka joined01:57
ldlework Sal: if you're going to go learn about how to be more proficient in a terminal, you should start with tmux (that's just some unrelated general advice, good luck)01:57
Sal ldlework, sincerely, i came from Unix system V and cp/m, returning to a command line doesn't give me a good feeling02:00
ldlework Sal: the commandline is amazing these days02:00
Sal i know, everything is returning command line. Guys are getting too lazy to make gui02:02
← rubyonrailed left02:02
deltab it's not that02:02
ldlework Sal: I just made a curses version of the docker cli, it was a substantial amount of UI work :)02:03
deltab there's a limit to how much you can put into menus etc. and remain comprehensible02:03
back at the start of the Web people would find things by clicking through Yahoo's directory02:04
hackel Sal: "Returning"? When did it go away?02:04
→ zivester joined02:05
→ modocache joined02:05
Sal hey, about the mv syntax...02:05
deltab but that didn't scale as the web exploded: Yahoo, DMOZ etc. couldn't update quickly enough, and it took too long to find things in them02:05
Sal is it git mv newFile oldFile ?02:06
→ duderonomy joined02:06
deltab old new02:06
← dougsland left02:06
deltab same as with mv (and cp and ln)02:06
Sal no, mv A B moves A to B02:06
so new to old02:06
deltab existing name first, then the new one02:07
← baweaver left02:07
← ewong left02:07
Sal fatal: destination exists02:07
ok, i give up02:09
deltab you already did the rename, didn't you?02:09
← eka left02:09
Sal i had a file, lets say abc02:09
i committed it as abc02:09
← gsingh93 left02:09
Sal then i renamed it to aBc02:09
and now it doesn't commit anymore02:10
← Consuela left02:10
← modocache left02:10
← Noldorin left02:10
← scientes left02:10
Sal now, i have it on disk as aBc and in git as abc02:10
deltab you didn't rename it using git mv, so git doesn't know about it02:10
→ ewong joined02:10
Sal i know, but its not accepting mv02:10
deltab when you try to use git mv, it tries to move the file again02:11
Sal i get a fatal msg02:11
ok, so what should i do then?02:11
deltab the file's already at its destination, and git doesn't understand that02:11
hackel You can just use git mv -f02:11
← mjuszczak left02:11
deltab no02:11
the simplest thing is to rename it back, then git mv02:11
Sal oh02:12
i got it02:12
hackel I always thought that git mv didn't actually do anything other than delete and re-add the file?02:12
→ echo-area joined02:12
deltab alternatively you can git add the new name and git rm --cached the old one02:12
← zacts left02:12
Sal ok, now on disk its abc, like on gits first commit02:12
now?02:12
mv aBc abc ?02:13
deltab git mv viewincomes viewIncomes02:13
Sal ok02:13
→ alex1a joined02:13
→ otter768 joined02:13
Sal datal, destination exists02:14
fatal02:14
deltab huh02:14
what does git status show?02:14
Sal i see that in destination it already is with uppercase char02:14
deltab is it listing the file as added/deleted?02:15
Sal i don't know about all that02:15
sorry02:15
deltab what does git status show?02:15
Sal but liek i said, i just use it by a click02:15
→ modocache joined02:16
deltab looks like the GUI doesn't ahndle renaming within git02:16
← clarkpan left02:16
Briman|off → Briman02:16
Sal no, i'm using the git bash terminal02:17
→ clarkpan joined02:17
Sal anyway, should i delete the .git dir?02:17
deltab no02:17
Sal is there a way to delete only that file from git?02:18
← sebhoss left02:18
← otter768 left02:18
deltab yes, but in a way that's what you're already trying to do02:18
Sal ok, so there's no solution?02:19
→ oojacoboo joined02:19
Sal i have to keep this file out of the repo?02:19
deltab to git a rename is simply deleting in one place and adding in another02:19
there is a solution02:19
I just don't fully understand the state of your system02:19
the output of git status would help with that02:20
→ michaeljdennis joined02:20
→ Goplat joined02:20
deltab git status viewincomes viewIncomes02:20
→ felixjet joined02:21
← ahr3n left02:22
← michaeljdennis left02:22
← felixjet__ left02:23
← leeN left02:24
cppking how to add post-receive hook into a repo??02:24
→ thiago joined02:24
← mizu_no_oto left02:24
cppking I can only do it in bare repo, If I add it in a non-bare repo, It won't be pushed when I use "git push"02:25
→ APerson_ joined02:26
Sal deltab, Your branch is ahead of 'origin/master' by 1 commit.02:26
(use "git push" to publish your local commits)02:26
→ darkbasic joined02:26
deltab Sal: no mention of view[iI]ncomes?02:27
Sal nop02:27
deltab so what git knows matches the state of the files02:27
Sal last row was: nothing to commit. working directory clean02:27
deltab does the file have the name you want?02:28
if not, git mv old-name new-name02:28
Sal its not commiting02:28
i did that many ways02:29
i don't know what does git have02:29
i only know that the one i'm working on has a uppercase I02:29
← clarkpan left02:29
→ stantonk joined02:29
Sal many were telling me to now use git because soon or later you'll get messed up02:30
:(02:30
→ rchavik joined02:31
→ dougsland joined02:31
← jason237 left02:33
← edude03 left02:33
Sal ok, i renamed it adding some chars at the end of the file, and it commit02:33
renamed it back to original, and it commit again02:34
i think it was a stupid problem of character case between windows sys and linux sys02:34
thanks anyway02:35
← Sal left02:35
→ Lyqyd joined02:36
← cybersphinx left02:36
← hahuang65 left02:38
→ the_cybersphinx joined02:38
→ hahuang65 joined02:38
← dougsland left02:38
→ _2_misty joined02:40
← _2_misty left02:41
← Dorf left02:42
deltab oh, a Windows system02:42
case-ignoring comparisons02:43
→ beaconwriter_ joined02:43
← durham left02:44
← hackel left02:45
← beaconwriter left02:45
→ felixjet_ joined02:46
← NightQuest left02:47
→ Jelmer_ joined02:48
← dustinm left02:48
← felixjet left02:48
→ nutron joined02:49
→ devoldmx joined02:49
← devoldmx3 left02:49
← lqi left02:50
→ donmichelangelo joined02:50
deltab can't rename the file just to change case because the new name is the 'same' as the existing one, so they conflict02:50
← mellernoia-work left02:51
→ lqi joined02:51
← APerson_ left02:51
← michelangelo left02:53
← weiyang left02:57
← Akagi201 left02:57
→ Akagi201 joined02:58
← modocache left02:59
→ modocache joined02:59
← Err404NotFound left03:03
← Akagi201 left03:04
← beaconwriter_ left03:05
→ Akagi201 joined03:05
← Dougie187 left03:07
→ dustinm joined03:08
→ beaconwriter_ joined03:09
→ weiyang joined03:09
← cavallari left03:10
→ apurcell joined03:10
→ clarkpan joined03:12
→ linuxboytoo joined03:12
← m0ltar left03:12
→ dreiss joined03:13
→ dol-sen_ joined03:15
→ cromero joined03:15
→ delinquentme joined03:16
← cgar left03:16
← beaconwriter_ left03:16
→ harish joined03:18
→ nettoweb joined03:21
← nettoweb left03:23
→ hgl- joined03:23
← hgl left03:24
hgl- → hgl03:24
→ Error404NotFound joined03:24
→ otter768 joined03:25
Hello71 → axu03:27
→ EvilPenguin joined03:27
← dol-sen_ left03:28
→ dol-sen_ joined03:28
dol-sen_ → dol-sen03:29
← dol-sen left03:29
→ ahr3n joined03:31
→ Dragooon joined03:33
← otter768 left03:33
← stantonk left03:34
→ otter768 joined03:35
← duderonomy left03:35
← jr3 left03:36
← kadoban left03:37
← Dragooon left03:38
← dropdrive left03:39
← Ryanar left03:40
→ gfixler joined03:41
→ spinningarrow joined03:42
→ dropdrive joined03:43
spinningarrow git deleted one of my files, but I can't find this information in the history. what's going on?03:43
git log --follow -p -- <file-path> only shows when the file was created03:43
but not when it was deleted03:43
→ pheaver joined03:46
← e^0_ left03:46
→ clarkpan_ joined03:48
→ durham joined03:48
deltab spinningarrow: I don't know why that didn't work for you, but you could try an interactive viewer such as tig03:49
← durham left03:49
deltab (use t to switch to tree view for the selected commit)03:49
→ durham joined03:49
→ gsingh93 joined03:52
→ e^0_ joined03:52
← devoldmx left03:52
thiago spinningarrow: then it wasn't deleted03:52
try without --follow03:52
← clarkpan left03:52
→ alvaro_o joined03:52
← weiyang left03:52
spinningarrow thiago: I don't see the file's removal anywhere :(03:53
thiago how do you know it was removed?03:53
spinningarrow it's not in my working copy?03:53
thiago that doesn't mean it was removed from Git03:53
git status. Does it show?03:54
spinningarrow I didn't mean it was removed from git03:54
nope it's not there03:54
there's a merge commit where it disappears03:54
← clarkpan_ left03:54
spinningarrow but that or it's parents don't show anything either03:54
thiago was the file present in the first parent?03:54
→ clarkpan joined03:55
spinningarrow thiago: let me double check03:55
← alex1a left03:55
→ beneggett joined03:57
→ nettoweb joined03:57
→ effi joined03:59
← oojacoboo left03:59
→ mostlybadfly joined04:00
← effi_ left04:01
← nettoweb left04:02
→ Consuela joined04:03
← hcc23 left04:04
← sohail left04:05
← otter768 left04:09
→ Dragooon joined04:10
← sdothum left04:11
← linuxboytoo left04:11
→ linuxboytoo joined04:12
← aarobc left04:12
→ Tommy[D]_ joined04:13
→ subhojit777 joined04:13
← linuxboytoo left04:16
← trang left04:16
← Tommy[D] left04:16
← cbonobo left04:17
← JanC left04:17
→ edmundinho joined04:18
→ hithard joined04:18
← lqi left04:19
← subhojit777 left04:21
→ lqi joined04:22
← cssko left04:24
→ rubyonrailed joined04:24
Briman → Briman|off04:25
← lindenle left04:28
← beneggett left04:29
→ trang joined04:30
→ JanC joined04:31
← madewokherd left04:32
← Dragooon left04:33
→ highcup joined04:36
→ swoorup__ joined04:36
→ subhojit777 joined04:37
← subhojit777 left04:38
→ subhojit777 joined04:38
→ lindenle joined04:38
← gsingh93 left04:40
→ moretti joined04:41
← durham left04:43
→ weiyang joined04:44
→ rubyonra_ joined04:44
→ scientes joined04:45
← scientes left04:45
→ scientes joined04:45
→ stantonk joined04:45
← scientes left04:45
← moretti left04:45
→ scientes joined04:45
← scientes left04:45
→ scientes joined04:45
← rubyonrailed left04:46
← scientes left04:46
→ scientes joined04:47
← scientes left04:47
→ scientes joined04:47
← scientes left04:47
→ scientes joined04:48
← scientes left04:48
→ scientes joined04:48
→ vgarg joined04:48
→ MechtiIde joined04:52
← stantonk left04:52
→ _1_itzmichael joined04:53
← michael_mbp left04:53
← _1_itzmichael left04:55
→ ReekenX joined04:56
→ jason237 joined04:56
→ michael_mbp joined04:56
← Consuela left04:57
← delinquentme left04:57
→ devoldmx joined04:57
← EvilPenguin left04:57
← skorgon left04:58
→ kp666 joined04:58
← geomyidae_ left04:58
→ Consuela joined04:58
→ _1_itzmichael joined04:59
← Consuela left04:59
← _1_itzmichael left04:59
→ Consuela joined05:00
← modocache left05:00
→ delinquentme joined05:01
← ReekenX left05:01
← devoldmx left05:01
→ nightspades joined05:02
→ duderonomy joined05:04
→ bannakaffalatta joined05:05
e^0_ what are hunks exactly in contextual diff ?05:05
← traxo_ left05:06
e^0_ it is the *** 1,3 *** random\n information\n *******05:06
the information between the asterisks or the starting and the end part specified in ***05:07
→ AMERICAN_PSYCHO joined05:07
grawity 'hunk' refers to the entire individual change – header, old version, new version05:07
so everything between the ********* lines, I'd say05:08
e^0_ ok05:08
grawity ...that said, where did you get a context diff from05:09
is someone sending you patches from Plan9? >_>05:09
e^0_ i was trying to understand how to work with diff and patch so stumbled upon a tutorial on the net which first states contextual diff and then unified diff05:09
→ luriv joined05:10
→ beautifulmind joined05:13
← apurcell left05:14
→ ReekenX joined05:14
← hithard left05:14
e^0_ grawity: also what's the diff between *** 1,3 *** and --- 1,4 ---05:15
grawity that just seems to be how context diffs indicate "old version" and "new version"05:15
e^0_ ok05:15
→ cbonobo joined05:17
→ hithard joined05:18
→ ehmatthes joined05:18
← trang left05:19
← gopar left05:20
← delinquentme left05:21
Briman|off → Briman05:21
→ mutbuerger joined05:21
← roope left05:22
← antimatroid left05:22
→ antimatroid joined05:23
← lindenle left05:23
→ pantsman- joined05:23
← Akagi201 left05:24
→ brucelee joined05:25
→ roope joined05:25
→ Akagi201 joined05:25
brucelee i have access to a repo that contains a config file i need to change everytime i do a git pull, is there a way i can git pull and not pull that file?05:26
← Ratler left05:26
grawity nope05:26
← Akagi201 left05:27
brucelee any other options aside from having to change that file every single time?05:27
grawity convince the repo's owners to turn it into a "thing.conf.example"05:27
or write some magic (post-?)checkout hook, maybe05:27
→ Akagi201 joined05:27
grawity or, git stash + merge + stash pop05:27
brucelee grawity: ah ok05:27
grawity: thanks :P05:27
grawity stash generally works05:28
→ Akagi201_ joined05:28
→ Ratler joined05:28
→ Zadruga joined05:29
← Zadruga left05:29
← Lyqyd left05:29
quesker as files get added to somedir/ in a repo (from windows) they need to get git update-index --chmod +x is there some way to do that from a hook?05:29
← jason237 left05:30
← jacaballero left05:30
grawity quesker: a commit hook could fix things up, I think05:30
← Akagi201 left05:31
→ denete joined05:32
→ Alsr joined05:32
← Alsr left05:33
→ Dqqie joined05:34
← MechtiIde left05:35
← Dqqie left05:36
→ EminenceHC joined05:36
→ Caioe joined05:36
← Caioe left05:37
← lqi left05:37
← denete left05:37
← ahr3n left05:38
← pantsman- left05:38
→ Aaua joined05:39
→ lqi joined05:39
← scientes left05:40
→ delinquentme joined05:40
← Aaua left05:40
→ Encapsulation joined05:40
→ Eqef joined05:41
← EminenceHC left05:41
→ FreezingCold joined05:42
← Eqef left05:42
→ awnnm joined05:44
← nightspades left05:44
← clarkpan left05:45
← awnnm left05:45
← hithard left05:45
→ clarkpan joined05:47
osse brucelee: !config05:48
gitinfo brucelee: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas05:48
→ clarkpan_ joined05:48
→ jakke joined05:51
← clarkpan left05:52
← cbonobo left05:52
→ ThomasLocke joined05:53
→ joo-_ joined05:53
← rubyonra_ left05:54
→ EvilPenguin joined05:54
→ gfvf joined05:55
← LJT left05:57
→ momken joined05:57
momken hello05:57
foofin Hello!05:57
gitinfo momken: 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.05:57
← e^0_ left05:59
← EvilPenguin left06:00
momken I cloned a git repo from github, which I want to put on my own private repo06:01
→ contentsafe_ joined06:01
momken After running some bash scripts, it cloned another github repo as submodule of current repo06:01
← tpollard left06:02
← vgarg left06:02
momken I successfully put the main app to my private repo, but about the library (which was cloned as submodule) I couldn't clone it to my private repo06:02
iveqy what's "some bash scripts"06:03
momken How could I also put the library project (submodule) to my private repo06:03
iveqy is hard to know if those has anything to do with your submodule at all06:03
→ z8z joined06:03
→ Silmarilion joined06:04
iveqy momken: you'll have to create a seperate git repo for the submodule and then link them together. But most easily is just to use the submodule that the original project uses06:04
momken: why do you need your own version of the submodule? I mean, are you sure that you need it?06:04
→ settermjd joined06:04
momken iveqy, Yeah. I don't trust github a lot06:05
← FreezingCold left06:05
momken iveqy, So instead of github fork, I am used to copy the repo to my private git server, develop and then push changes back to main repo if development went OK06:06
And I have don't have permission for direct pushes too06:06
← akurilin left06:07
momken iveqy, First I used the submodule of the original project. But now my development extends so much that I change the lib project.06:07
iveqy momken: okay, well just threate you submodule as a ordinary repo and then alter the url in the superproject to wear it should look for the submodule06:08
→ akurilin joined06:10
→ otter768 joined06:10
momken iveqy, Hmmm. ok! let me try it06:12
→ rath joined06:12
← ehmatthes left06:12
← edmundinho left06:13
← brucelee left06:14
→ edmundinho joined06:14
← akurilin left06:14
← otter768 left06:14
→ acolson joined06:17
← edmundinho left06:18
→ roelmonnens joined06:18
→ Mathiasdm joined06:18
→ zoso joined06:20
→ jceb joined06:20
→ vgarg joined06:20
← MLM left06:23
← diegoviola left06:25
← watabou left06:27
→ rzeka joined06:29
← Fissure left06:30
← Gamecubic left06:30
→ devoldmx joined06:30
← delinquentme left06:31
→ Spriz joined06:32
→ akurilin joined06:33
→ b00^wk2 joined06:34
← devoldmx left06:35
→ brucelee joined06:35
← highcup left06:35
→ Saturn812 joined06:39
→ EminenceHC joined06:42
→ dc5ala joined06:43
← bgerber left06:46
→ beneggett joined06:46
← EminenceHC left06:47
→ Fissure joined06:47
← joo-_ left06:48
← Raging_Hog left06:48
→ Raging_Hog joined06:50
momken iveqy, ping06:51
→ ilmgb joined06:51
momken How can I change the URL of the submodule?06:51
← beneggett left06:52
← ilmgb left06:52
→ ilmgb joined06:52
→ PCatinean joined06:52
momken iveqy, I changed .git/config file, but after "git submodule sync", it reverted the URL to the original one06:52
_ikke_ momken: update the .gitmodules file06:53
→ cdown joined06:53
→ thekodols_ joined06:53
_ikke_ git submodule sync looks at that file06:54
← Saturn812 left06:55
momken _ikke_, Ah I found it06:55
← thekodols_ left06:55
momken _ikke_, Should I also change the "path" variable?06:55
→ thekodols_ joined06:55
_ikke_ No, unless you moved the submodule06:56
→ Olipro_ joined06:56
_ikke_ The path variable is used to match the submodule with the url06:56
← beautifulmind left06:56
Olipro_ → Guest8750706:56
→ fnky joined06:56
← thekodols left06:57
← spinningarrow left06:57
← aboccia left06:57
momken _ikke_, Ah! the path is the name of the folder the submodule is in, right?06:58
→ pobivan joined06:58
→ zadock joined06:58
→ Saturn812 joined06:58
← Guest62271 left06:58
→ devoldmx joined06:59
_ikke_ yes06:59
← frdmn left07:00
→ Sceorem joined07:02
→ rajee joined07:03
→ frdmn joined07:03
← frdmn left07:03
→ frdmn joined07:03
← devoldmx left07:04
← cagedwisdom left07:04
→ encod3 joined07:06
→ aboccia joined07:07
→ lb1a joined07:07
← Goplat left07:08
→ bgerber joined07:09
← pheaver left07:09
← shauna left07:10
← glebihan left07:10
← vixterra left07:11
→ shauna joined07:11
→ Alienpruts joined07:11
→ Wulf joined07:12
← nuck left07:13
→ drag0niu1 joined07:15
→ nuck joined07:16
→ edmundinho joined07:17
→ apflieger joined07:17
← trepidaciousMB-1 left07:18
← drag0nius left07:18
→ glebihan joined07:18
→ TomyWork joined07:19
→ wicope joined07:20
← staafl left07:21
← apflieger left07:22
← thiago left07:22
→ cagedwisdom joined07:24
→ staafl joined07:24
staafl What are some advantages of Git over Mercurial?07:25
→ herr_jth joined07:25
← herr_jth left07:26
→ herr_jth joined07:26
→ SimonNa joined07:27
staafl I'm working in a company that recently switched from Hg to Git and I often get asked this question07:27
← b00^wk2 left07:27
→ darkbasic_ joined07:27
← clarkpan_ left07:28
← darkbasic left07:28
osse it's faster07:29
canton7 staafl, !isgitbetter07:29
gitinfo staafl: We think so, but if you don't, please go away and use $YourFavoriteSystem instead. For a comparison to other VCSes, see http://thkoch2001.github.com/whygitisbetter/07:29
canton7 ah, broken link, yay07:29
→ intellix joined07:29
canton7 .trigger_edit isgitbetter We think so, but if you don't, please go away and use $YourFavoriteSystem instead07:30
gitinfo canton7: Okay.07:30
← DerisiveLogic left07:31
staafl canton7, that's not very useful :-)07:31
cbreak staafl: git sucks considerably less than mercurial07:32
canton7 staafl, all subjective but: better branching model, better support for things like cherry-picking, rebasing, etc. If nothing else, it's more ubiquitous07:32
cbreak in particular, git has proper branching, can work decentralized, is fast, portable07:32
canton7 staafl, there used to be a pretty good comparison at that link. I'm sad it's gone :(07:32
cbreak the toolchain of git is vastly superior07:32
→ apflieger joined07:32
staafl canton7, I'll check it in the wayback machine07:32
→ lyang0 joined07:32
canton7 staafl, iirc it was somewhat interactive, so I don't know how well the wayback machine might have captured it07:33
→ joo-_ joined07:33
osse http://www.whygitisbetterthanx.com/ - what the hell is this07:33
looks like some sort of autogenerated clickbait thing07:33
canton7 yeah - I was hopeful at first, but that looks shit07:33
osse isn't that the original url ?07:34
canton7 some people have written well-thought-out rebuttals to whygitisbetterthanx.com, so I assume there was something decent there at some point07:34
osse https://raw.githubusercontent.com/schacon/whygitisbetter/master/index.html :P07:34
→ workerbeetwo joined07:35
canton7 shame github always delivers html with a text/plain content-type header07:35
cbreak well, text/plain is correct07:35
staafl I'lm looking for an answer to the question "what are some important things we can do with Git that we can't with Hg"07:36
e.g. is something like gitflow easy to accomplish in mercurial07:37
canton7 aha, here we go: http://web.archive.org/web/20140714014915/http://thkoch2001.github.io/whygitisbetter/#hg07:37
so that's got all of the hg-specific items pre-expanded07:37
← herr_jth left07:37
osse staafl: depends a bit on where you draw the line between possible and impossible, but my guess is there are none.07:37
→ herr_jth joined07:37
canton7 if it's not expanded (and doesn't have the 'hg' tag), it's not an advantage over hg07:37
staafl canton7, thanks07:38
← jwmann left07:38
→ EvilPenguin joined07:39
→ jwmann joined07:40
→ kcj joined07:40
→ AAoK joined07:40
→ cbonobo joined07:41
→ dan_s joined07:41
→ sCiphre joined07:42
→ mtakkman joined07:43
→ darkbasic joined07:43
← darkbasic_ left07:44
← EvilPenguin left07:44
← rajee left07:45
← cbonobo left07:46
← govg left07:46
→ EminenceHC joined07:46
→ nnyk_ joined07:48
← nnyk_ left07:48
→ nnyk_ joined07:48
→ Hounddog joined07:49
← EminenceHC left07:50
→ bonswouar joined07:54
← bonswouar left07:54
← mutbuerger left07:55
← harish left07:55
→ Hounddog_ joined07:55
→ Hounddog__ joined07:57
→ Hounddog___ joined07:58
← luriv left07:58
← MattMaker left07:58
← cagedwisdom left07:58
→ luriv joined07:59
→ Hounddog____ joined07:59
→ fooforge joined08:00
← Hounddog left08:00
← Hounddog_ left08:00
← Hounddog__ left08:00
← Hounddog___ left08:01
→ Hounddog_____ joined08:01
← Hounddog____ left08:01
← Hounddog_____ left08:01
→ prillian5 joined08:01
→ Hounddog joined08:03
← Hounddog left08:03
← raven-au left08:03
→ JEEBcz joined08:03
→ snonez joined08:04
← snonez left08:05
→ trepidaciousMBR2 joined08:05
→ skylite joined08:05
← JEEB__ left08:05
← trepidaciousMBR2 left08:06
→ Hounddog joined08:06
Mathiasdm 09:32 < cbreak> in particular, git has proper branching, can work decentralized, is fast, portable <-- mercurial has all of those as well08:07
← jceb left08:07
→ psoo joined08:08
← psoo left08:08
→ Hounddog_ joined08:08
→ psoo joined08:08
→ granthatcher joined08:09
cbreak Mathiasdm: so, how do I switch to a different branch?08:09
Mathiasdm hg update -r BRANCHNAME ?08:10
cbreak update?08:11
Mathiasdm note though that there's a bit of a mismatch: if you want git branches in Mercurial, you need Mercurial bookmarks (Mercurial branches are more like svn branches)08:11
→ jottr joined08:11
osse cbreak: you can use checkout if you wish08:11
cbreak that makes less sense than checkout08:11
→ otter768 joined08:11
← sharkz left08:11
Mathiasdm yes, but perhaps this is too much off-topic for this list?08:11
cbreak: Mercurial has 'checkout' as alias for 'update'08:11
→ cagedwisdom joined08:11
→ ferr joined08:11
Mathiasdm so you can use either :p08:11
cbreak good08:12
→ twb joined08:12
← edmundinho left08:12
twb I think I asked before, but didn't get a Super Sexy turnkey answer, so...08:13
Is there a thing I can run on my repo, sort code lines by their age?08:13
My theory is something like "if code hasn't changed for over two years, it's probably unreachable & broken" - so find that code and purge it08:14
→ apurcell joined08:14
← granthatcher left08:15
cbreak sounds like a braindead theory08:15
twb git blame gets me part of the way, but it's per-file not repo-wide, and iterating over ls-tree is tedious because I have to exclude images and stuff08:15
cbreak better kiss good bye to your { and }, and whitespace lines08:15
← otter768 left08:16
→ King_Hual joined08:16
twb cbreak: obviously you wouldn't just derpily delete individual lines08:16
cbreak obviously you wouldn't do that at all08:16
twb Sigh.08:16
Fuck you too, then.08:16
← twb left08:16
cbreak if you want to remove unreachable code, do it via control flow08:16
→ granthatcher joined08:16
cbreak get some manners08:17
→ jseplae joined08:17
→ marcogmonteiro joined08:18
Seveas reminds me of https://github.com/mattdiamond/fuckitjs08:18
← apurcell left08:19
← Hounddog left08:19
← Hounddog_ left08:19
osse Seveas: this is similar but more serious: https://github.com/munificent/vigil08:19
← jottr left08:19
→ tinamanea joined08:20
→ bonswouar joined08:20
→ Hounddog joined08:20
→ trepidaciousMBR2 joined08:21
tinamanea Hi! I'm trying to use pre-commit hook to make some code checks. I've added my checks in the appropriate script but when I commit something, the hook is only run after I exit the editor, not before. Am I doing this wrong?08:21
Seveas osse: I approve08:21
→ jceb joined08:21
cbreak tinamanea: that's normal.08:22
Seveas tinamanea: no, that's when it's supposed to fire.08:22
→ arup_r joined08:22
→ ronskisika joined08:23
→ mikiones joined08:23
← Raging_Hog left08:23
tinamanea that's a bit weird because I see here: http://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks that pre-commit is run first, then prepare-commit-msg (which says that is run before the commit message editor is fired up)08:24
is the documentation wrong or am parsing this incorrectly?08:24
_ikke_ try man githooks08:24
gitinfo the githooks manpage is available at http://jk.gs/githooks.html08:24
← AAoK left08:25
Seveas the book is in disagreement with the manpage08:25
I trust the manpage08:25
_ikke_ Perhaps make a pull request then08:25
← Hounddog left08:25
tinamanea hm, ok, thanks for the help!08:26
← brucelee left08:26
← arup_r left08:26
← jstimm left08:27
← mikiones left08:27
→ morois joined08:28
Seveas after reading the code: the book is wrong.08:28
→ alip joined08:28
Seveas no, I suck at keeping track of what I read, hmm...08:29
→ mariuscc joined08:30
tinamanea my git is version 1.7.10, a friend tested with 2.1.4 and it works as the book says08:30
perhaps the documentation is accurate for a newer version08:30
will upgrade and report back08:30
Seveas builtin/commit.c:prepare_to_commit first calls run_commit_hook(..."pre-commit"...) and only later launches the editor08:30
tinamanea exactly08:30
:)08:30
Seveas 1.7.10 is ancient :)08:30
← ilmgb left08:31
→ ilmgb joined08:31
→ devoldmx joined08:33
→ Hounddog joined08:33
→ DARSCODE joined08:33
→ tumulte joined08:33
→ denete joined08:34
→ arup_r joined08:34
→ fakenullie joined08:37
→ raven-au joined08:37
fakenullie Hello. Is it possible to use difftool to stage changes?08:38
← apflieger left08:39
→ apflieger joined08:39
← denete left08:39
← Hounddog left08:40
→ Hounddog joined08:41
iveqy fakenullie: maybe you should look at git add -p08:41
← Hounddog left08:41
fakenullie iveqy, difftool can use meld, so it's kinda visual08:41
← joo-_ left08:41
→ ryez joined08:42
fakenullie also I could edit changes with meld08:42
→ Hounddog joined08:43
→ borekb joined08:43
→ NwS joined08:43
gitinfo set mode: +v08:45
borekb Hi, with Git 2.4 out I'm wondering why Windows binaries stay at 1.9.5. Is there some technical reason for this or does the project just lack Win build maintainers? Thanks08:45
Seveas the git for windows maintainers have been revamping their dev/build environment08:47
they've announced a 2.4 preview, so I don't think they're too far away from releasing08:48
→ veganista joined08:48
NwS Heya guys, I've got a quick noob Q. I'm trying to create an offline copy of a website but I think I am missing something.. I've run git init, git add ., git commit -m "com" but I am not sure what I am supposed to do now in order to clone the project to my local offline machine.. Tried to search around but couldn't really figure it out..08:48
borekb Seveas: Thanks, that's great to hear.08:49
NwS Tried to clone the .git but that failed.. lol08:49
→ Grimlock1 joined08:50
→ EminenceHC joined08:51
← raven-au left08:53
← apflieger left08:54
→ apfliege_ joined08:54
iveqy NwS: just use git clone, nothing else08:54
NwS iveqy, git clone the .git? It says that does not appear to be a git repository08:55
→ tvw joined08:55
iveqy NwS: !repro08:55
gitinfo NwS: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.08:55
← jrnieder left08:56
→ raven-au joined08:56
← EminenceHC left08:56
→ donnib joined08:57
← borekb left08:57
→ bigsky joined08:57
← jceb left08:57
← apfliege_ left08:57
→ apflieger joined08:57
bigsky can git log show how many lines are inserted in each commit?08:57
donnib hi guys, this doc https://rtyley.github.io/bfg-repo-cleaner/ says after cleanup to run git gc --prune=now with —aggressive option, is it really required ? If i don’t do it is there a risk that the objects remain in the packs or ?08:58
iveqy bigsky: you're probably asking for git diff with -stat or something like that, see man git diff08:59
gitinfo bigsky: the git-diff manpage is available at http://jk.gs/git-diff.html08:59
← sparetire left08:59
iveqy donnib: yes08:59
donnib iveqy: yes that it is required ?08:59
→ astroduck joined08:59
donnib iveqy: because otherwise i risk the object stays there ?09:00
iveqy yes09:00
donnib :(09:00
iveqy why the sad face?09:00
donnib it just takes so much time :( oh well09:00
iveqy yeah, it's a pretty expensive operation.09:01
→ notze joined09:02
→ jrnieder joined09:03
← fakenullie left09:05
→ sword` joined09:05
← apflieger left09:06
→ Asenar joined09:07
→ apflieger joined09:07
← sword left09:07
→ ra0 joined09:07
← kcj left09:07
→ cllamas joined09:08
→ sword`` joined09:08
← bgerber left09:09
← devoldmx left09:10
← sword` left09:10
← dustinm left09:11
→ bgerber joined09:11
→ Cust0sL1men joined09:11
→ jnavila joined09:13
← apflieger left09:13
donnib iveqy: yeah that’s sad, i guess i have to live with it09:14
→ apflieger joined09:14
→ jceb joined09:14
← mtakkman left09:14
osse (music Get down and live with it, or shut your mouth you prick, before I strike you down09:16
→ dhilipsiva joined09:16
osse shit09:16
♫ ♪ I meant to do this ♪09:16
jast donnib: AFAIK --aggressive affects only delta compression, it doesn't prune objects more aggressively09:17
→ mezod joined09:17
donnib jast: so actually i could leave it out09:18
jast and last time I checked the code that's all it did09:18
I think so, yes09:18
donnib jast: but then again, i have just done a SVN -> Git migration so maybe a aggressive is good to do once before i push the repo to the server ?09:18
→ fakenullie joined09:18
→ harish_ joined09:20
jast it's up to you :)09:20
iveqy donnib: yes it probably would09:21
if it's a one time thing speed might now bother you09:21
jast personally I wouldn't bother... storage is cheap, work time is not09:21
iveqy you might also want to checkout man git repack09:22
gitinfo the git-repack manpage is available at http://jk.gs/git-repack.html09:22
→ Ulrar joined09:22
Ulrar Hi, does the post-update hook need to be created on the client or the server ? Thought on the server but it doesn't look like it's executing it09:22
→ brucelee joined09:22
iveqy even if jast is right about that storage is cheap, you might wan't to consider that git is distributed. Let's say that you've 1000 developers and you are able to reduce the repo size with 100 MB. How will that affect your storage and (the not so cheap) bandwidth?09:23
Ulrar: the hooks will be runned on the repo that recieve an update, most likely the server. What made you think that it does not run?09:23
← fakenullie left09:24
Ulrar iveqy: No output, and doesn't do what it's supposed to09:24
→ vishalud joined09:24
Ulrar (https://github.com/EugeneKay/scripts/blob/master/bash/git-deploy-hook.sh)09:24
I did name it post-update09:24
iveqy is it runnable?09:25
does it have the execute bit set?09:25
Ulrar iveqy: But does it need to be created on the client, and it will run on the server, or directly created on the server itself ?09:25
It does09:25
jast iveqy: AFAIK push/fetch generate on-the-fly packs anyway09:25
Ulrar And it's owned by the correct user09:25
jast which is why cloning causes so much remote work before downloading even starts09:26
iveqy jast: even for clones?09:26
jast: sounds expensive but then it totally makes more sense not to worry too much about optimizing you repo09:26
Ulrar: it does not need to be created on the client. The client has nothing to do with the hook09:27
jast even for clones objects that are not reachable by any ref must be omitted from transmission09:27
→ fakenullie joined09:27
iveqy jast: true, I missed that09:27
← brucelee left09:27
Ulrar Then I don't understand why it doesn't execute it, I must be missing something09:27
iveqy jast: that will make --prune useless09:27
→ Zupoman joined09:27
iveqy Ulrar: yes probably. Time to investigate. Add some output to stderr from the hook and you should be able to see it from the client that does the push09:28
jast iveqy: well it does save disk space on the server :)09:28
though I haven't been following the exact situation here09:28
so I might be wrong about that09:28
iveqy I think it does. A svn to git conversion is usually not a good way to get a nice pack structure09:29
→ MattMaker joined09:29
→ cbonobo joined09:30
arup_r I want to merger this remote branch - https://gist.github.com/aruprakshit/54f6cd9b89b8f1357ec9#file-branch-txt-L4 with the master branch.. and then want to push the changes in local master to github origin/master09:31
what is the command ?09:31
← vgarg left09:33
← Zupoman left09:33
→ BuenGenio joined09:33
iveqy arup_r: fetch the remote branch, merge it with your master branch and then push it to github. The commands are: fetch, merge, push09:33
← MattMaker left09:34
← cbonobo left09:34
← lqi left09:35
arup_r iveqy: Am I doing right ? git checkout master, git fetch origin/bootstraphtml, git merge origin/bootstraphtml, git push origin master ?09:35
← nikio_ left09:35
notze he guys, i have a git post-receive hook: http://pastebin.com/J18Ym2qt but i get : remote: /opt/projects/j109:36
remote: fatal: Not a git repository: '.'09:36
→ imv joined09:36
notze if i do locally on the deployment server sh post-receive09:37
iveqy notze: your hook is trying to do git commands in something that's not a git repo09:37
notze all perfect09:37
Briman → Briman|off09:37
notze iveqy, yes but its working if i do sh post-receive09:37
iveqy notze: your cwd is probably wrong09:37
→ lqi joined09:37
iveqy when the git hook is executed09:37
notze but git -C absiolute path will not care for current cwd ?09:37
arup_r iveqy: Am I doing right ?09:37
iveqy arup_r: depends on if the remote branch you want to merge is origin/bootstraphtml09:37
→ tirengarfio__ joined09:38
arup_r https://gist.github.com/aruprakshit/54f6cd9b89b8f1357ec9#file-branch-txt-L409:38
iveqy notze: true.09:38
notze iveqy, so what can be wrong ^^09:38
iveqy arup_r: I've no idea what you call origin in your repo09:38
arup_r ok.. I call it origin ...09:38
I didn't rename09:38
notze iveqy, http://pastebin.com/GasqjvAv09:39
← tirengarfio_ left09:39
iveqy notze: what's the git version on the server? Does it support -C?09:40
notze yes09:41
check http://pastebin.com/GasqjvAv09:41
sh post-receive09:41
← v0n left09:41
notze only from remote its not executing properly09:41
Briman|off → Briman09:43
jast hooks are run with GIT_DIR=.09:45
← apflieger left09:45
jast so the -C option will probably only have limited effect... GIT_DIR has a rather high precedence09:45
→ sebhoss joined09:46
→ apflieger joined09:46
jast simply unsetting GIT_DIR might help09:46
→ devoldmx joined09:48
← nowhere_man_ left09:49
→ LJT joined09:49
→ dustinm joined09:50
notze iveqy, is it possible that one is treating it as sh script the other as bash09:51
← raven-au left09:51
iveqy notze: it does, when you tell it to use sh it will use sh and not bash. Pretty logical actually =). However jast had a really good point about GIT_DIR09:52
notze jast, thx man i will try that09:53
→ raven-au joined09:53
→ rcn joined09:53
→ nowhere_man joined09:53
iveqy notze: see man git for details about -C. I think you'll see you answer right there, there's an example on how to combine -C and GIT_DIR and it's not what you expect09:54
gitinfo notze: the git manpage is available at http://jk.gs/git.html09:54
→ EminenceHC joined09:55
osse -C is just like cd'ing first09:55
that's it. end of stawrie09:55
→ m3hd1 joined09:56
Ulrar Looks like my hook doesn't get what it wants on stdin09:56
while read old new ref09:56
→ Clint0n joined09:57
← tinamanea left09:57
Clint0n Hi all, when doing the first push to an empty Git repo how can I add all files that are not excluded by my .gitignore to stage for commit?09:58
Ulrar Those variables are empty for some reason09:58
osse Clint0n: git add --all09:58
Clint0n osse: Okay cheers, so that won't add what I have listed in my .gitignore?09:59
← EminenceHC left09:59
osse yes I am sure10:00
Clint0n osse: Okay thanks :)10:00
→ Gizburdt joined10:00
jast Clint0n: you can confirm by looking at 'git status' afterwards10:01
← ryez left10:01
Clint0n Yeah will do :) havent seen the media directory yet so looks like it is working :) Thanks10:01
← LJT left10:01
osse Clint0n: unless you use -f add will always respect .gitignore10:02
Clint0n osse: ahh makes sense, force add? :)10:02
osse oui10:02
← Gizburdt left10:03
← dustinm left10:03
← contentsafe_ left10:04
→ joo-_ joined10:04
← apflieger left10:04
→ apflieger joined10:04
notze jast, thx man unset was the perfect solution10:05
← Gitzilla left10:05
→ darkbasic_ joined10:07
← luriv left10:07
→ LJT joined10:07
← LJT left10:08
→ RaceCondition joined10:08
→ leeN joined10:08
← darkbasic left10:08
→ hithard joined10:11
← z8z left10:12
← Hounddog left10:12
→ otter768 joined10:12
→ jost joined10:12
astroduck Hi, I have a file that I want everyone who clones my repo to have but I dont want it to be in my git, I tried adding it and in next commit doing git rm --cached file, but that does work10:13
→ sohail joined10:14
tobiasvl astroduck: !xy10:14
gitinfo astroduck: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...10:14
tobiasvl why don't you want it as part of the repo, if you want it to be part of the repo?10:15
→ z8z joined10:15
→ beaconwriter_ joined10:15
→ dustinm joined10:15
← otter768 left10:16
← morois left10:17
cbreak astroduck: git's history only contains files that are in git's history.10:18
drag0niu1 → drag0nius10:19
← echo-area left10:19
astroduck tobiasvl: I have a local config file local.py, which needs to be there in development mode but not in production, I was thinking that everyone who'd work on this would have this file but also add this to .gitignore so its not in git and this not present when we put the webapp in production, what would be an ideal way to do this?10:21
← dan_s left10:21
← intellix left10:22
← jost left10:22
DARSCODE astroduck, sounds like you need to start using branches more :)10:22
cbreak astroduck: sounds like you need to commit a local.py.template10:23
→ m0nkmaster joined10:23
← jnavila left10:23
→ jnavila joined10:23
→ brucelee joined10:24
← m0nkmaster left10:24
tobiasvl and also you can't ignore a tracked file10:24
DARSCODE cbreak, how would that work with template ? Never heard of it.10:25
cbreak DARSCODE: you take the file, you copy it, and then you rename the copy to local.py10:25
DARSCODE: and you have your local.py file, without it being part of the git repo10:25
DARSCODE lol.. nah that would not solve his problem.10:25
cbreak of course it would.10:25
DARSCODE I was thinking he could just make new branch for release10:25
cbreak the developers copy it, so it's there when developing10:25
DARSCODE: branches won't work.10:26
DARSCODE rm --cache the file and add it to git ignore10:26
in master branch ?10:26
How not that is how I deal with that kind of problems10:26
cbreak branches won't work because branches are merged10:26
DARSCODE yea so what,10:26
I dont think you should be mergen from master to dev10:26
tobiasvl what10:27
cbreak so the file he doesn't want would end up in the branch he doesn't want it in10:27
DARSCODE but from dev to master and then you don't have any problems with it.10:27
← BuenGenio left10:27
← chilversc_ left10:27
DARSCODE no it does not10:27
← imv left10:27
cbreak sure it would. Because every commit in develop has it10:27
DARSCODE I use it like this and it does not happen unless you do improper merges10:27
cbreak and once you merge those commits, master also has it10:27
DARSCODE nope bro, test it it not true what you saying.10:28
← Spriz left10:28
cbreak it's quite obvious how that would happen10:28
→ s8321414 joined10:28
cbreak just think a tiny bit about how merges work :)10:28
DARSCODE I use it so I KNOW10:28
test it and then come back, don't just assume your ideas.10:28
← paulweb515 left10:28
← brucelee left10:29
Briman → Briman|off10:29
cbreak I know how it works :)10:29
DARSCODE apparently not10:29
because you should have know that if you merge from dev to master10:29
cbreak if you wouldn't get files from branches when merging them, git would be broken10:29
DARSCODE and you remove the file in master and add it to gitignore it will stay like that10:29
cbreak so you obviously get the file :)10:29
← raven-au left10:29
DARSCODE aslong you dont merge back master to develop which you should never do IMO.10:30
cbreak DARSCODE: gitignore doesn't apply.10:30
tobiasvl gitignore doesn't ignore tracked files10:30
cbreak it only affects untracked files.10:30
DARSCODE dude just test it10:30
cbreak DARSCODE: use your brain instead of blabbering garbage, honestly :)10:30
→ mikiones joined10:30
cbreak files in history are obviously tracked, so gitignore won't do a thing10:30
DARSCODE I am not talking trash bro I do it10:30
→ raven-au joined10:31
DARSCODE and I know it works I had this problem for long time and this was solution that has been working for long time10:31
if you dont believe make a repo and you will see that it does in deed work10:31
you gitignore can be differend on both branches10:31
→ freestyl3r joined10:32
_ikke_ .gitignore doesn't do anything for tracked files10:32
→ sdothum joined10:32
_ikke_ So the files would have to be untracked for anything to happen10:32
DARSCODE you remove tracking on master ofc10:32
_ikke_ DARSCODE: Then you change something in develop, and you merge / checkout master. Then git will complain10:33
DARSCODE how ?10:33
please tell me how, since the commit with the delete is only in master10:34
← jnavila left10:34
DARSCODE and master will always have that commmit10:34
→ jost joined10:34
_ikke_ Yes, but if you merge for example master in develop, then it has to merge the removal also10:34
DARSCODE develop will have not and that is what will maintain difference between them, like I said before only dont merge from master back to develop and you will be okee.10:34
ikke why you want to merge master in to develop ?10:35
because you added code in master ??? which should not happen10:35
_ikke_ In some workflows it does happen, but it's not necessary10:35
← jceb left10:35
DARSCODE if so then you workflow is not good, but I will behonest about that and say it is my opinion not fact.10:35
_ikke_ for example, hot fixes should happen on master10:36
DARSCODE maybe if that is how you have it setup10:36
_ikke_ when you have a bug in a release version that should be fixed, without any untested changes10:36
DARSCODE I fall back on in between branch for that dont like doing hotfixes on master.10:36
← ItSANg___ left10:37
← fahadash left10:37
→ t4nk601 joined10:37
gitinfo set mode: +v10:39
→ Balliad joined10:39
→ ascarter_ joined10:39
t4nk601 Hi I want to setup a git repository but while pushing the changes by user the destination should be </etc/puppetlabs/puppet/hieradata>, my question is where should i setup the repo ?10:40
_ikke_ t4nk601: You are basically setting up a deployment through git.10:41
Seveas t4nk601: you need to read !deploy10:41
gitinfo t4nk601: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html10:41
→ Spriz joined10:41
→ cgar joined10:42
Seveas t4nk601: the way I solve this is have a puppet.git on our normal central git host, which has a post-receive hook that uses salt to trigger git fetch+reset on all puppet masters10:42
← beaconwriter_ left10:42
avar 2.4 release notes showing how "push to deploy" is now a thing: https://github.com/blog/1994-git-2-4-atomic-pushes-push-to-deploy-and-more10:42
:)10:42
t4nk601 +Seveas I am using r10k to deploy the environments10:43
+Seveas I dont know whether we can setup multiple destinations for r10k.yaml10:43
← donnib left10:43
_ikke_ I don't know r10k10:44
avar: Note that things like configuration management is still an issue using this10:44
← weiyang left10:44
← nnyk_ left10:45
← devoldmx left10:47
→ devoldmx3 joined10:47
← devoldmx3 left10:47
→ devoldmx joined10:47
← seg left10:48
← dustinm left10:48
→ apfliege_ joined10:48
← apflieger left10:48
→ vrishab joined10:49
← fooforge left10:50
→ seg joined10:50
← seg left10:50
→ seg joined10:50
→ mfilipe_ joined10:50
→ dustinm joined10:50
← vrishab left10:50
← hithard left10:52
← zadock left10:53
← elektrinis left10:53
← m0viefreak left10:53
→ ItSANgo joined10:57
→ intellix joined10:58
→ contentsafe_ joined10:58
→ Nizumzen joined10:59
→ EminenceHC joined10:59
← wrouesnel3 left10:59
← jost left11:01
← Cust0sL1men left11:01
→ beautifulmind joined11:01
→ craigp joined11:03
← EminenceHC left11:04
← nedbat left11:04
← dustinm left11:04
← jamietech left11:08
→ jamietech joined11:11
→ imv joined11:12
← craigp left11:12
xace when i run git mergetool #it will prompt "Hit return to start merge resolution tool (meld):" when you type "gvimdiff<ENTER>" it ignores my answer and runs meld. Am I missunderstanding the prompt?11:12
or is this a bug? git version 2.3.711:13
→ jost joined11:13
osse not a bug11:15
it's telling you that it will run meld11:15
→ jceb joined11:15
→ Kicer86 joined11:15
xace according to http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging i'm suppose to be able to do it11:15
→ rnsanchez joined11:16
xace If you want to use a merge tool other than the default ... Just type the name of the tool you’d rather use.11:16
→ jnavila joined11:17
osse huh11:17
→ MattMaker joined11:17
→ cavallari joined11:17
→ Cust0sL1men joined11:17
→ dustinm joined11:18
xace (I quoted the page/book)11:18
→ cbonobo joined11:18
→ EvilPenguin joined11:20
← cppking left11:21
← sohail left11:21
← blr left11:22
← MattMaker left11:22
← cbonobo left11:23
← ascarter_ left11:24
→ brucelee joined11:24
← EvilPenguin left11:25
→ dougsland joined11:26
→ beaconwriter joined11:27
← brucelee left11:29
← arup_r left11:30
→ arup_r joined11:33
← chrisgeorge left11:33
← staafl left11:33
← Balliad left11:35
← dustinm left11:36
→ cbonobo joined11:36
→ denete joined11:37
← arup_r left11:37
← mquin left11:37
→ fooforge joined11:37
→ mquin joined11:37
← effi left11:38
← cbonobo left11:41
→ arup_r joined11:41
→ dustinm joined11:41
← denete left11:42
← jnavila left11:42
→ jnavila joined11:43
→ effi joined11:44
← dsdeiz left11:44
← effi left11:45
→ StuartMI joined11:45
← jost left11:45
→ ErKa joined11:49
→ dramagods joined11:49
← moparisthebest left11:51
→ darkbasic joined11:51
→ moparisthebest joined11:51
→ edude03 joined11:52
← apfliege_ left11:52
→ apflieger joined11:52
← darkbasic_ left11:52
← devoldmx left11:53
Impaloo how can I check whether there is something to stash?11:53
iveqy Impaloo: git status11:53
Impaloo programmatically11:53
RichiH git status --porcelain11:53
Impaloo RichiH: thanks11:54
← dustinm left11:54
← subhojit777 left11:54
iveqy RichiH: don't forget the -z11:55
← apflieger left11:55
→ apfliege_ joined11:55
Impaloo if I want to run some tests on the last commit only, disregarding un-staged changes and un-tracked files, what would be the best way to do so?11:56
→ satanist joined11:56
Impaloo just do tmp commit then checkout head~1 then after tests reset the commit?11:56
xace Impaloo: git stash11:56
← moparisthebest left11:57
Impaloo xace: stash doesn't stash untracked files11:57
xace oh, sorry missed that part11:57
→ dustinm joined11:57
→ jost joined11:57
→ paulweb515 joined11:58
→ BuenGenio joined11:58
← fstd left11:59
→ marscher joined11:59
→ fstd joined11:59
→ moparisthebest joined12:00
← synthmeat left12:00
← fooforge left12:00
→ EminenceHC joined12:01
← mezod left12:01
← Akagi201_ left12:02
→ devoldmx joined12:02
← paulweb515 left12:02
→ synthmeat joined12:03
← apfliege_ left12:03
→ mizu_no_oto joined12:03
→ apflieger joined12:04
→ va joined12:04
→ twoface88 joined12:04
va I would like to programmatically determine the authoring date of a tag; I thought of using git show --pretty=, however, show also outputs the patch of the commit of the tag. What would be the preferable way to get the %ad date?12:04
→ pc_magas joined12:05
← edude03 left12:05
← EminenceHC left12:05
← arup_r left12:06
← apflieger left12:07
→ apflieger joined12:08
→ subhojit777 joined12:08
← synthmeat left12:09
pc_magas Hello fellows we are transfering a git5 repo to another server.12:09
xace va --format=ad ?12:09
sry --format=%ad12:09
→ synthmeat joined12:09
pc_magas Also we are making a new user that has access only to the git repo12:09
but we do not want to has login access12:10
→ doev joined12:10
pc_magas Would you sugest /bin/false or /dev/null as shell?12:10
← devoldmx left12:11
← synthmeat left12:11
pc_magas (I am using we instead of I cause are many coworkers doing that right now and I am asking behalf of them)12:11
→ edude03 joined12:11
→ synthmeat joined12:12
iveqy pc_magas: why not git-shell? How would the user otherwise get git access?12:12
xace pc_magas: i usuually use /bin/false for service accounts and /bin/nologin12:12
for traditional accounts12:12
← ErKa left12:12
iveqy pc_magas: why don't you use gitolite?12:12
pc_magas iveqy, we are settinh up this now12:13
→ otter768 joined12:13
← SimonNa left12:13
← apflieger left12:13
iveqy pc_magas: My question still stands, why are you trying to setup this manually instead of using a finished solution like gitolite?12:13
→ apflieger joined12:14
pc_magas iveqy, we will use it.12:14
→ chuchunaku joined12:14
iveqy pc_magas: you've to give the user a shell if she are going to have access to the git repo. /bin/false or /bin/nologin won't work with ssh access but you should use git-shell12:14
← jnavila left12:15
→ rubyonrailed joined12:15
iveqy pc_magas: oh, in that case. Don't create a new user, gitolite only needs one unix-user for all git users12:15
→ effi joined12:15
→ airdisa joined12:16
pc_magas iveqy, also we will use git for code deployment to to amazon EC2 servers12:16
→ rcn_ joined12:16
pc_magas So we need and hooks too12:16
← dhilipsiva left12:17
va xace: that outputs the patch!12:17
iveqy pc_magas: sure, gitolite does hooks12:17
→ dhilipsiva joined12:17
→ paulweb515 joined12:17
dhilipsiva → Guest5468812:18
← otter768 left12:18
→ chrisgeorge joined12:18
iveqy va: man git show look at --format and -z, that's your options. You'll have to use an external tool to get more finegrained parsing (for example awk, sed, etc.)12:18
gitinfo va: the git-show manpage is available at http://jk.gs/git-show.html12:18
← edude03 left12:18
← m3hd1 left12:18
→ mellernoia joined12:18
← pc_magas left12:18
← effi left12:20
← rcn left12:20
→ Dorf joined12:20
va git show -s :)12:20
← harish_ left12:21
→ dvl_ joined12:21
→ matachi joined12:21
→ jnavila joined12:21
rcn_ → rcn12:22
→ dsdeiz joined12:24
→ denete joined12:24
← dvl_ left12:25
→ brucelee joined12:25
← joo-_ left12:25
→ PeterBooker joined12:27
→ mikecmpbll joined12:29
→ Texan joined12:30
← raven-au left12:30
← brucelee left12:30
→ moreirapontocom joined12:32
→ raven-au joined12:33
← mizu_no_oto left12:34
→ c0mrad3 joined12:36
→ Asiajey joined12:36
→ mizu_no_oto joined12:36
xace say I create a branch: git branch -u public collab # when I want to puse collab to public, is it enough to write: git push collab # since it has a remote explicitly configured?12:36
or do I still have to type git push public collab12:37
osse xace: if collab is checked out: just 'git push'. otherwise: the whole thing12:37
xace osse: yeah, in this case I'm not in collab12:38
← satanist left12:38
→ edude03 joined12:38
→ jds joined12:39
← dustinm left12:39
→ sgambino joined12:39
← va left12:39
← beaconwriter left12:39
← Nizumzen left12:40
→ arup_r joined12:40
← vishalud left12:40
→ linuxboytoo joined12:40
→ beckyconning_ joined12:41
→ dustinm joined12:41
→ nnyk_ joined12:41
← antimatroid left12:42
← toothrot left12:42
→ victortyau joined12:43
← edude03 left12:43
→ linuxboy_ joined12:44
← linuxboytoo left12:44
→ mojibake joined12:45
→ vishalud joined12:45
→ Gama11 joined12:46
← ronskisika left12:47
→ charlesr joined12:48
→ AcidNerd joined12:49
← linuxboy_ left12:49
→ CEnnis91 joined12:49
← tristanseifert left12:49
→ linuxboytoo joined12:50
→ nour joined12:50
→ vurma joined12:50
→ antimatroid joined12:52
AcidNerd → benborges12:52
← benborges left12:54
← melter left12:54
← ferr left12:54
← ValicekB left12:55
→ melter joined12:55
← zumba_ad_ left12:57
→ Gabri joined12:57
→ cjwilburn joined12:58
← z8z left12:58
→ Technocrat7 joined12:59
← apflieger left12:59
← bsanford left12:59
→ apflieger joined13:00
← matachi left13:00
→ ivank joined13:01
ivank if i'm looking at an old commit, is there any simple way to find the next commit that touched a certain line?13:02
← cagedwisdom left13:02
→ ValicekB joined13:02
→ cybertron joined13:02
→ v0n joined13:03
iveqy ivank: next is a bit hard to determinate13:03
→ apfliege_ joined13:03
→ dhilipsiva joined13:04
ivank ya, going backwards is easy, playing forward not so much13:04
← apflieger left13:04
→ EminenceHC joined13:04
dhilipsiva → Guest4337313:04
→ jerius joined13:05
← Technocrat7 left13:05
→ zgzgzg joined13:06
→ MattMaker joined13:06
gitinfo set mode: +v13:06
cybertron thanks13:07
→ Raging_Hog joined13:07
cybertron hi, I try to shrink my git repo, I removed some files and tried und shrink my repo by this http://stevelorek.com/how-to-shrink-a-git-repository.html but it doesn't shrink my remote .pack files, any idea?13:07
← fakenullie left13:07
→ ki0 joined13:07
← Raging_Hog left13:07
← Guest54688 left13:07
← EminenceHC left13:08
→ livingstn joined13:09
→ EvilPenguin joined13:09
iveqy cybertron: have you done a git gc --prune=now _13:09
?13:09
cybertron yes13:09
← subhojit777 left13:10
cybertron and the local git repo is shrinked than but not my remote13:10
← MattMaker left13:10
← Scriptonaut left13:11
shafox I am trying to squash multiple commits into one. I am using: git rebase -i HEAD~5 , After selecting commits from pick to squash it is giving this error The previous cherry-pick is now empty, possibly due to conflict resolution. How to solve this ?13:12
← apfliege_ left13:12
→ apflieger joined13:12
← flaguy48 left13:12
→ lindenle joined13:13
← jseplae left13:14
← EvilPenguin left13:14
→ bsanford joined13:14
→ jr3 joined13:15
→ tomog999 joined13:15
→ jseplae joined13:15
→ leolrrj joined13:15
→ ascarter joined13:16
→ gamename joined13:17
← aboccia left13:17
← cavallari left13:17
→ cavallari joined13:17
→ cbonobo joined13:17
← tomog999_ left13:17
→ apfliege_ joined13:18
← apflieger left13:18
cybertron iveqy: any other idea?13:18
← lindenle left13:18
→ aboccia joined13:20
→ AMERICA__ joined13:20
→ jolda joined13:20
← gamename left13:20
← jseplae left13:20
iveqy cybertron: did you runned on your remote repo or just locally?13:21
→ jseplae joined13:21
→ gamename joined13:21
← woodruffw left13:21
cybertron iveqy: what you mean with remote? I have no access to the gitserver13:21
← AMERICAN_PSYCHO left13:22
← apfliege_ left13:22
← gamename left13:23
→ apflieger joined13:23
→ sburgess joined13:23
→ tmager joined13:23
→ gamename joined13:23
← jseplae left13:23
← gamename left13:24
→ gamename joined13:24
← charlesr left13:24
→ ErKa joined13:24
← bannakaffalatta left13:25
→ brucelee joined13:26
→ knownasilya joined13:26
→ liamkeily joined13:26
← phantombeta left13:27
→ Dragooon joined13:27
← sCiphre left13:28
← Guest43373 left13:28
← chuchunaku left13:28
→ joo-_ joined13:29
→ Akagi201 joined13:29
→ phantombeta joined13:30
→ Tommy[D] joined13:30
rivarun what's the difference between `git stash show stash@{10}` and `git show stash@{10}`?13:30
← brucelee left13:30
← Tommy[D]_ left13:31
→ haavstr joined13:32
osse rivarun: how it's displayed13:32
→ Tommy[D]_ joined13:32
← apflieger left13:32
rivarun osse: i should had explained a bit more. `git show [...]` shows a lot less output. 2 files instead of 3113:32
→ apflieger joined13:33
→ zumba_addict joined13:33
→ zadock joined13:33
→ matachi joined13:34
← mikiones left13:34
→ flaguy48 joined13:34
← kp666 left13:34
→ mikiones joined13:34
← denete left13:34
iveqy cybertron: then you won't be able to run git-gc on it13:35
cybertron: how do you then know that you have packs left on the server?13:35
osse rivarun: technically speaking a stash is a merge commit. by default 'git show' doesn't show very much for merges13:35
rivarun: try git show -m stash@{10}13:35
→ denete joined13:35
← Tommy[D] left13:35
→ zumba_ad_ joined13:36
← zumba_addict left13:36
→ modocache joined13:36
→ benborges joined13:36
rivarun osse: "`-m??? option to any of these commands to force generation of diffs with individual parents of a merge" not completely following13:36
← jnavila left13:36
rivarun but i'll take it. thanks13:36
← ivank left13:37
→ jnavila joined13:37
→ unreal joined13:37
← Tommy[D]_ left13:38
→ nettoweb joined13:38
← mikiones left13:38
← zumba_ad_ left13:39
→ zumba_addict joined13:39
← matachi left13:39
← apflieger left13:39
→ johnkevinmbasco joined13:39
← mizu_no_oto left13:39
→ Tommy[D] joined13:39
← ErKa left13:40
→ apflieger joined13:40
osse rivarun: with GIT_TRACE=1 you can see the exact diff command git stash uses13:40
← rchavik left13:40
osse It's most likely diffing against it's first parent13:40
← modocache left13:41
→ zheng joined13:41
→ jason237 joined13:41
← zheng left13:42
→ zumba_ad_ joined13:42
→ zheng joined13:42
← gfvf left13:42
→ gfvf joined13:43
← zumba_addict left13:43
→ salutTEKI joined13:44
→ kadoban joined13:44
→ Ryanar joined13:44
← salutTEKI left13:44
← phantombeta left13:44
← Tommy[D] left13:45
→ bvi joined13:45
← apflieger left13:45
→ apfliege_ joined13:45
cjwilburn has anyone used git-lfs yet? if so, how is it? any caveats?13:45
→ chuchunaku joined13:46
→ jwhisnant joined13:46
→ IrishPrime joined13:46
→ beaconwriter joined13:46
← airdisa left13:48
→ tristanp_ joined13:48
→ m0ltar joined13:48
rivarun osse: now that i didn't know.thanks13:50
→ AaronMT joined13:50
← bsanford left13:50
→ phantombeta joined13:50
→ nszceta joined13:51
iveqy cjwilburn: what makes you consider git-lfs instead of git-annex?13:52
← apfliege_ left13:52
cjwilburn iveqy: i was just curious about it, and wanted to see if anyone had any brief practical experience13:52
→ apflieger joined13:53
← Xiti` left13:53
← s8321414 left13:53
→ fooforge joined13:53
← nszceta left13:54
→ mizu_no_oto joined13:54
→ apfliege_ joined13:55
← apflieger left13:55
← arup_r left13:55
← zivester left13:56
→ Xiti joined13:56
← acolson left13:57
← roelmonnens left13:57
→ roelmonnens joined13:57
← rzeka left13:58
→ acolson joined13:58
→ mezod joined13:58
← AMERICA__ left13:58
← astroduck left13:58
← fooforge left13:58
← dustinm left13:59
→ fooforge joined14:00
→ dallen joined14:00
→ thiago joined14:00
→ Hestil joined14:00
→ str joined14:01
← beautifulmind left14:01
← zumba_ad_ left14:01
→ m0nkmaster joined14:02
→ zumba_addict joined14:02
← m0nkmaster left14:02
→ bsanford joined14:03
→ airdisa joined14:03
← cbonobo left14:04
← zimablue left14:04
→ effi joined14:05
← tvw left14:05
→ ErKa joined14:06
← chuchunaku left14:06
→ MLM joined14:06
→ EminenceHC joined14:06
→ Nizumzen joined14:06
← ReekenX left14:07
cybertron iveqy: after my shrinking stuff...if I do a git pull I get back the old status why that?14:07
← str left14:07
→ zumba_ad_ joined14:08
iveqy cybertron: because you haven't pushed?14:08
← zumba_addict left14:08
← zumba_ad_ left14:08
cybertron iveqy: I have -.-14:08
→ zumba_addict joined14:09
← effi left14:09
← rath left14:10
→ MarkyC joined14:10
→ pm90_ joined14:10
← jakke left14:10
iveqy then !repro14:10
gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.14:10
← skylite left14:10
→ cbonobo joined14:10
← EminenceHC left14:10
→ dustinm joined14:11
→ ciampix joined14:11
→ edude03 joined14:11
← zumba_addict left14:11
→ zumba_addict joined14:11
cybertron iveqy: my steps u mean?14:11
← pm90_ left14:12
← zumba_addict left14:12
→ pm90_ joined14:13
→ kevwil joined14:13
→ beneggett joined14:13
→ pheaver joined14:13
→ zumba_addict joined14:13
→ bollullera joined14:13
→ otter768 joined14:14
→ Tennis joined14:15
shafox Reposting: I am trying to squash multiple commits into one. I am using: git rebase -i HEAD~5 , After selecting commits from pick to squash it is giving this error The previous cherry-pick is now empty, possibly due to conflict resolution. How to solve this ?14:15
→ zimablue joined14:17
← antimatroid left14:18
← fooforge left14:18
← otter768 left14:18
kadoban shafox: Did you change them all to squash?14:19
← zumba_addict left14:19
shafox kadoban: I tried but same error message coming14:19
← cbonobo left14:19
→ antimatroid joined14:20
kadoban That wasn't a suggestion, it was a question …14:20
→ zumba_addict joined14:20
cybertron iveqy: https://gist.github.com/remotecode/7786074033e8a9566ab414:20
shafox if want i can give all the commands that i have run. including whats the commit sha as well.14:20
← tmager left14:20
← momken left14:21
→ highcup joined14:22
← ki0 left14:22
ojacobson shafox: I would expect kadoban wants you to answer the question, mostly -- just a theory though14:22
iveqy cybertron: rm -rf .git/refs/original/ that line make me curious14:22
cybertron: I guess you're trying to remove all refs to the original commits14:22
however you won't remove packed refs14:22
ojacobson git filter-branch doesn't create packed refs, so that's (accidentally) not broken right now14:23
← polyzen left14:23
→ ki0 joined14:23
iveqy cybertron: you also don't remove the refs from the remote repository. You only add new ones14:23
ojacobson def. the wrong way to do it, but the right way is unnecessarily awkward14:23
shafox kadoban: ojacobson . To answer that question: Yes I have done that, once i got that error i tried to do with small number of commits to do the squash, now i have only 4 commits which i want to squash but it is giving me that error.14:23
cybertron iveqy: ?14:23
← zumba_addict left14:24
→ rzeka joined14:24
iveqy ojacobson: even if filter-branch doesn't create packed refs, the old refs are still packed, right?14:24
cybertron iveqy: so if have to remove original and remote refs?14:24
→ zumba_addict joined14:24
ojacobson iveqy: I would be surprised if there were "old refs" in the refs/original namespace14:24
→ ehmatthes joined14:24
kadoban shafox: Pick a time that it happened. Was it when you tried to squash every commit in the rebase -i ? I no longer have any idea what you actually did or didn't do, and what happened, or didn't.14:24
ojacobson clone doesn't create them, unless you use --mirror, and it's unlikely (but not impossible) that e's repacked some previous filter-branch14:24
jast packed refs are overridden by non-packed ones14:25
iveqy ojacobson: isn't refs/original the refs before the filter branch?14:25
jast usually you won't accidentally pack the refs/original refs14:25
→ gargola joined14:25
shafox kadoban: let me redo the steps again. I can do a gist of what i did as well.14:25
ojacobson shafox: I would expect that you're rebasing onto upstream, yes? Maybe do this in two steps: rebase your branch (with no changes) onto upstream, clean up any conflicts that causes, and _then_ start squashing commits14:25
iveqy: it's created by git-filter-branch14:25
("yes")14:25
← prillian5 left14:26
← Asiajey left14:26
cybertron iveqy: can u explain now? :)14:26
→ zumba_ad_ joined14:26
iveqy ojacobson: so does that mean that git-filter-branch removes refs from packed-refs if that refs is added to refs/original?14:26
kadoban shafox: That would probably be helpful. Although ojacobson's suggestion sounds quite good, maybe try that first.14:26
iveqy cybertron: you've to delete the refs on the remote14:26
cybertron: rm -rf just delete your local refs14:26
ojacobson No, but the 'rm' is likely intended to remove the backups created by the immediately-preceding filter-branch14:26
← zumba_ad_ left14:26
ojacobson I say "likely" because SOMEONE DIDN'T COMMENT THEIR SHELL SCRIPT so it's impossible to know intent for sure14:26
jast there's pretty much no chance the refs/original stuff will end up in packed-refs14:27
cybertron iveqy: so rm -rf .git/refs/original/14:27
erm14:27
iveqy: so rm -rf .git/refs/remote14:27
shafox ojacobson: The branch I am doing squashing is synced with upstream. No conflicts whatsoever.14:27
→ zumba_ad_ joined14:27
← Dragooon left14:27
ojacobson shafox: prove it.14:27
('git rebase' with no arguments should do fine)14:27
shafox ojacobson: gimme a sec14:27
iveqy jast: I don't understand. There should be a chance that the refs in .git/refs/original already was in packed-refs before the git-filter-branch was runned. Right?14:27
cybertron: no14:28
← zumba_addict left14:28
shafox ojacobson: git rebase requires branch name14:28
iveqy cybertron: the reason you get "your commits back" is that on your remote, there exists refs to your old commits. You have to delete those refs.14:28
← apfliege_ left14:28
shafox https://www.irccloud.com/pastebin/YnLiVLYI14:28
cybertron iveqy: and how?14:28
→ apflieger joined14:28
shafox ojacobson: ^^14:28
ojacobson shafox: neat :)14:29
← BuenGenio left14:29
cybertron iveqy: and does I loose my history then?14:29
iveqy cybertron: git push :<refname>14:29
cybertron: and yes it will14:29
→ BuenGenio joined14:29
cybertron uhhh :(14:29
I need that14:29
shafox ojacobson: shall i start from scratch ?14:29
jast iveqy: only if ran 'git gc' or 'git pack-refs --all' between the previous filter-branch and the current one14:29
ojacobson shafox: nope, that's sufficient14:30
cybertron iveqy: I loose my complete history or just of the delete files?14:30
ojacobson can you gist the rebase command + the list rebase -i makes you write, now? I'm curious about kadoban's side14:30
→ trang joined14:30
shafox ojacobson: ok. I was referring to this:: let me redo the steps again. I can do a gist of what i did as well.14:30
→ Clint0n_ joined14:31
shafox ojacobson: shall I just get the branch from upstream and then try to do rebase on it and make a gist ?14:31
iveqy cybertron: git doesn't track files, just content and history so yes your history will be lost14:31
that's what filter-branch DO14:31
cybertron thats shit :/ is there any other way to get my .git smaller?14:32
→ zumba_addict joined14:32
jast that's technically correct but also potentially misleading14:32
iveqy jast: hmm, this seems strange to me. I guess I've to do some experiments to understand this fully.14:32
jast your *rewritten* history is preserved14:32
← joo-_ left14:32
cybertron jast?14:32
jast well14:32
→ fooforge joined14:32
ojacobson git is not a source control system14:32
jast from what I understand, you've removed some files from some or all of your branches, right?14:32
ojacobson it's a bucket of pieces for building source control systems14:32
→ Asiajey joined14:33
← Asiajey left14:33
→ Asiajey joined14:33
cybertron jast: yes and I wanna shrink my .pack14:33
→ Dragooon joined14:33
ojacobson that's not what filter-branch does14:33
cybertron because I have fails when I clone my repo to my server14:33
jast sure, but it's a necessary step :)14:33
ojacobson filter-branch rewrites history14:33
qsuscs ojacobson: years ago, this was true. nowadays, it’s a pretty decent SCM14:33
← johnkevinmbasco left14:33
jast cybertron: did you run filter-branch in your local repository or in the remote one?14:33
← zumba_ad_ left14:34
← zheng left14:34
cybertron jast: I have done this git filter-branch --tag-name-filter cat --index-filter 'git rm -r --cached --ignore-unmatch filename' --prune-empty -f -- --all <-- I thinks its local or?14:34
← Dragooon left14:34
← Clint0n left14:34
jast unless you logged into the server and ran it there, yes14:34
cybertron jast: what u mean with that? logged in per ssh and run there?14:35
jast yes. I'm not saying that's what you need to do, I just wanted to know which you did. :)14:35
→ Dougie187 joined14:35
cybertron hehe ok14:35
jast: so just on my local host :)14:35
← tristanp_ left14:36
shafox ojacobson: kadoban These are the commits that i want to squash together and get a new single commit. These are being generated through git log. https://gist.github.com/shadow-fox/a6ebde7d9ec70c0445df14:36
cybertron so I thought I won't loose my history if I use filter-branch?14:36
← zumba_addict left14:36
→ pm90__ joined14:37
→ zumba_addict joined14:37
← Consuela left14:37
← phantombeta left14:37
← pm90__ left14:37
→ Dragooon joined14:37
jast cybertron: it's a matter of definitions. filter-branch works by altering your history such that you get an entirely new history which is about the same, except it excludes all references to the file(s) you removed14:37
→ nnyk joined14:38
→ joo-_ joined14:38
← pm90_ left14:38
jast it's pretty much the point of this whole operation, in your case, to "lose" the old history :)14:38
cybertron jast: If I loose the history of my removed files...that is ok14:38
→ pm90_ joined14:38
shafox ojacobson: kadoban I am going to update that gist on what I am doing and where I will get the error itself.14:38
cybertron jast: important is that I hold the history of the rest14:38
jast okay, and in the end you ran those commands to expire/prune/gc, and then you pushed, once with --all and once with --tags?14:39
← nnyk_ left14:39
→ devoldmx joined14:39
← joo-_ left14:39
cybertron jast yes to origin14:39
jast and those succeeded without error?14:39
cybertron jast: yes14:39
← apflieger left14:39
jast okay... so far, so good14:40
cybertron jast: http://stevelorek.com/how-to-shrink-a-git-repository.html I worked with this14:40
jantje hi, I would like to 'push logging' in a git pre/post receive hook. I'm thinking of writing git notes to the commit. Does anyone knows if such hook already exists so I can use it as an example?14:40
→ apflieger joined14:40
jast and your local repo blows back up again after a pull?14:40
cybertron jast jep14:40
→ Peter_Occ joined14:40
← dsdeiz left14:40
shafox ojacobson: funny thing. when i started again. it didnt complain. it went through without any errors.14:41
jast cybertron: okay. let's first see whether there's any superfluous stuff on the server... please put the output of this in a !paste@* somewhere: git ls-remote origin14:41
gitinfo Please paste snippets longer than one line at a pastebin site, such as https://gist.github.com/ rather than in-channel.14:41
jast if it's super secret, you may want to use a private pastebin and send the URL in a private message or something :}14:41
← RaceCondition left14:42
kadoban shafox: So there's no error anymore then?14:42
cybertron jast: http://pastebin.com/1UWakmxL14:42
→ phantombeta joined14:42
shafox kadoban: nope. it just rebased without any error.14:42
ska-fan Can I configure, "regardless of the current branch, fetch -p this remote and pull branch "develop" in one command?14:42
← nettoweb left14:42
jast okay, that looks clean enough14:42
ska-fan s/ in one command/" in one command"14:42
→ psoo_ joined14:43
cybertron jast: ok so I atm I just have filtered some files14:44
and cleaned up with gc prune14:44
→ tmager joined14:44
cybertron so know I would git push origin --force --all14:44
kadoban ska-fan: pull is a fetch + a merge. So … do the correct fetch and then do the correct merge. You can make an alias for it if you want. What's the point of making it one command?14:44
cybertron know=now14:44
jast cybertron: you're doing this all over again?14:45
← tmager left14:45
cybertron jast: I remvoed and cloned again ;)14:45
first thing... .git/refs/original/14:45
jast okay...14:46
cybertron das I need to remove that or not?14:46
jast let me know when you're done, before pulling again14:46
after filter-branch? yes, highly recommended14:46
cybertron ok14:46
← droid909 left14:46
jast if you're sure you've filtered away the right thing, that is14:46
→ Droolio joined14:46
← apflieger left14:46
jast one comment on the procedure: running both 'git gc' and 'git gc --aggressive' is unnecessary14:46
cybertron jast: done: everying up-to-date14:47
jast they do the same thing, only with different levels of compression14:47
← psoo left14:47
→ apflieger joined14:47
→ The_Phoenix joined14:47
cybertron ok ;)14:47
← The_Phoenix left14:47
cybertron jast so git push is done14:47
jast okay, now do that 'git ls-remote origin' again, and also this: git log --graph --pretty=format:%H%d14:47
→ nfk joined14:48
jast we can use that to make sure there is absolutely no unexpected differences between local and remote14:48
there shouldn't be in the first place, but better safe than sorry14:48
→ The_Phoenix joined14:48
← The_Phoenix left14:48
→ The_Phoenix joined14:48
→ gsingh93 joined14:48
← The_Phoenix left14:48
cybertron jast: u wanna see ALL?14:48
jast nah, cut off after a few dozen lines, I guess14:49
I'll complain loudly if that's not enough ;)14:49
→ Zupoman joined14:49
→ The_Phoenix joined14:50
← devoldmx left14:50
cybertron jast: http://pastebin.com/PBrXJrfR14:50
← crose left14:50
→ tmager joined14:51
→ crose joined14:51
← apflieger left14:51
→ apflieger joined14:51
→ delinquentme joined14:52
→ Bootinbull joined14:52
→ im8bit joined14:53
ojacobson heh14:53
just sent a CI service an email politely suggesting they stop using shallow clones14:53
→ tang^ joined14:53
ojacobson "thanks", git, for that lovely misfeature14:53
→ modocache joined14:53
→ jstimm joined14:54
cybertron jast: ?^^14:54
← The_Phoenix left14:54
← dreiss left14:54
← antimatroid left14:54
jast okay, modul_w isn't completely visible there but master looks fine, so that should be okay14:54
← haavstr left14:54
→ MattMaker joined14:55
jast git pull should be a no-op at this point14:55
← tmager left14:55
→ Akagi201_ joined14:55
→ SimonNa joined14:55
iveqy cybertron: what's git-revparse modul_w14:55
jast git rev-parse modul_w14:56
→ Technocrat7 joined14:56
jast should output 400d4f3f1cd5c5ac93a7605caa929f8e8d9983b814:56
← Dragooon left14:56
jast actually we already know that one14:56
→ The_Phoenix joined14:56
jast no, disregard14:56
cybertron hmm14:56
jast I'm confused :)14:56
iveqy jast: do we?14:56
← The_Phoenix left14:57
qsuscs jast: !beer14:57
gitinfo jast: Beer! It's what's for dinner!14:57
iveqy jast: we know that it should be the sha114:57
cybertron unknown revision or path not in the working tree.14:57
iveqy you mentioned. But we don't know14:57
jast oh14:57
iveqy so it seems like we have a problem...14:57
jast did you, in the howto you followed, maybe skip the step in which you ran a script that iterated over all refs?14:57
→ The_Phoenix joined14:57
→ woodruffw joined14:57
← joki left14:58
← The_Phoenix left14:58
→ EvilPenguin joined14:58
cybertron jast: which itaration?? the modul_w is a branch where I changed nothing14:58
jast so that branch doesn't contain any undesired files?14:58
→ The_Phoenix joined14:58
cybertron jast: yes14:58
jast okay, so we can ignore it14:58
cybertron :)14:58
→ uri_ joined14:58
← MattMaker left14:59
← The_Phoenix left14:59
← zumba_addict left14:59
← Akagi201 left14:59
ska-fan kadoban: Good idea, thanks!14:59
cybertron jast: and now?15:00
kadoban 'welcome15:00
→ The_Phoenix joined15:00
← The_Phoenix left15:00
kadoban ojacobson: Out of curiosity, why does it matter if CI tools use that?15:01
→ The_Phoenix joined15:01
jast cybertron: try a pull, hope for the best :)15:01
← Silmarilion left15:01
ojacobson kadoban: I work for Heroku. In my capacity there, I care because I have to support 'git push' deployment, and shallow clones break that horribly. :)15:01
cybertron jast: no I get back my old stand15:01
ojacobson shallow clone source repo, attempt git push heroku master from clone, sad trombone15:02
jast that doesn't make sense, because master on local and remote are identical15:02
cybertron jast: :/15:02
← acolson left15:02
→ joki joined15:02
kadoban ojacobson: Ah, I see.15:02
← EvilPenguin left15:02
← roelmonnens left15:02
jast cybertron: another run of this one? git log --graph --pretty=format:%H%d15:02
also, what did 'git pull' output?15:03
cybertron jast: it takes some minutes before the pull is finished and I hvae to go now :/15:03
jast strange15:03
cybertron jast: it pulls the complete repo15:03
→ Corey84 joined15:03
jast oh, maybe dumb HTTP or something15:04
cybertron ssh ;)15:04
← __main__ left15:04
jast hmm15:04
→ cdown_ joined15:04
iveqy cybertron: please come back and continue this problem. I'm really curious about what's causing this15:04
cybertron jast: much thanks for your help, perhaps we can check tomorrow again15:04
iveqy: I'll do ;)15:04
bigsky iveqy: i want to know how many lines are added to each commit15:04
← cdown left15:04
cdown_ → cdown15:04
jast okay, see you, perhaps :)15:04
iveqy bigsky: git log --stat?15:05
cybertron :)15:05
→ mikiones joined15:05
cybertron bye15:05
→ __main__ joined15:05
→ EminenceHC joined15:05
← D-Boy left15:05
iveqy bigsky: or even git show --numstat15:05
← c0mrad3 left15:05
iveqy bigsky: you can read details on man git show15:06
gitinfo bigsky: the git-show manpage is available at http://jk.gs/git-show.html15:06
← ThomasLocke left15:06
← __main__ left15:07
← Asiajey left15:07
→ Dragooon joined15:08
← ascarter left15:08
→ fakenullie joined15:08
→ ayylemayo joined15:08
← Ryanar left15:08
← nnyk left15:08
← Hestil left15:09
→ Asiajey joined15:09
→ cbonobo joined15:10
→ __main__ joined15:10
→ MechtiIde joined15:10
→ joo-_ joined15:10
← Kulrak left15:10
← jceb left15:11
→ nnyk joined15:11
← vishalud left15:11
→ Gamecubic joined15:12
← boblee left15:13
→ boblee joined15:13
→ lg188 joined15:14
← Sceorem left15:16
← airdisa left15:16
→ nettoweb joined15:17
→ D-Boy joined15:17
← beneggett left15:17
← nettoweb left15:18
→ airdisa joined15:19
← The_Phoenix left15:19
→ nettoweb joined15:19
← zoso left15:19
← Alienpruts left15:19
→ dreiss joined15:20
→ AMERICAN_PSYCHO joined15:21
→ The_Phoenix joined15:21
← rcn left15:22
← contentsafe_ left15:23
← joki left15:23
→ joki joined15:24
← StuartMI left15:24
→ zumba_addict joined15:25
bigsky iveqy: i wannt to get a list of how much lines inserted on each commit, that is diff HEAD~1, HEAD~1..HEAD~2, HEAD~2..HEAD~315:26
→ soc42 joined15:26
← The_Phoenix left15:26
← pheaver left15:27
← nettoweb left15:27
→ chuchunaku joined15:28
← Dorf left15:28
→ The_Phoenix joined15:28
← MarkyC left15:28
← The_Phoenix left15:29
→ The_Phoenix joined15:30
← The_Phoenix left15:30
→ The_Phoenix joined15:31
← ende_____ left15:31
← The_Phoenix left15:31
qsuscs bigsky: grep man git show for stat15:32
gitinfo bigsky: the git-show manpage is available at http://jk.gs/git-show.html15:32
qsuscs iirc there was such an option15:32
→ ende_____ joined15:32
→ StuartMI joined15:32
→ The_Phoenix joined15:32
→ Dorf joined15:32
← The_Phoenix left15:32
← cdown left15:33
← apflieger left15:33
→ apflieger joined15:33
← doev left15:33
→ cdown joined15:34
→ martinr joined15:34
→ The_Phoenix joined15:34
← gv left15:34
← TomyWork left15:34
← Spriz left15:34
iveqy bigsky: didn't I just told you how to do that?15:35
← trang left15:36
← ayylemayo left15:36
← psoo_ left15:37
→ incredible joined15:37
← modocache left15:37
← apflieger left15:37
← cromero left15:37
→ Clint0n joined15:37
→ modocache joined15:37
→ apflieger joined15:37
→ gv joined15:37
→ cromero joined15:38
→ KeroroGunsou joined15:38
gitinfo set mode: +v15:38
→ odin22 joined15:38
→ EvilPenguin joined15:38
martinr I've got a project that was forked from a git repo, but I don't know the commit ID that it was branched from. Is there a tool that will help me determine that?15:39
→ Noldorin joined15:39
kadoban martinr: forked how? Is the git history intact?15:39
martinr no, it was taken over to an svn repo.15:39
← The_Phoenix left15:39
martinr so I have no git history.15:40
← Clint0n_ left15:41
← ehmatthes left15:41
martinr I was thinking of writing a script that would do a diffstat on each commit id to try to figure it out, but don't want to write it if it already exists.15:41
← ende_____ left15:41
← fakenullie left15:42
→ The_Phoenix joined15:42
← modocache left15:42
← The_Phoenix left15:42
← cromero left15:42
→ apfliege_ joined15:42
→ stantonk joined15:42
→ Hestil joined15:42
← apflieger left15:43
kadoban I don't know of it if it exists. Definitely not something that's part of git, although some of the git plumbing could be helpful I'm sure.15:43
→ The_Phoenix joined15:43
← nour left15:43
jast martinr: if there's definitely a common commit and no merge have been made since the fork, this can be figured out with built in tools15:44
*merges15:44
← lb1a left15:44
← Gianormagantrous left15:44
→ Technocrat786 joined15:44
martinr I suspect that there have been changes, although I'm not positive of that.15:45
KeroroGunsou → d0lph1n9815:45
jast what do you mean by 'changes'?15:45
→ Es0teric joined15:45
→ Ryanar joined15:46
jast anyway, if you fetch the history from both repositories into a common repo, you can use 'git merge-base' to find the "most recent" commit common to both repositories15:46
martinr I assume that the code has been modified, so I can't just get a sha hash to compare.15:46
← apfliege_ left15:46
jast well, depends on how the forking was done15:46
← jzk left15:46
jast if the fork started over with a new initial commit that happened to contain the same files, then no, there's no common commit ID15:46
→ apflieger joined15:47
→ Gianormagantrous joined15:47
← Gianormagantrous left15:47
→ Gianormagantrous joined15:47
osse but then there is a common tree ID15:47
jast that would be a strange way to fork, though. generally you'd clone the original repo and then simply start committing different things15:47
→ devoldmx joined15:47
jast in that case you'll have all of the pre-fork history in common15:47
→ _tpavel joined15:48
martinr great. that gives me a place to start. Thanks.15:49
iveqy martinr: how was this svn repo converted to be a git repo?15:49
→ ncd|leeN joined15:49
→ kpease joined15:49
martinr we got a tarball of the directory with no version information.15:49
→ trang joined15:50
→ rcn joined15:50
← apflieger left15:50
→ apfliege_ joined15:50
martinr It's actually in svn now, the opensource project is in git.15:50
← Mrbitterness left15:51
← _tpavel left15:51
iveqy oh :(, what a mess15:52
→ dhilipsiva joined15:52
← ilmgb left15:52
dhilipsiva → Guest4292315:52
← The_Phoenix left15:52
martinr that was my thought too.15:52
osse martinr: you can create a tree hash of the contents of the tarball and compare to the trees in the git repo15:52
→ FreezingCold joined15:53
osse that'll only work if there are NO changes. but worth a try since it's pretty fast15:53
← leeN left15:53
← ashnur left15:54
→ nettoweb joined15:54
→ effi joined15:54
→ ashnur joined15:54
→ The_Phoenix joined15:54
← The_Phoenix left15:55
→ echelon joined15:55
echelon i tried to manually install git-svn from the source tarball15:55
← dreiss left15:55
← KennyRayFL left15:55
→ The_Phoenix joined15:56
← The_Phoenix left15:56
← veganista left15:57
→ The_Phoenix joined15:57
← The_Phoenix left15:57
← apfliege_ left15:58
→ The_Phoenix joined15:58
→ apflieger joined15:58
← The_Phoenix left15:58
← ashnur left15:59
→ The_Phoenix joined15:59
→ eka joined15:59
← The_Phoenix left15:59
→ ashnur joined15:59
→ polyzen joined15:59
← airdisa left15:59
→ The_Phoenix joined16:00
← The_Phoenix left16:00
← bb010g left16:00
echelon but i get this error.. http://pastebin.com/tUGaFwky16:00
after i did make git-svn16:00
← effi left16:01
→ The_Phoenix joined16:01
← apflieger left16:01
echelon i copied git-svn to ~/.local/bin which is in $PATH16:01
→ apflieger joined16:01
iveqy echelon: you're missing the perl-svn modules16:02
echelon and SVN.pm, SVN/, to ~/share/perl/5.18.2/Git16:02
← mikiones left16:03
→ fooforge_ joined16:03
← fooforge left16:03
← apflieger left16:03
← rubyonrailed left16:03
echelon iveqy: which files do i still need16:03
→ apflieger joined16:04
→ mikiones joined16:04
→ hackel joined16:04
← The_Phoenix left16:04
← intellix left16:04
← ashnur left16:05
← cdown left16:05
→ cdown_ joined16:05
→ ashnur joined16:05
cdown_ → cdown16:05
iveqy echelon: I don't know since I don't know perl good enough16:05
← bittyx left16:06
→ intellix joined16:06
← Gabri left16:06
→ moretti joined16:06
← Ryanar left16:07
← tumulte left16:07
→ Edgeline joined16:07
→ The_Phoenix joined16:07
← Edgeline left16:07
echelon i guess i need to install the SVN::Core module16:07
iveqy echelon: yes16:07
← mikiones left16:08
← The_Phoenix left16:08
← Guest42923 left16:09
→ shinnya joined16:09
← Peter_Occ left16:09
← jafa left16:09
← apflieger left16:10
→ apflieger joined16:10
→ The_Phoenix joined16:10
← bonswouar left16:10
← eka left16:11
← The_Phoenix left16:11
← Dragooon left16:12
→ bittyx joined16:12
← joo-_ left16:12
→ arnaud____ joined16:13
← lqi left16:13
→ bakednotfried joined16:13
→ joo-_ joined16:13
← trepidaciousMBR2 left16:13
← bakednotfried left16:14
→ otter768 joined16:15
→ imachuchu joined16:15
→ lqi joined16:15
→ lindenle joined16:16
→ scarabx joined16:16
→ bakednotfried joined16:16
← gsingh93 left16:16
← bittyx left16:17
← gfixler left16:17
← scarabx left16:17
→ mikiones joined16:18
→ Dragooon joined16:18
← loz-- left16:18
← encod3 left16:18
→ eka joined16:19
← lindenle left16:19
→ moreirap_ joined16:19
→ lindenle joined16:19
→ rubyonrailed joined16:19
→ loz-- joined16:19
← otter768 left16:20
← apflieger left16:20
← eka left16:20
→ apfliege_ joined16:20
→ Quevin joined16:20
→ jafa joined16:21
← moreirapontocom left16:21
← jolda left16:22
← mikiones left16:22
← mizu_no_oto left16:23
← apfliege_ left16:23
→ apflieger joined16:23
→ durham joined16:24
← darkbasic left16:24
← workerbeetwo left16:25
→ darkbasic joined16:25
→ TomyLobo joined16:25
← thiago left16:25
→ bittyx joined16:25
← ki0 left16:26
→ apfliege_ joined16:28
← apflieger left16:28
← joo-_ left16:29
← bittyx left16:30
→ Kulrak joined16:30
← Kulrak left16:30
→ Kulrak joined16:30
← Clint0n left16:30
→ ende_____ joined16:31
← devoldmx left16:31
→ alex1a joined16:31
← chuchunaku left16:34
← King_Hual left16:34
← Tennis left16:35
← cdown left16:35
← mikecmpbll left16:35
Kronuz hello16:35
foofin Hello!16:35
← apfliege_ left16:36
Kronuz hey, is there something like `git status --ignore-submodules=dirty` but for `git add` ?16:36
→ apflieger joined16:36
→ cdown joined16:36
Kronuz Like I wanted to do `git add -p --ignore-submodules=dirty`, but it's not allowed16:36
I just don't wat to have ignore = dirty in my .gitmodules16:37
→ skapunker joined16:37
→ Techno786 joined16:37
→ Sasazuka joined16:37
← arnaud____ left16:37
← d0lph1n98 left16:37
Kronuz (I'd want to ignore dirty while updating .gitmodules, but not for git status)16:37
→ modocache joined16:38
→ diegoviola joined16:38
→ mikiones joined16:38
← Asenar left16:39
← soc42 left16:39
← trang left16:39
← liamkeily left16:39
→ eka joined16:40
→ MattMaker joined16:40
→ gsingh93 joined16:40
→ CheckDavid joined16:41
→ trang joined16:42
← granthatcher left16:42
← ende_____ left16:42
→ King_Hual joined16:42
← King_Hual left16:42
→ King_Hual joined16:42
→ cssko joined16:42
→ ende_____ joined16:43
→ Pistos joined16:43
← settermjd left16:43
← modocache left16:43
→ devoldmx joined16:43
Pistos I am trying to do a git revert, but I previously made a wrong conflict resolution with that revert. I have done a `git revert --abort` to try again, but every time I redo the revert, it re-applies the rerere, even though I have tried to use `git rerere forget filename`.16:44
← dramagods left16:44
Pistos I have rerere.enabled = true in my ~/.gitconfig . Is that overriding things?16:44
← apflieger left16:44
Pistos No, even commenting that out doesn't help.16:44
← pm90_ left16:45
← MattMaker left16:45
← fooforge_ left16:48
← Cust0sL1men left16:48
ojacobson git -c rerere.enabled=false revert ...16:48
that'll suppress rerere forcibly for that one command16:48
← Droolio left16:49
→ mjuszczak joined16:49
← AugustoCesar left16:50
→ bittyx joined16:50
Pistos ojacobson: I'll give it a shot, thanks.16:52
← intellix left16:52
Pistos ojacobson: Brilliant, that did it. Thank you!16:52
→ Ryanar joined16:54
→ Jackneill joined16:54
← Hestil left16:55
← bittyx left16:55
→ m0viefreak joined16:56
← MKCone`Office left16:56
← Dragooon left16:57
→ chuchunaku joined16:57
Briman|off → Briman16:57
← ncd|leeN left16:57
← moretti left16:57
→ kukks joined16:58
← kukks left16:58
→ kukks joined16:58
→ Dragooon joined16:58
← Ryanar left16:58
→ kofione joined16:58
→ maqr joined17:00
→ bittyx joined17:00
→ jacaballero joined17:00
→ thiago joined17:01
PerlJam Wee! A student worker just committed a 1.8 GB text file of generated numbers.17:01
→ mikecmpbll joined17:02
iveqy PerlJam: congratulations17:02
ojacobson I'm sorry for your impending rewrite17:02
→ seishun joined17:02
→ Gabri joined17:03
seishun is there a single command for rebasing a branch onto master and then merging it into master?17:03
ojacobson no17:03
← hackel left17:03
iveqy seishun: !alias17:03
gitinfo seishun: You can set up alias to be used by git, see: http://git-scm.com/book/en/v2/Git-Basics-Git-Aliases17:03
← Grimlock1 left17:05
← Es0teric left17:05
→ akiva joined17:05
← Error404NotFound left17:05
→ Err404NotFound joined17:05
Pistos Maybe git should have a "big file warning threshold" or something.17:05
← trang left17:06
← bvi left17:06
iveqy Pistos: nah, it will be caught in the review process anyway17:06
→ jskt joined17:06
_ikke_ You can always add a pre-commit hook17:07
→ RedShift joined17:07
Pistos _ikke_: This... is true.17:07
← mjuszczak left17:07
← jnavila left17:07
→ intellix joined17:08
→ jolda joined17:08
iveqy but that would just solve your adding big files problems. There's a lot of other stuff that are more dangerous to commit that it won't catch17:08
← intellix left17:08
→ pecg joined17:08
_ikke_ iveqy: But getting rid of big files is quite a nuissance if they've been pushed17:08
← Dorf left17:09
qsuscs introduce some sort of review17:09
iveqy _ikke_: I see your point, but there should be a review process where commits gets disgarded easily17:09
← bittyx left17:09
qsuscs gerrit, those hipster pull request GUIs, mailing lists (hf with >1G via mail), …17:09
← noname1 left17:10
_ikke_ iveqy: Sure17:10
iveqy: But the earlier mistakes are caught, the better17:10
iveqy: defense in depth17:10
iveqy yeah, there's already a 10 MB limit for emails, so then it's already fixed ;)17:10
_ikke_: yeah, you've a point.17:11
_ikke_ iveqy: There are few companies that use email patches17:11
iveqy _ikke_: internally yes17:11
→ daedeloth joined17:11
→ mizu_no_oto joined17:11
← Gabri left17:12
← mikiones left17:12
← kukks left17:12
→ mikiones joined17:12
→ Gabri joined17:13
← jason237 left17:13
→ pheaver joined17:15
→ iodt joined17:17
→ ilmgb joined17:17
← mikiones left17:18
← shafox left17:18
→ vreo joined17:18
← vreo left17:18
→ dreiss joined17:18
→ bittyx joined17:18
→ xcesariox joined17:19
→ Hestil joined17:19
→ tristanp_ joined17:20
← iodt left17:21
← bittyx left17:23
→ ki0 joined17:24
→ Uouwb joined17:24
→ joeyDB joined17:24
← Uouwb left17:25
→ sCiphre joined17:25
→ noname1 joined17:25
→ ropav joined17:26
← Dragooon left17:26
← twoface88 left17:26
→ vishalud joined17:27
→ KennyRayFL joined17:28
→ jdctx joined17:28
→ moretti joined17:28
← vishalud left17:28
→ Es0teric joined17:28
→ liamkeily joined17:28
← m0ltar left17:29
→ vishalud joined17:29
← Pistos left17:29
→ hackel joined17:29
← ki0 left17:29
← zgzgzg left17:29
→ Dragooon joined17:30
← marcogmonteiro left17:31
→ Malsasa joined17:31
→ apurcell joined17:32
← ThinThread left17:33
← Dragooon left17:33
← vishalud left17:33
→ Dragooon joined17:34
→ kavelot joined17:34
→ Orko joined17:34
← dallen left17:34
← xcesariox left17:35
→ Dorf joined17:35
kavelot I made a branch from "master" a while ago, and master got a few patches. Is it possible to update my current branch as if I just had made a branch now and applied my changes (I understand I might need to do some merging)?17:35
_ikke_ kavelot: that's rebasing17:35
→ pantsman- joined17:35
kavelot tks17:36
← Orko left17:36
← jacaballero left17:36
← hahuang65 left17:36
→ someircname joined17:36
← Dragooon left17:36
→ ixjlyons joined17:36
← jskt left17:36
→ Dragooon joined17:37
← ropav left17:37
← chuchunaku left17:38
← BuenGenio left17:38
→ xcesariox joined17:38
← mellernoia left17:38
← shinnya left17:38
→ orko joined17:38
← KennyRayFL left17:39
→ Aune joined17:39
→ kukks joined17:40
→ Error404NotFound joined17:40
→ chuchunaku joined17:40
← moretti left17:40
← Err404NotFound left17:41
→ a-l-e joined17:42
← MechtiIde left17:43
← edude03 left17:43
→ vivekananda joined17:44
← liamkeily left17:44
← kavelot left17:45
← ashnur left17:45
← EminenceHC left17:45
→ effi joined17:45
← Ulrar left17:47
← devoldmx left17:47
← pheaver left17:47
→ ashnur joined17:47
→ devoldmx joined17:47
→ pheaver joined17:48
← jolda left17:49
gitinfo set mode: +v17:50
orko anyone see my message?17:50
→ KennyRayFL joined17:50
← effi left17:50
Dougie187 orko: yes17:50
→ oonska joined17:51
orko ok I was seeing the message cannot send to #git17:51
← jrnieder left17:51
orko ok guys I am new here. This is my first day here. And I am new in git too. I am going to ask many foolish and childish questions to you from now until I learn a bit of git17:52
→ m0ltar joined17:52
orko please dont mind. Rather help me to learn Git :)17:52
first question is How can I install Github on my Ubuntu 14.04LTS?17:52
→ EminenceHC joined17:52
→ pm90_ joined17:53
qsuscs there is no github client for linux17:53
← chuchunaku left17:53
qsuscs just install git17:53
← Corey84 left17:53
orko is git and github same? so if I install Git then Github will be installed too?17:53
qsuscs package name should be git, so apt-get install git or aptitude install git17:53
no17:53
!github is a hosting provider, using the git SCM17:53
gitinfo Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)17:53
← MLM left17:53
qsuscs … wrong factoid.17:53
orko: it’s roughly like “is ubuntu and linux the same?”17:54
← EminenceHC left17:54
→ EminenceHC joined17:54
orko I see17:54
→ jrnieder joined17:55
→ chuchunaku joined17:55
orko ok got it. So Git is a software and Github is actually the host of it?17:56
qsuscs no17:56
→ LACabeza joined17:56
qsuscs git is a distributed SCM, so there’s no need for a server17:57
but usually you’ll want one17:57
orko then?17:57
→ jecra joined17:57
qsuscs and GitHub is a service that hosts git repositories and some stuff around that (wikis, bug trackers, …)17:57
orko scm or VCS?17:57
qsuscs whatever you like17:57
← Hestil left17:57
qsuscs the README calls it “information manager from hell” ;)17:57
← highcup left17:58
orko I know that git is a DVCS. Can you tell me full meaning of SCM?17:58
→ _chad joined17:58
← mezod left17:58
← Nizumzen left17:58
← EvilPenguin left17:58
osse depends on who you ask17:58
Some say SCM = Source Code Management, in which case I guess that VCS ~ SCM17:59
qsuscs (great weechat. both orko and osse are 4 chars long, both have voice … both are the same color.)17:59
osse others say Software Configuration Management which I think means a lot more17:59
← KennyRayFL left17:59
bigsky meow17:59
→ highcup joined17:59
j416 qsuscs: just define more colours :)17:59
osse VCS, build config tracking, artifact archiving, etc etc etc17:59
qsuscs osse: i interpret it as source code manager, comes to the same thing18:00
j416: i already did :(18:00
_ikke_ source code management18:00
→ AugustoCesar joined18:00
osse qsuscs: chat_nick_colors = "1,2,3,4,5,6,9,10,11,12,13,14,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,56,57,58,61,62,63,64,65,66 ,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,104,105,106,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,118:00
25,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,146,147,148,149,150,151,152,153,154,155,156,157,160,161,162,163,164,165,166,167,168,169,170,171,172,173,17 4,175,176,177,178,179,180,181,182,183,184,185,186,190,191,192,193,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,226,227,228,229"18:00
_ikke_ osse: I would necessarily call it artifact archiving18:00
osse: auch :P18:00
→ MLM joined18:00
_ikke_ osse: gesundheit18:01
← t4nk601 left18:01
osse oh it was on purpose18:01
but danke18:01
_ikke_ yeah, noticed18:01
orko asaik Git can be used for many works beyond programming. So VCS is correct I guess18:01
ojacobson orko: git's a system for storing snapshots of a tree of files, comparing them, and describing how those snapshots relate to one another. What you do with those capabilities is more or less up to you.18:02
orko the irc is very crowdy! I am often loosing the answers.18:02
can I pm anyone?18:02
← marscher left18:02
← imv left18:02
orko hm18:03
→ baweaver joined18:03
orko well is a central server necessary for git?18:03
I mean for DVCS?18:03
or local repos can serve for each other?18:04
→ liamkeily joined18:04
← zadock left18:05
iveqy orko: !books !talks18:05
gitinfo orko: [!book] There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable18:05
orko: Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)18:05
iveqy orko: a central server is not needed. But usually you need a common place to fetch the current version from18:05
→ nottombrown joined18:05
iveqy orko: or rather, someone18:05
orko iveqy got it :)18:06
yes I am seeing some tutorials. But asking questions here to clarify some confusions18:06
I am seeing tutorialspoint18:06
and githubs interactive tutorial18:07
← jecra left18:07
orko I dont want to go deep. Just want to learn basic and start working. Once I get some lessons I would be able to search more from internet without asking anyone18:07
→ hahuang65 joined18:08
orko well so on my Ubuntu I can install git using apt-get and then I can use github using the installed git?18:08
or to access github I have to do something more?18:08
osse to access github you need to create an account18:08
you don't need github to get started18:08
← EminenceHC left18:09
orko yes I know this18:09
← lamont left18:09
orko ok18:09
then I will be using my local repo?18:09
→ EminenceHC joined18:09
osse yes18:09
orko lets say I and my friend we 2 want to work on a file. Then do you mean one of our PC can be used as central repo?18:10
→ KennyRayFL joined18:10
→ styx_ joined18:11
styx_ hi! is it possible to reject a commit done by the ecplise git plugin?18:11
_ikke_ orko: Can be, but you need a transport mechanism18:11
styx_: reject?18:11
orko hm18:11
I guess this is kinda advanced lesson. So not going to dig into deep now18:12
_ikke_ orko: What os are you using?18:12
orko Ubuntu 14.04LTS18:12
styx_ _ikke_: it should not be possible to push the commit to the remote repository18:12
→ twoface88 joined18:12
orko how are you making the beep?18:13
when I write you here the beep too?18:13
osse styx_: do you have a reliable way of detecting whether eclipse created it?18:13
ojacobson your client is beeping when you're mentioned18:13
→ macabre joined18:13
_ikke_ orko: Probably because I mention your name18:13
ojacobson if you don't like it, reconfigure your client: nobody here's causing your client to beep specifically :)18:13
_ikke_ orko: And no, that doesn't happen for me18:14
orko _ikke_ you here me? :)18:14
→ siprbaum joined18:14
→ d3r1ck joined18:15
orko ojacobson :)18:15
← KennyRayFL left18:15
d3r1ck hi18:15
orko osse :)18:15
d3r1ck hi18:15
styx_ osse: i dont know, i never tried to do a commit hook. does the commit arrive as a plain diff?18:15
→ otter768 joined18:15
osse styx_: no. it arrives in a pack consisting of trees and blobs and such18:16
but you can look at the diff in a hook18:16
orko My another question is , is working directory and local repo same? Or local repos is the .git folder created after git init command run?18:16
← nnyk left18:16
_ikke_ The local repo is considered everything you have locally, (.git dir and working tree), the working tree are the files you work with18:17
← mizu_no_oto left18:17
← johtso- left18:18
← Malsasa left18:18
← SmashingX2 left18:19
orko +_ikke_ you mean if my directory name is Orko and if I init within Orko then the Orko will be local repo and working directory both?18:19
→ johtso_ joined18:19
orko or only the directory .git (which is hidden dir) inside of the Orko will be local repo?18:20
← cebor left18:20
osse tomato potato18:20
← otter768 left18:20
→ mizu_no_oto joined18:20
← joeyDB left18:21
→ cebor joined18:21
orko what does you meand osse?18:21
ChanServ set mode: +o18:21
← Aune left18:21
→ denisMone joined18:22
osse orko: I mean it's not important and people use the same term for different things18:22
← nottombrown left18:22
→ Zoddo joined18:22
d3r1ck orko: please do you know about translation in git?18:22
orko osse well then people actually confusing newbies18:23
← lqi left18:23
→ hs366 joined18:23
osse yes18:23
I for one would call the whole thing the repo18:23
.git + all the other stuff = repo18:23
← AugustoCesar left18:23
→ mjuszczak joined18:23
d3r1ck osse: i just asked a question, can you help me?18:24
orko I guess the second one is much better18:24
osse d3r1ck: I don't know whether orko knows about translation, but I assume he doesn't18:24
orko d3r1ck no dude. I am more new than you18:24
← tachoknight left18:25
→ ki0 joined18:25
→ m8 joined18:25
_ikke_ probably autocompletion fail18:25
← vurma left18:25
_ikke_ d3r1ck: !anyone18:25
gitinfo d3r1ck: Usually, it does not help to ask for someone specific to help you. Without knowing your specific problem, nobody knows if they can be of assistance. Please ask your questions and wait until somebody speaks up.18:25
→ arnaud____ joined18:25
_ikke_ d3r1ck: Can I give you an honest tip? Please don't try to claim people, it will only work against you.18:26
← paulweb515 left18:26
_ikke_ d3r1ck: People are busy, and they'll help you if they know the answer18:26
→ vixterra joined18:26
→ MattMaker joined18:26
_ikke_ d3r1ck: So it helps far better to just ask a question in this channel18:27
→ edude03 joined18:27
orko ok my another question is git add . does these command add all the files inside of a working directory?18:27
I mean stage18:27
← systmkor left18:27
→ KWhat_Work joined18:27
osse yes18:27
except the ones that are ignored by any .gitignore files18:27
→ tachoknight joined18:27
_ikke_ note that the behaviour recently changed18:27
← bigsky left18:28
d3r1ck orko: ohhh18:28
KWhat_Work hey, I am trying to do a git submodule update --init --recursive and it keeps telling me that error: The requested URL returned error: 403 Forbidden while accessing https://github.com/Site/project.git/info/refs18:28
qsuscs KWhat_Work: try git ls-remote https://github.com/Site/project.git18:28
_ikke_ KWhat_Work: Hmmm, someone else had it too18:28
← f3lp left18:28
orko actually I want to know lets say there are 4 folders including .get folder inside of my Orko working directory. So git add . will add all the files even within the folders too?18:29
d3r1ck _ikke_: i have taken note and thanks18:29
← howlymowly left18:29
d3r1ck i am learning day by day :)18:29
_ikke_ orko: git ignores the .git directory of course18:29
KWhat_Work qsuscs: its still returns 403, the effed part is i can clone the submoulde just fine18:29
ojacobson Over http?18:30
KWhat_Work via git18:30
ssh18:30
orko _ikke_ okay18:30
_ikke_ KWhat_Work: He means, using the http protocl18:30
← ki0 left18:30
← arnaud____ left18:30
_ikke_ KWhat_Work: Aparently github is in the transition of dropping dumb http support18:30
orko now what is the purpose of this command git add -A . ? _ikke_18:30
qsuscs KWhat_Work: simplest solution: edit .git/config, adjust the submodule URL to use SSH18:30
ojacobson KWhat_Work: well, you're not using SSH to clone the submodule18:30
← MattMaker left18:30
ojacobson so what works with SSH is currently irrelevant18:31
qsuscs' suggestion may be useful :)18:31
→ jottr joined18:31
← baldfat left18:31
qsuscs they always are.18:31
→ Neozonz joined18:31
← Neozonz left18:31
→ Neozonz joined18:31
qsuscs if not for solving problems, then for learning :Þ18:31
→ DerisiveLogic joined18:31
_ikke_ https://github.com/gitster/git.git/info/refs18:31
d3r1ck Does anyone know about statement translation in git? I wish to understand something that is troubling me18:31
KWhat_Work ahh thanks qsuscs18:31
_ikke_ d3r1ck: Anything specific?18:32
qsuscs KWhat_Work: out of interest, git --version please18:32
→ moretti joined18:32
d3r1ck in the porcelain commands, when i meet a statement: die("something");18:32
← kukks left18:32
d3r1ck i translate to die(_("something"));18:32
→ denete_ joined18:32
← moretti left18:32
qsuscs (1.6.6? turning off in 2011?! wtf.)18:33
d3r1ck i don't know if that is what its all about but i need some clarifications18:33
→ moretti_ joined18:33
grawity most of the time, yeah18:33
→ sgen_ joined18:33
← hackel left18:33
grawity you just wrap the string in the _(…) function18:33
d3r1ck i am to figure out porcelain commands and translate them18:33
ojacobson ...and provide translations in the appropriate message bundle18:33
orko well I just initialized git in a dir and I see the .git file instantly!18:33
→ jonmorehouse joined18:34
_ikke_ qsuscs: someone with 1.7.10 also had the issue18:34
d3r1ck also what about statement with placeholders18:34
orko asaik the .git is a hidden dir18:34
KWhat_Work qsuscs: this is 1.7.118:34
qsuscs hrmmm.18:34
d3r1ck die("%s something", var);18:34
← baweaver left18:34
qsuscs i wonder whether those try dumb transport first18:34
d3r1ck i translate to die(_("%s something"), var);18:34
is that the correct pattern or way?18:34
← sgen_ left18:34
ojacobson d3r1ck: that should work, provided all of the translations contain the same placeholders in the same order, but it's fragile -- if one of the translations has the wrong placeholders, you'll get anything from unpredictable output to segfaults18:35
→ Ryanar joined18:35
qsuscs KWhat_Work: besides, i’d upgrade. i think 1.7.1. even suffers from the remote code execution bug (which might not be relevant if you’re on something unixy and using a case-sensitive fs, aka most linux and *BSD setups, _not_ os x and windows)18:35
Eugene changed the topic to: Welcome to #git, the place for git help and existential permanence | Current stable version: 2.4.0 | Start here: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Why did the commit cross the rebase? To git to the other repo18:35
Eugene set mode: +v18:35
Eugene set mode: -o18:35
← denete left18:35
KWhat_Work qsuscs: rhel for the win18:35
orko anybody giving me answers or I am just missing due to huge floods of strings?18:35
→ jason237 joined18:35
_ikke_ d3r1ck: the po/README covers that18:36
KWhat_Work qsuscs: those changes to the .git/config, how can I make them for the repo so i dont get this issue again18:36
← Nikhil_D left18:36
d3r1ck meaning i am on the right track?18:36
→ Nikhil_D joined18:36
qsuscs KWhat_Work: you mean change the submodule URL in the super-repo’s .gitmodules? edit it right there. but this might not be what you want18:36
_ikke_ orko: git add -A also stages files that are removed, which git add . doesn't do18:36
← nutron left18:37
orko define removed. You mean which are removed from staging area or deleted/removed from the Orko directory?18:37
_ikke_ orko: the latter18:37
orko hm18:38
← liamkeily left18:38
qsuscs (olol, compiling 1.7.1.4 throws warnings for about every file)18:38
d3r1ck i submitted some patches on what i did about the translation but i got some feedbacks18:38
→ liamkeily joined18:38
d3r1ck meaning i have to start all over18:38
← herr_jth left18:38
→ modocache joined18:38
_ikke_ d3r1ck: It's a learning process18:38
d3r1ck the feedbacks i had mostly where about working only on the porcelain commands and also to work on my commit messages18:39
← liamkeily left18:39
d3r1ck _ikke_: yes i understand18:39
→ KennyRayFL joined18:39
d3r1ck and that is why i am very happy18:39
← DARSCODE left18:39
orko well then lets say I have created a file in Orko working directory name _ikke_.txt. Now I shift+deleted the file. Now if I use git add -A . then the file _ikke_ will be staged?18:39
← denete_ left18:40
qsuscs ls-remote for any github repo with 1.7.1.4 does not print an error18:40
_ikke_ orko: Only if the file was tracked before. and the file will be staged for removal18:41
→ denete joined18:41
_ikke_ so: git add file.txt; git commit -m file; rm file.txt18:41
← totesmuhgoats left18:41
d3r1ck _ikke_: wow, the po/README explains everything detaily18:41
_ikke_ if you know do git add -A, then file.txt wil be staged for removal18:41
d3r1ck _ikke_: i am already enjoying it18:41
← jdctx left18:41
_ikke_ d3r1ck: That's why it's called README :-)18:42
You are encouraged to read those18:42
Eugene README? I hardly KNOWME!18:42
orko _ikke_ you mean if I stage the file before then after git reset the file will be removed from staging area. And then if I shift+delete the file from working directory the file can be staged again using git add -A command?18:43
← wowaname left18:43
← axu left18:44
→ sgen joined18:44
_ikke_ orko: When you remove a file from disk (shift + delete as you call it), then git will not automically commit that removal18:44
orko: You have to stage the removal18:44
→ Hello71 joined18:44
_ikke_ git add . add all the files in the current directory and below to the staging area18:45
orko then why should I use -A as I have to stage it manually18:45
→ kukks joined18:45
_ikke_ orko: git add -A does that18:45
let me explain further18:45
orko ok18:45
d3r1ck but i noticed string which are to be translated should be marked for translation only by core developers18:45
qsuscs (wtf, 1.7.1.4 creates .git/branches/)18:45
orko well I just installed git on my pc and I see the version number is 1.9.018:46
d3r1ck i am not a hard-core now, so how will i do that?18:46
_ikke_ orko: removed files are not a part of the working tree, so git never does anything with them when you do "git add ."18:46
→ effi joined18:46
orko ok got it _ikke_18:46
err 1.9.118:46
I guess this is the latest git18:46
_ikke_ nope18:46
2.4.018:46
← modocache left18:47
→ yqt joined18:47
orko oh then I had to run update command?18:47
→ modocache joined18:47
→ boombatower joined18:48
← boombatower left18:48
→ boombatower joined18:48
orko _ikke_ now what should I do to get the latest one?18:48
→ devoldmx3 joined18:48
← devoldmx3 left18:48
→ devoldmx3 joined18:49
_ikke_ orko: Add a PPA which contains it18:49
orko do you know the command?18:49
← devoldmx left18:49
_ikke_ orko: nope18:49
d3r1ck: I think they mean the core developers as opposed to the translators18:50
← tachoknight left18:50
→ jskt joined18:50
← Techno786 left18:50
→ matachi joined18:50
← Technocrat7 left18:50
→ Guest96510 joined18:50
← Technocrat786 left18:51
← effi left18:51
→ ropav joined18:51
← AMERICAN_PSYCHO left18:51
← uri_ left18:52
← IrishPrime left18:53
→ jzk joined18:53
← Ryanar left18:54
→ liamkeily joined18:54
← souther left18:55
→ EvilPenguin joined18:55
→ tachoknight joined18:55
→ souther joined18:55
← orko left18:55
← cdown left18:56
← d3r1ck left18:56
→ tmager joined18:57
→ lokodo joined18:58
← mojibake left18:58
→ Hestil joined18:58
← nettoweb left18:58
← kofione left18:59
→ joo-_ joined18:59
← ashnur left18:59
→ Ryanar joined19:00
← EvilPenguin left19:00
← Hestil left19:03
← chuchunaku left19:03
→ ferr joined19:04
← beckyconning_ left19:04
→ sparetire joined19:04
← EminenceHC left19:05
← jonmorehouse left19:05
← modocache left19:06
→ modocache joined19:08
→ Hestil joined19:10
← jhermann left19:10
← bakednotfried left19:10
← dc5ala left19:12
→ jhermann joined19:13
→ WaReZ joined19:13
← ferr left19:13
← cavallari left19:14
→ cavallari1 joined19:14
→ ashnur joined19:14
← ashnur left19:14
→ ashnur joined19:14
← modocache left19:15
→ durham_ joined19:15
← ashnur left19:15
→ jonmorehouse joined19:17
→ chuchunaku joined19:18
← durham left19:18
→ modocache joined19:19
← tristanp_ left19:19
← belak left19:20
→ belak joined19:20
→ justtobe joined19:20
← Guest96510 left19:20
← incredible left19:20
← moretti_ left19:21
→ modocach_ joined19:21
← dougsland left19:21
← floppyea1s left19:22
← belak left19:22
← sebhoss left19:22
→ belak joined19:22
← KWhat_Work left19:23
← modocache left19:23
← belak left19:25
→ belak joined19:25
← pobivan left19:25
← chuchunaku left19:26
→ EminenceHC joined19:26
→ dvl_ joined19:27
→ arnaud____ joined19:27
→ nikio_ joined19:27
dvl_ I've been reading http://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration and wonder: Can these settings work the repo server, or are they all client-side?19:27
← belak left19:27
→ belak joined19:27
← kukks left19:28
→ hcc23 joined19:28
← swoorup__ left19:28
→ tristanp_ joined19:28
→ roelmonnens joined19:29
ojacobson dvl_: git settings are (effectively) per repo, per user, and per host, resolved in that order19:29
→ kofione joined19:29
ojacobson a clone is a new repo19:29
iveqy dvl_: depends on your usecase. You can definitely set them on a git server but they won't be used19:29
ojacobson note that a bunch of git options are shell-equivalent, so trusting some random repo's config is unwise19:29
← gsingh93 left19:30
→ beckyconning_ joined19:30
← ende_____ left19:31
→ swoorup__ joined19:31
← EminenceHC left19:31
dvl_ iveqy: That's what I thought. It seems that in order to do Kerberos-based authentication (without having to enter a password) via https, the URL must have a foo@ (any value of foo; it's not used). This can be fixed client side via the insteadOf directive in 'git config'. Now I'm considering using Apache rewrite to achieve the same thing.19:31
→ ende_____ joined19:31
← arnaud____ left19:32
→ dougsland joined19:32
dvl_ ojacobson: the beauty of Kerberos is no need to type your password. The awkward bit about git Kerberos Auth is ... that password entry unless you have the URL just so...19:32
→ autonomoid joined19:35
← rcn left19:36
← twoface88 left19:36
→ jacaballero joined19:36
← liamkeily left19:37
→ sq-one joined19:37
→ paulweb515 joined19:37
← mizu_no_oto left19:38
→ dhilipsiva joined19:38
← ropav left19:38
_ikke_ dvl_: weren't you here earlier with a question about kerberos?19:39
dhilipsiva → Guest2032319:39
→ ropav joined19:39
← pantsman- left19:39
← wicope left19:39
dvl_ _ikke_: I bet I was. I've been working this solution for some time. First step was get a bug in git fixed. ;)19:40
→ twoface88 joined19:40
_ikke_ dvl_: Cool!19:42
← twoface88 left19:42
← tristanp_ left19:42
← mjuszczak left19:43
→ tristanp_ joined19:44
← tristanp_ left19:46
→ nnyk joined19:46
→ apflieger joined19:46
→ mariuscc2 joined19:47
→ Josh|SYN joined19:47
← cbonobo left19:48
← edude03 left19:49
← swoorup__ left19:49
→ skylite joined19:49
→ edude03 joined19:49
← durham_ left19:49
→ pantsman- joined19:49
← mariuscc left19:49
← matachi left19:50
→ durham joined19:50
← skylite left19:50
→ Amandil joined19:50
← apflieger left19:51
← devoldmx3 left19:51
→ afs joined19:51
→ dsdeiz joined19:51
← sq-one left19:52
← roelmonnens left19:53
← macabre left19:54
→ liamkeily joined19:54
← modocach_ left19:55
→ zadock joined19:55
→ modocache joined19:55
← crose left19:56
→ tristanp_ joined19:57
→ MattMaker joined19:57
← rzeka left19:57
→ Alienpruts joined19:57
← blahdodo left19:58
← a-l-e left19:58
← stantonk left20:00
← dsdeiz left20:00
← tristanp_ left20:01
← duderonomy left20:01
← Dougie187 left20:02
← MattMaker left20:02
→ nikio__ joined20:02
← sword`` left20:02
→ blahdodo joined20:03
→ stantonk joined20:03
← DistantStar left20:04
→ vrishab joined20:05
← modocache left20:05
← nikio_ left20:05
← luksaur left20:05
jrnieder d3r1ck: welcome to core git development :)20:05
→ sid__ joined20:06
→ mjuszczak joined20:06
← weaksauce left20:07
→ gsingh93 joined20:07
→ EminenceHC joined20:07
→ Ggaby joined20:08
→ editshare-ericf joined20:08
→ basiclaser joined20:09
→ mizu_no_oto joined20:09
← vrishab left20:09
← jost left20:10
← sid__ left20:10
→ tristanp_ joined20:10
→ DistantStar joined20:10
→ EvilPenguin joined20:11
→ jstrong joined20:12
jstrong can someone help me with this? http://i.imgur.com/yo99ClE.png20:12
← ropav left20:12
← jstimm left20:12
jstrong Basically, the feature branches off of develop. So, if I try to merge the feature branch into master, it brings in a bunch of commits on develop that are not directly related to the feature itself. (the blue commits)20:13
I want to splitstream the feature commits and those commits only onto master without the rest of the develop commits in the timeline20:13
I understand this could create conflicts that would need to be resolved20:13
ojacobson rebase the feature branch onto the merge base of master and develop20:13
→ oojacoboo joined20:13
jstrong so basically git rebase master?20:13
ojacobson (yes, this may mean it will no longer contain some of develop; you have to pick which is more important to you)20:13
no20:13
← ilmgb left20:13
ojacobson I meant what I said20:13
→ SoFLy joined20:14
← tristanp_ left20:14
ojacobson "onto" as in "--onto", "merge base" as in "git merge-base"20:14
jstrong ah, wasn’t familiar with the merge-base feature20:14
ojacobson it's the last commit both branches shre20:14
share20:14
possibly several, but in most cases either none or one commit20:15
jstrong gotcha20:15
→ baweaver joined20:15
jstrong awesome dude, thanks :)20:15
← Padawan left20:15
→ devoldmx joined20:16
← EvilPenguin left20:16
→ Padawan joined20:16
→ otter768 joined20:16
← netameta left20:17
← pm90_ left20:17
→ unknwn- joined20:17
← ErKa left20:17
→ luksaur joined20:17
← quentusrex left20:18
→ nottombrown joined20:18
← StuartMI left20:19
→ AMERICAN_PSYCHO joined20:19
→ modocache joined20:20
→ modocach_ joined20:20
← mariuscc2 left20:20
← chrisgeorge left20:20
→ Giannino joined20:21
← Giannino left20:21
← nottombrown left20:21
← otter768 left20:21
← AMERICAN_PSYCHO left20:21
← diegoviola left20:22
→ netameta joined20:23
→ cagedwisdom joined20:23
← junecaz left20:23
← Hestil left20:23
→ AMERICAN_PSYCHO joined20:23
← Josh|SYN left20:24
← jacaballero left20:24
← modocache left20:24
← mjuszczak left20:24
← Jackneill left20:24
← babilen left20:25
→ junecaz joined20:25
→ jacaballero joined20:25
_ikke_ Note that git rebase already calculates the merge-baes20:26
→ babilen joined20:26
← modocach_ left20:27
← RedShift left20:27
← DerisiveLogic left20:28
→ ropav joined20:28
→ systmkor joined20:29
← jstrong left20:29
ojacobson yeah, and in jstrong's case it includes parts of history that are, in eir head, not part of the branch in question20:29
(git can't know that, of course)20:29
→ cbonobo joined20:30
→ Neozonz|Disc joined20:30
← moreirap_ left20:31
→ wowaname joined20:31
→ gopar joined20:32
← Kage left20:32
← rubyonrailed left20:33
← Arsonide left20:33
→ Arsonide joined20:33
← AaronMT left20:33
← Neozonz left20:34
← jamietech left20:35
← jumpman left20:35
← Ggaby left20:35
← gfvf left20:36
→ jumpman joined20:36
→ nottombrown joined20:38
← mehdi left20:38
← reinrag left20:39
← xyNNN left20:39
← gamename left20:39
← alanwill left20:39
← mostlybadfly left20:39
← jmfcool____ left20:39
← lacrosse__ left20:39
← markelite left20:39
← Trozz left20:39
← wcpan left20:39
← shauna left20:39
→ gamename joined20:39
→ Trozz joined20:39
← jskt left20:39
→ reinrag joined20:40
← pacbard left20:40
→ mehdi joined20:40
→ mostlybadfly joined20:40
← sfr^ left20:40
← Aa4on left20:40
→ shauna joined20:40
← tmager left20:41
← jhermann left20:41
← uidzer0 left20:41
← potteratt left20:41
← tgummerer left20:41
← crane_ left20:41
→ lacrosse__ joined20:41
→ jmfcool____ joined20:41
← kofione left20:41
→ wcpan joined20:41
← Hello71 left20:41
_ikke_ git rebase develop feature --onto master is enough20:41
→ xyNNN joined20:42
← deste left20:42
← aseidl left20:42
→ jamietech joined20:42
→ potteratt joined20:42
ojacobson well, maybe20:42
_ikke_ In the scenario he posted, it is20:42
ojacobson depends on the desired history, and on whether it's interesting to be able to merge the feature back to _develop_ without dragging along divergent changes from _master_ as well20:42
→ alanwill joined20:42
ojacobson git: all the rope you could possibly want20:42
← sburgess left20:43
_ikke_ ojacobson: I heard a funny joke about the difference between mercurial and git the other dya20:43
day20:43
ojacobson do tell20:43
_ikke_ "git user using mercurial: why doesn't it let me do this. mercurial user using git: why did it let me do that"20:44
ojacobson heh20:44
that's fairly apt20:44
→ tristanp_ joined20:44
← Alienpruts left20:45
← gamename left20:45
→ sfr^ joined20:45
→ aseidl joined20:45
→ Aa4on joined20:45
→ uidzer0 joined20:45
→ Hello71 joined20:45
← seishun left20:45
→ deste joined20:45
→ crane_ joined20:46
→ dvl__ joined20:46
← cavallari1 left20:46
← brandonw left20:46
→ pacbard joined20:46
→ hackel joined20:46
← pheaver left20:46
xace is i omit the password in ~/.gitconfig for the sendemail and imap sections, will I be prompted for the password when I try to use them?20:46
→ tgummerer joined20:46
→ tvw joined20:46
← dvl_ left20:46
← Ryanar left20:46
→ rubyonrailed joined20:46
xace I really don't want to put the password there, especially in cleartext..20:47
tgummerer → Guest7710820:47
← tristanp_ left20:47
→ brandonw joined20:47
→ dvl_ joined20:47
→ jhermann joined20:47
← tang^ left20:48
← jhermann left20:49
→ neonalpine joined20:49
→ jhermann joined20:49
→ kofione joined20:50
xace yeah, seems like it prompts me instead20:50
→ markelite joined20:50
← dvl__ left20:50
→ tang^ joined20:50
← neonalpine left20:50
→ rzeka joined20:50
→ ManikM joined20:50
← im8bit left20:52
→ mellernoia joined20:53
← Gabri left20:54
→ cavallari joined20:54
← cavallari left20:54
← ropav left20:56
→ im8bit joined20:57
→ frobware_ joined20:58
← tvw left20:58
→ neonalpine joined20:58
← rnsanchez left20:59
→ cavallari joined20:59
← cavallari left21:00
← zumba_addict left21:00
← Texan left21:00
← liamkeily left21:01
→ cdown joined21:01
Brain hmm21:01
→ pheaver joined21:01
Brain in tortoisegit when i right click my project folder and go 'commit' i get a box where it shows which files may be added to the project and it hangs with that box saying 'please wait'. the bigger my project the more it hangs21:02
native git doesnt do this, so its obviously because its scanning the folder structure for unversioned objects to list21:02
so, is there some way anyone knows of i can disable this feature and just have it only reference versioned objects?21:02
→ nikio_ joined21:02
← Arsonide left21:03
← PCatinean left21:03
→ Arsonide joined21:03
_ikke_ Brain: sorry, I don't know enough about tortoisegit to be able to help you21:03
← nemesit|znc left21:03
← jonmorehouse left21:04
← Guest20323 left21:04
→ ErKa joined21:04
← rika left21:04
→ Nizumzen joined21:04
→ rika joined21:04
→ cheetah2 joined21:04
cheetah2 I've done git add * on a folder in my repository but it doesnt show on the remote repository. it shows the folder but no files on it21:05
→ Ryanar joined21:05
cheetah2 then git commit -m "commiit"21:05
is there someting im doing wrong?21:06
← nikio__ left21:06
← baweaver left21:06
← th3fallen left21:06
← jhermann left21:06
Brain cheetah2: git push21:07
commits only go to the local repository unless you push them to your remote21:07
← vlt left21:07
← dsantiago left21:07
cheetah2 i get current branch is behind remote counterpart21:08
Brain git pull && git push21:08
cheetah2 is a git pull going to erase the changes ive done locally?21:08
Brain someones done some commits and pushed them and you need to pull them into your local copy and merge them first before pushing21:08
no21:08
it will merge them21:08
← ManikM left21:08
→ ManikM joined21:09
Brain if it can't, it will tell you and abort the process, marking the conflicts for you to resolve by hand before pushing... but that is infrequent at least for me21:09
← JonasF left21:09
→ blr joined21:10
cheetah2 it looks like it took the files from the folder and just put them in the root directory21:11
is there a way to preserve those files in the folder?21:11
Brain you could make a copy of your working tree before you pull/push21:11
→ jhermann joined21:11
Brain it is just a directory after all21:11
then if anything goes wrong that you dont like, you can manually fix it up21:11
generally these days though i just trust that git will get it right, and if it doesnt thats what rollbacks are for21:12
← cdown left21:12
→ MattMaker joined21:13
cheetah2 is this normal behavior for git? My files were inside a folder on my repository. It just put them all in the root in the github and put the folder but empty in there as well. Is that what is supposed to happen or did I do something wrong?21:13
→ mikiones joined21:13
Brain im not sure what you mean21:13
cheetah2 was i supposed to git add just the folder or the files as well?21:13
Brain if you do git add foldername it will just add the folder21:14
if you do git add -r foldername it will add the folder plus all files within, recursively21:14
similarly if you do git add *21:14
← MattMaker left21:14
cheetah2 in the directory where i did git init, there was a folder with the files inside. WHen i pushed in github it shows the files in the root and the empty folder in there no longer with files21:14
→ MattMaker joined21:14
cheetah2 I did git add * on the entire directory21:15
→ devoldmx3 joined21:15
← denete left21:15
→ tpollard joined21:16
→ arnaud____ joined21:16
← sgen left21:16
→ jojovem joined21:17
← devoldmx left21:17
cheetah2 is there supposed to be a .git on every directory of the repository21:18
?21:18
← mikiones left21:18
→ cdown joined21:18
← jojovem left21:18
← scriptThis left21:19
kadoban cheetah2: No, there's generally one .git directory, in the root of the working directory.21:19
← jwhisnant left21:19
→ AMERICA__ joined21:20
cheetah2 hmmm i think I've done something wrong then to have two21:20
← Zupoman left21:20
→ linuxboy_ joined21:20
→ ropav joined21:20
← arnaud____ left21:21
← Fenikkusu left21:21
→ zumba_addict joined21:21
← AMERICAN_PSYCHO left21:22
← lg188 left21:22
→ Raverix joined21:23
Raverix Is there a way to prevent git commit?21:23
gitinfo set mode: +v21:23
Raverix I want to restrict access to git commit from the production environment.21:23
← livingstn left21:24
← linuxboytoo left21:24
HedgeMage Raverix: I'm sorry...are you trying to restrict access to a commit, or to pushing commits to an authoritative repo?21:24
← jerius left21:25
← Dragooon left21:25
← sCiphre left21:25
→ beastd joined21:26
← pantsman- left21:26
→ ashnur joined21:26
→ baweaver joined21:27
→ EvilPenguin joined21:27
← Amandil left21:28
→ ende______ joined21:29
→ liamkeily joined21:30
→ Cust0sL1men joined21:30
← Nizumzen left21:30
→ sCiphre joined21:31
spaceone hi ;)21:31
→ tristanp_ joined21:31
spaceone someone commited a merge commit into my repo21:31
because he did not pull --rebase21:31
← darkbasic left21:31
spaceone can i simply remove this and do a forced push?21:31
← liamkeily left21:31
← EvilPenguin left21:32
→ liamkeily joined21:32
← baweaver left21:32
← rzeka left21:32
← ende_____ left21:32
→ darkbasic joined21:33
→ TrentonDAdams joined21:33
← TrentonDAdams left21:33
→ TrentonDAdams joined21:33
← bball left21:33
TrentonDAdams Is there a config option to use --name-only for git log, by default?21:33
→ baweaver joined21:34
→ Balliad joined21:35
→ mmakunas joined21:35
← zumba_addict left21:35
→ zumba_addict joined21:36
← Saturn812 left21:36
← TomyLobo left21:36
← Dorf left21:37
← dvl_ left21:38
← KennyRayFL left21:38
→ Dorf joined21:39
→ tmager joined21:39
← jr3 left21:40
→ jr3 joined21:40
← gopar left21:40
← jr3 left21:40
← hackel left21:40
→ devoldmx joined21:41
→ _2_sexy joined21:41
← Asiajey left21:42
← devoldmx3 left21:42
← m8 left21:43
← konr left21:43
→ m0nkmaster joined21:45
← sgambino left21:45
→ jonmorehouse joined21:46
← _2_sexy left21:48
→ MacWinner joined21:48
← Kicer86 left21:49
← sCiphre left21:49
← zumba_addict left21:49
← nottombrown left21:49
→ zumba_ad_ joined21:49
← zumba_ad_ left21:50
→ zumba_addict joined21:50
← tmager left21:50
→ tmager joined21:51
→ nottombrown joined21:51
→ mikiones joined21:52
← nottombrown left21:52
→ arez joined21:52
← zumba_addict left21:53
→ nottombrown joined21:53
← rubyonrailed left21:53
← m0nkmaster left21:53
→ zumba_addict joined21:54
→ ahr3n joined21:54
→ rcn joined21:55
← michael_mbp left21:55
→ whitby joined21:55
→ hackel joined21:56
← afs left21:56
→ afs joined21:57
→ michael_mbp joined21:58
← mizu_no_oto left21:59
← mmakunas left22:00
→ BuenGenio joined22:01
← odin22 left22:01
← robbyoconnor left22:02
← cjwilburn left22:03
← ende______ left22:04
← justtobe left22:04
→ robbyoconnor joined22:04
→ ende______ joined22:04
← gsingh93 left22:04
→ jan joined22:04
← jan left22:05
jayne what does "warning: only found copies from modified paths due to too many files." mean?22:05
← Es0teric left22:05
→ Tekilla joined22:06
Eugene It means you need a !beer22:06
gitinfo Beer! It's what's for dinner!22:06
← stakewinner00 left22:06
← linuxboy_ left22:06
→ mjuszczak joined22:07
→ moretti joined22:07
← tristanp_ left22:07
→ linuxboytoo joined22:07
jayne the stuff I find searching seems to imply an issue with either diff or remotes, but neither in the case here. It's just "git log --author=foo" on the local repo.22:07
→ NosBit joined22:08
← NosBit left22:08
→ NosBit joined22:08
jast hmm, the message seems pretty unrelated to that. is that the full command you're using?22:08
← NosBit left22:08
← hs366 left22:10
jayne the alias adds options... looks like it ends up executing "git log -M -C --find-copies-harder --color --name-status --date=local --author=foo"22:10
jast that's... pretty unnecessary for what you actually want to do, I think :)22:11
← linuxboytoo left22:11
← nnyk left22:11
jayne hm. It doesn't do it the second time though, even with the same options.22:12
→ mmakunas joined22:12
jast strange, that22:12
← PeterBooker left22:12
← mmakunas left22:12
jayne sometimes NFS seems to induce weird behaviors, but it's not even an NFS mount this time22:13
← zumba_addict left22:13
→ leeN joined22:13
← victortyau left22:13
← edude03 left22:14
← beckyconning_ left22:14
→ sohail joined22:15
← devoldmx left22:15
jayne happens about 3 out of 5... and it seems like it doesn't happen without --find-copies-harder22:15
← moparisthebest left22:16
→ devoldmx joined22:16
← dlitz left22:16
jayne on the one hand, I don't care that much in this particular instance whether it misses some moves/copies, but I don't understand the warning either, so I don't know if I should care about it or just ignore it.22:17
→ otter768 joined22:17
→ s8321414 joined22:17
→ zumba_addict joined22:18
→ sgambino joined22:18
→ linuxboytoo joined22:18
→ haavstr joined22:18
ojacobson Are git's filesystem consistency guarantees actually documented anywhere?22:19
(Does it have any?)22:19
→ mmakunas joined22:19
← mmakunas left22:19
→ dlitz joined22:20
← Zoddo left22:20
← dlitz left22:20
→ lamont joined22:21
→ moparisthebest joined22:21
← zumba_addict left22:21
→ zumba_addict joined22:22
← otter768 left22:22
← jottr left22:22
← m0ltar left22:22
TrentonDAdams Is there a config option to use --name-only for git log, by default?22:22
← nottombrown left22:23
← jason237 left22:24
→ King_Hual` joined22:24
← arez left22:25
→ Gamecubic_ joined22:26
← bollullera left22:26
← Balliad left22:27
→ thorie_ joined22:27
→ sess_ joined22:28
→ akitada_ joined22:28
→ bbhoss_ joined22:28
→ EvilPenguin joined22:28
→ Mixologic_ joined22:28
→ aboccia_ joined22:28
→ Slush-_ joined22:29
→ c74d3 joined22:29
← neonalpine left22:29
→ antimatroid joined22:29
→ jave_ joined22:29
→ Ravana- joined22:29
→ brewmast1r joined22:29
← antimatroid left22:29
→ neunon_ joined22:29
→ Somasis_ joined22:29
→ mtscout6 joined22:29
← King_Hual left22:29
← akitada left22:29
← bbhoss left22:29
← CheckDavid left22:29
← tfnico left22:29
← thorie left22:29
← hellschreiber left22:29
← relgar left22:29
← Wulf left22:29
← neunon left22:29
← sess left22:29
← brewmaster left22:29
← [diecast] left22:29
← sparetire left22:29
← Gamecubic left22:29
← mariorz left22:29
← Ravana left22:30
← shennyg left22:30
← aboccia left22:30
← jave left22:30
← Werring left22:30
← jds left22:30
← ribasushi left22:30
← Somasis left22:30
← Slush- left22:30
← mtscout6_ left22:30
← c74d left22:30
← linduxed left22:30
← tobiasvl left22:30
← lokodo left22:30
← glebihan left22:30
← Tuna-Fish left22:30
← Mixologi- left22:30
← clone1018 left22:30
← Phtes left22:30
← falstaff left22:30
← King_Hual` left22:30
→ Phtes_ joined22:30
→ Tuna-Fish2 joined22:30
→ tvl joined22:30
tvl → tobiasvl22:30
→ glebihan__ joined22:30
→ [diecast] joined22:30
→ Werring joined22:30
→ sparetire joined22:30
bbhoss_ → bbhoss22:30
neunon_ → neunon22:30
→ shennyg joined22:30
akitada_ → akitada22:30
→ relgar joined22:30
→ lokodo joined22:30
→ hellschreiber joined22:30
← zadock left22:31
→ falstaff joined22:31
→ linduxed joined22:31
→ jds joined22:32
← KeelOfSteel left22:32
→ tfnico joined22:33
Phtes_ → Phtes22:33
→ ribasushi_ joined22:33
← baweaver left22:33
→ mariorz joined22:34
→ baweaver joined22:34
← EvilPenguin left22:34
← denisMone left22:34
← Somasis_ left22:35
→ clone1018 joined22:35
→ Somasis_ joined22:35
← bgerber left22:35
Somasis_ → Somasis22:35
← tang^ left22:36
→ cdown_ joined22:36
← ropav left22:36
← beastd left22:37
→ ropav joined22:37
→ bgerber joined22:37
→ Gitzilla joined22:38
→ dsdeiz joined22:38
← baweaver left22:39
← WaReZ left22:39
→ micechal joined22:39
→ Wulf joined22:40
→ antimatroid joined22:41
→ DARSCODE joined22:41
← ropav left22:41
→ CheckDavid joined22:42
→ baweaver joined22:43
→ hololeap joined22:43
→ weaksauce joined22:43
hololeap is there a way to execute a command on the remote machine using ssh after `git push`?22:44
← Guest77108 left22:44
→ mezod joined22:44
← basiclaser left22:44
hololeap there's no git server running, just ssh and a bare git directory in $HOME22:45
← autonomoid left22:47
TrentonDAdams hololeap, I'd imagine you can do that with ANY ssh session.22:47
→ ecksit joined22:47
TrentonDAdams hololeap, Just use .ssh/authorized_keys, and have it run a command afterward. Be careful it's not changing input/output, as that very well may break things for git22:48
kadoban hololeap: Setting up a hook would probably be the correct way.22:48
ecksit heya, i have a patch which has a file in it which i no longer want in the patch. is there a simple way to reroll the patch without it? the patch was made about 1 year ago and a fair way back in the history22:48
← mostlybadfly left22:48
TrentonDAdams kadoban, Yes, good point. If it's entirely related to git version control, and not some other process.22:48
kadoban Right, if it's not though, it'd be weird to want it to happen after a push you'd think.22:49
ecksit: Can't you just remove the parts of the patch mentioning that file?22:49
ecksit i could but will that break the sha or history?22:50
← jerematic left22:50
← ahr3n left22:50
kadoban ecksit: Patches don't really have history or any errorchecking as far as I know.22:50
← Padawan left22:50
ecksit ok - will give it a go.22:51
← _chad left22:51
→ jerematic joined22:51
ecksit many thanks kadoban22:51
→ Padawan_ joined22:51
kadoban 'welcome, good luck. I'm like 99% sure it'll work fine.22:51
ojacobson ecksit: I suspect kadoban understands "patch" as "a text file containing the output of diff(1)"22:52
→ dlitz joined22:52
→ jeremati_ joined22:52
ojacobson (possibly "git diff", but the important part is that it's text, not git structures)22:52
← jerematic left22:52
hololeap what i'd like to do is restart my daemon after i do a push. i could just use ssh and authorized_keys, but i want it to happen automatically _after_ i run `git push` and there doesn't seem to be a post-push hook22:52
ecksit the patch contains the attributed commits - not just a diff22:52
← mjuszczak left22:53
ojacobson hololeap: !deploy22:53
gitinfo hololeap: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html22:53
kadoban Err, that's not what we're talking about? What is it then?22:53
hololeap ojacobson: thanks22:53
ojacobson hololeap: honestly at the point where you're talking about restarting services you probably want to look at a dedicated deployment tool22:53
obligatory plug for my day job, heroku dot com, too :)22:54
→ mjuszczak joined22:54
hololeap ojacobson: i was wanting something like heroku but i need it to be deployed on my LAN22:54
ojacobson deis?22:54
dokku?22:54
flynn?22:54
hololeap beuler?22:54
kadoban XD22:54
ecksit or even something like gitrecieve hololeap22:54
← dlitz left22:55
→ jgardella joined22:55
→ iio7 joined22:56
→ madewokherd joined22:56
← zumba_addict left22:56
hololeap ok those are deployment systems. i didn't understand that right away22:56
iio7 I have a large repo with lots of history, I want to delete everything except the last commit, how can I do that without actually just deleting .git and reinitialzing?22:56
← mjuszczak left22:56
ecksit rebasing iio7?22:57
iio7 It is a whiteliste git repo (ie, files are only added using -f), so I can't simply delete .git22:57
ecksit, I cannot see that rebase deletes all other commits, histori etc.22:58
kadoban iio7: git checkout --orphan I guess, and then dump the rest of the branches?22:58
I don't really understand why you're doing that exactly, but … it'll work I guess.22:58
ecksit rebasing will rewrite the history - you can just squash all the others22:58
→ snockerton joined23:00
← pheaver left23:00
→ dhilipsiva joined23:00
dhilipsiva → Guest1480323:00
snockerton i have a branch with 10+ commits as well as merges with master mixed in - how do I squash/rebase this all into one commit before going to a pull request?23:01
→ dlitz joined23:01
← dlitz left23:01
← blr left23:01
← someircname left23:02
→ devoldmx3 joined23:02
← cdown_ left23:02
← iio7 left23:02
→ dlitz joined23:02
→ devoldmx27 joined23:03
kadoban snockerton: Not really sure it matters, but … master was merged into the branch, or the branch was merged into master? Or both?23:03
→ cdown_ joined23:03
ecksit snockerton: https://git-scm.com/book/en/v2/Git-Branching-Rebasing23:03
← gargola left23:03
← dlitz left23:03
← editshare-ericf left23:04
← Gama11 left23:04
← unknwn- left23:04
xace Could anyone suggest on how to handle this: I maintain patches for a project. I apply my patches to my own copy (master). Every now and then I have to re-adjust my patches so they work on upstream/master. eventually I'll have to merge upstream/master to master. Is there a suggested way to handle this?23:05
→ arnaud____ joined23:05
← Guest14803 left23:05
← joo-_ left23:05
xace currently the patches are in their own branches.23:05
← linuxboytoo left23:05
← devoldmx left23:05
xace but I suppose when they've been merged into master, it may be hard to merge them again after they've been updated for upstream/master23:05
→ devoldmx joined23:05
← Neozonz|Disc left23:05
← moretti left23:06
← Dorf left23:06
→ blr joined23:06
kadoban xace: I don't really understand. The patches /are/ the branches?23:06
→ DolphinDream joined23:06
← devoldmx3 left23:06
xace kadoban: correct.23:07
← devoldmx27 left23:08
kadoban xace: And you … rebase them onto origin/master occasionally you mean?23:08
→ clarkpan joined23:08
← ManikM left23:08
→ ManikM joined23:09
xace kadoban: currently merging, but i could switch to rebase.23:09
← arnaud____ left23:09
← pecg left23:09
kadoban xace: Hmm, merging which way? into origin/master or you merge origin/master into the branch?23:09
Just trying to figure out what the current situation is, heh, sorry.23:10
xace kadoban: from the branches (patches) to origin/master23:10
kadoban: for example: http://dwm.suckless.org/patches/autoresize this person has released 2 versions of the patch23:10
→ dlitz joined23:10
→ toothrot joined23:10
← leolrrj left23:11
AMERICA__ → AMERICAN_PSYCHO23:11
AMERICAN_PSYCHO → AMERICA__23:11
kadoban xace: Err, how does that work though? Usually origin/master is a remote tracking branch that you don't modify.23:11
xace kadoban: well, i guess i should referr to it as the local branch "master"23:11
→ shinnya joined23:11
kadoban Oh okay, and you have like a devel branch, that's the other version you were talking about?23:12
xace kadoban: correct.23:12
kadoban: i can draw a picture if it helps23:12
kadoban xace: It might :) I'm still having trouble picturing how that's working and what changes you routinely do.23:13
xace kadoban: ill rename the branches so it makes more sense for you23:14
→ ropav joined23:14
kadoban Thanks23:15
→ joo-_ joined23:15
← dlitz left23:16
→ Neozonz joined23:17
← Neozonz left23:17
→ Neozonz joined23:17
← mikecmpbll left23:17
← davioroc1a left23:17
→ daviorocha joined23:17
→ linuxboytoo joined23:18
← ropav left23:18
→ scientes joined23:18
← scientes left23:18
→ scientes joined23:18
→ duderonomy joined23:18
→ KennyRayFL joined23:18
kadoban xace: Back in a few minutes. I'm not even close to the smartest person here though, so someone else can probably help in the meantime if you get done drawing.23:20
xace kadoban: Alright.23:20
← devoldmx left23:21
← whitby left23:21
→ drupald joined23:21
← Zarthuss left23:21
← Neozonz left23:22
← scientes left23:23
→ scientes joined23:24
→ harish_ joined23:24
→ jeffmjack joined23:24
→ mjuszczak joined23:24
jeffmjack I am in non-fast forward land and confused23:25
my server is live; so I'd rather not just git pull into the server to resolve conflicts23:25
← mjuszczak left23:25
→ mjuszczak joined23:26
→ dsantiago joined23:26
← KennyRayFL left23:27
→ pecg joined23:28
xace kadoban: I hope it makes more sense http://i.imgur.com/JWjHBhq.png23:28
→ zumba_addict joined23:28
→ dlitz joined23:30
← MacWinner left23:31
→ EvilPenguin joined23:31
← kevwil left23:31
xace kadoban: my problem with the patch branches are a few of them collide with each other. so each time i want to update anything i have to go through it manually. Currently I run 25 patches.. Everynow and then i update "stable-private" so that it matches "master", and then I have to reapply all those patches again23:32
← stantonk left23:32
→ tgummerer joined23:33
→ Neozonz joined23:33
← Neozonz left23:33
→ Neozonz joined23:33
← kofione left23:33
xace realised some mistakes in the graph, but hopefully it makes more sense than my phrasing23:33
kadoban xace: Okay so your workflow goes something like … merge master into patches, merge master into patches, merge patches into stable-private, repeat a bunch of times. And then you're going to want to merge master into stable-private later and expect that to be bad I guess? I'm actually not seeing the problematic part, it should Just Work (TM) minus some merge conflicts and stuff.23:34
Which … I don't know if I'm missing the part that's a problem, or if it's just not actually a problem, heh …23:34
→ nettoweb joined23:34
xace kadoban: the merge conflict are very complex... some of them require huge rewrites23:34
* some of the merge conflicts23:34
snockerton is there a way to do a pull request with including all 20+ of my commits on a branch? I need a clean, single commit to show in master after PR + merge, something like "feature X added"23:35
*without including23:35
kadoban Hmmmm23:35
← scientes left23:35
kadoban snockerton: That's what a pull request already does. Or you mean you want it squashed into one commit?23:35
→ modocache joined23:35
← EvilPenguin left23:35
snockerton yes squashed, although I tried doing that on my local branch copy and it effed everything up and introduced conflicts23:36
xace kadoban: im currently considering rewriting the patches so they can be applied ontop of each other in a special order...23:36
← AMERICA__ left23:36
snockerton i'm thinking about making a new branch, then just coping all my files into it23:36
→ diegoviola joined23:36
← hexagoxel left23:37
← cbonobo left23:37
→ sword joined23:37
snockerton git rebase / reset just hurt my brain23:37
← yqt left23:37
← hololeap left23:37
kadoban xace: Hmm. I'm afraid I don't really have good advice that comes to mind :-/ Sorry. I mean I'm sure you'll get merge conflicts sometimes, but … yeah I don't know how to avoid that. There's rerere, but … that sounds like it's not really for what you're doing I don't think.23:38
→ hexagoxel joined23:39
xace kadoban: there's a mailing list for the project, i bet someone there has solved this, ill check with them. and yes, rerere may help23:39
kadoban Okay, sure. You may want to ask again in a while too, some other people here have more experience with big projects and workflows more exciting than mine. (People tend to tune out once someone starts interacting with a questioner, so some might have skipped all of this)23:40
← modocache left23:40
← drbean left23:40
← hahuang65 left23:40
← nettoweb left23:43
← akiva left23:43
→ devoldmx joined23:44
→ scientes joined23:45
→ nettoweb joined23:45
→ soreau joined23:46
→ c0mrad3 joined23:47
← joako left23:47
← freestyl3r left23:51
← liamkeily left23:51
← nettoweb left23:52
→ ahr3n joined23:53
→ leolrrj joined23:53
→ modocache joined23:54
→ joako joined23:54
→ DerisiveLogic joined23:55
← DerisiveLogic left23:55
→ BuenGenio_ joined23:56
← daedeloth left23:56
← cagedwisdom left23:56
← snockerton left23:58
← BuenGenio left23:59
← fstd left23:59
→ Lyqyd joined23:59
→ fstd joined23:59

Logs Search ←Prev date Next date→ Channels Documentation