Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-08-03

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

All times shown according to UTC.

Time Nick Message
00:00 BSAlb joined #git
00:00 fuchstronaut joined #git
00:00 The_Wood_ joined #git
00:00 BSAlb joined #git
00:00 The_Wood_ left #git
00:00 The_Woodsman joined #git
00:01 The_Woodsman if i have commits locally, and i am willing to overwrite the remote branch with my local changes, how do i do a "force push" ?
00:02 akiva left #git
00:03 rpd The_Woodsman: -f probably, but you usually don't have to do that unless you have an inconsistent history
00:03 The_Woodsman rpd: yeah, i got myself into a silly situation in which my history was kinda messed up
00:03 The_Woodsman rpd: thanks
00:05 EspadaV8 left #git
00:05 shmuli joined #git
00:09 tesuji_ joined #git
00:11 kyan joined #git
00:13 BrianBlaze420 joined #git
00:15 SpeakerToMeat joined #git
00:16 josuebrunel joined #git
00:17 ISmithers joined #git
00:22 rubyonrailed joined #git
00:24 CrazyBonz joined #git
00:25 Bennux joined #git
00:26 vassagus joined #git
00:27 noidea joined #git
00:28 ctcrnitv joined #git
00:29 danslo joined #git
00:31 HanClinto joined #git
00:34 rubyonrailed joined #git
00:35 Derperperd joined #git
00:37 noidea joined #git
00:37 noidea joined #git
00:38 beyertech joined #git
00:39 zacts joined #git
00:40 HoierM joined #git
00:41 Lunatrius joined #git
00:46 beyertech joined #git
00:46 Timvde joined #git
00:48 beyertech joined #git
00:51 ResidentBiscuit joined #git
00:51 jh3 joined #git
00:51 haribo joined #git
00:56 Rodya_ joined #git
00:57 haribo joined #git
01:01 CrazyBonz joined #git
01:05 arescorpio joined #git
01:06 shmuli joined #git
01:10 shgysk8zer0 joined #git
01:17 ytl joined #git
01:19 cqi joined #git
01:22 ImJune joined #git
01:24 rkazak joined #git
01:29 zacts joined #git
01:31 vassagus joined #git
01:33 Sasazuka joined #git
01:38 pks joined #git
01:39 sdothum joined #git
01:40 fission6 joined #git
01:42 sagerdearia joined #git
01:46 fission6 joined #git
01:46 ejb joined #git
01:46 dreiss joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and take-out special surprises | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-nom --omnom: eats all your tasty code
01:53 rubyonrailed joined #git
01:54 ResidentBiscuit joined #git
01:55 d^sh joined #git
01:57 Rodya_ joined #git
01:59 ResidentBiscuit joined #git
01:59 nettoweb joined #git
02:02 rubyonrailed joined #git
02:02 jaguarmagenta joined #git
02:05 david007 joined #git
02:07 sdothum joined #git
02:08 Sucks joined #git
02:09 Sucks joined #git
02:15 beyertech joined #git
02:17 fracting joined #git
02:17 shmuli joined #git
02:18 dreiss joined #git
02:19 ImJune joined #git
02:24 sarbs joined #git
02:24 moneylotion left #git
02:24 interne7y joined #git
02:25 red_ joined #git
02:27 Goplat joined #git
02:28 HanClinto joined #git
02:29 danslo joined #git
02:33 atomicb0mb joined #git
02:34 thiago joined #git
02:36 vassagus joined #git
02:40 Lope joined #git
02:40 Lope I'm making a post-receive script. I received this on STDIN: f98a92e77d81c031e37b8a550b1dc19fb8775f2f fe8af2804c2caa6ae44112f86e0c0daac1014efd refs/heads/master
02:40 Lope so that's telling me I received a push on the master branch? but I don't know much else.
02:41 Lope Oh I see: Format: "from_commit to_commit branch_name"
02:41 Lope what is "refs/heads/"
02:46 azerus joined #git
02:48 Mannn joined #git
02:49 huanzhang joined #git
02:49 chachasmooth joined #git
02:51 gtodd is it possible to squash git commit history in a branch only?
02:51 skylite joined #git
02:52 gtodd or have the branch's commit history start "ex nihilo" at the point of the branch?
02:52 lagothrix joined #git
02:54 gtodd sort of tag a version and keep the maintenance mode commits with the tagged branch but all the development history with the "main line" of the repo
02:54 aavrug joined #git
02:54 sangy joined #git
02:55 hexagoxel joined #git
03:01 somaReverse joined #git
03:01 somaReverse hello
03:01 somaReverse How can I cherry pick only one file?
03:02 dreamseeker joined #git
03:02 fuchstronaut joined #git
03:08 thiago somaReverse: cherry-pick -n the entire commit, then commit only the file you want
03:08 thiago discard the rest
03:10 rubyonrailed joined #git
03:11 ArchNoob joined #git
03:11 a3Dman joined #git
03:12 jimi_ joined #git
03:12 ShekharReddy joined #git
03:13 hahuang61 joined #git
03:15 vrand joined #git
03:16 star_prone joined #git
03:17 fracting joined #git
03:18 Dougie187 left #git
03:19 rkazak joined #git
03:21 VA3VNA joined #git
03:24 sagerdearia joined #git
03:27 danimal2 joined #git
03:32 fstd_ joined #git
03:32 pwnz0r joined #git
03:34 wxg joined #git
03:35 bshacklett joined #git
03:37 yoan joined #git
03:38 beatdown joined #git
03:41 spudowiar joined #git
03:41 mehola joined #git
03:41 red_ joined #git
03:41 vassagus joined #git
03:45 atomicb0mb joined #git
03:48 mohabaks joined #git
03:59 shgysk8zer0 joined #git
03:59 ArchNoob joined #git
04:01 rubyonrailed joined #git
04:02 LeBlaaanc joined #git
04:02 phoenixh joined #git
04:03 jaguarmagenta joined #git
04:03 thecomedian joined #git
04:06 gtristan joined #git
04:06 DJ_Spies joined #git
04:09 bshacklett left #git
04:12 netj joined #git
04:14 hahuang61 joined #git
04:19 mehola joined #git
04:20 wberrier joined #git
04:22 Rish joined #git
04:23 wberrier left #git
04:25 interne7y joined #git
04:28 danimal2 joined #git
04:30 danslo joined #git
04:33 Captain_Ramius left #git
04:33 wxg joined #git
04:35 zrts joined #git
04:35 Kev- left #git
04:36 aidalgol joined #git
04:39 _28_ria joined #git
04:39 Cabanossi joined #git
04:40 nnyk_ joined #git
04:42 freimatz joined #git
04:43 jstimm joined #git
04:43 Limes_ joined #git
04:46 vassagus joined #git
04:46 mkoskar joined #git
04:47 ImJune joined #git
04:50 ArchNoob joined #git
04:51 subhojit777 joined #git
05:01 Darren_ joined #git
05:03 fuchstronaut joined #git
05:09 rubyonrailed joined #git
05:10 diogenese joined #git
05:12 stuh84 joined #git
05:15 Lope what do you guys do about file ownership with GIT? do you have the same UID on your dev machine as your remote testing and production repos?
05:15 Tachyon_ joined #git
05:15 hahuang61 joined #git
05:16 zumba_ad_ joined #git
05:25 zivester joined #git
05:27 ash_workz joined #git
05:33 pwnz0r joined #git
05:33 lordjancso joined #git
05:34 Gianormagantrous joined #git
05:35 phanimahesh joined #git
05:35 zeroed joined #git
05:35 zeroed joined #git
05:36 emPi joined #git
05:38 glebihan joined #git
05:38 ArchNoob joined #git
05:41 Shakeel_ joined #git
05:42 phanimah1sh joined #git
05:43 satya4ever joined #git
05:44 ffs joined #git
05:47 zumba_addict joined #git
05:51 vassagus joined #git
05:51 Raging_Hog joined #git
05:57 sagerdearia joined #git
05:58 bocaneri joined #git
06:04 jaguarmagenta joined #git
06:04 jceb joined #git
06:05 Shakeel_ joined #git
06:05 TinkerTyper joined #git
06:06 tvw joined #git
06:06 yoan joined #git
06:07 zorro786 joined #git
06:11 josuebrunel joined #git
06:13 rubyonrailed joined #git
06:14 alcohol Lope: no such thing
06:15 circ-user-HPmjC joined #git
06:15 grawity Lope: no, why? git doesn't preserve UIDs anyway
06:16 hahuang61 joined #git
06:17 bremner Lope: In case you didn't already see it, !deploy
06:17 gitinfo Lope: 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.html
06:17 Lope cool, thanks.
06:19 freimatz joined #git
06:20 Lvjasha joined #git
06:26 interne7y joined #git
06:26 JeroenT joined #git
06:28 ambro718 joined #git
06:28 gtristan Hi
06:29 gtristan Is there a way that I can clone and checkout a ref in one command ?
06:29 grawity git clone -b
06:29 gtristan grawity, that will work equally with tags and sha1s ?
06:29 gtristan or only branches ?
06:30 grawity dunno
06:30 ikmaak joined #git
06:31 * gtristan has a huge spreadsheet with specific refs he wants to clone in a loop
06:31 star_prone joined #git
06:31 danslo joined #git
06:31 gtristan equally, if I can take ${cloneurl} and guess what directory git will transform that into, that can also work
06:31 * gtristan presumes a sprinkling of bash can help, only that $(basename ${url}) might not work for a url
06:32 phanimahesh joined #git
06:32 govg joined #git
06:33 haribo joined #git
06:33 jagob joined #git
06:36 _xor joined #git
06:36 grawity $(basename "$url" .git) should do it
06:36 star_prone joined #git
06:38 nikitasius joined #git
06:38 alcohol joined #git
06:41 wcpan joined #git
06:43 rubyonrailed joined #git
06:44 Lope git is not running GOT_SSH_COMMAND properly. My echo "$GIT_SSH_COMMAND" says "ssh bob@myserver -p 1234 -i /foo/bar" Then I did `git remote add myserver bob@myserver:/path/to/gitdir` `git push myserver master`. After a long delay it complained that it could not connect on port 22. So it didn't take the port from my $GIT_SSH_COMMAND. Any ideas how to change the syntax so it uses the ENV VAR?
06:48 Sceorem joined #git
06:48 gtristan joined #git
06:51 phanimahesh joined #git
06:51 danslo joined #git
06:52 mariuscc joined #git
06:54 cqi joined #git
06:54 alcohol joined #git
06:55 rscata joined #git
06:56 vassagus joined #git
06:56 woodruffw joined #git
06:57 woodruffw joined #git
06:57 woodruffw joined #git
06:58 texinwien_ joined #git
06:58 woodruffw joined #git
06:58 woodruffw joined #git
06:59 woodruffw joined #git
06:59 woodruffw joined #git
06:59 Lope I even tried `git remote add ssh://bob@myserver:1234/path/to/mygit` but when I try push it says: "ssh: connect to host myserver port 22: connection time out". WTF?
06:59 dreiss joined #git
07:00 djb-irc joined #git
07:01 tobiasvl pretty sure you can't use arguments like that in GIT_SSH_COMMAND, although not entirely
07:02 tobiasvl git will take the [user@]host from the remote URL, supplying it in GIT_SSH_COMMAND is wrong (and might not work)
07:03 tobiasvl Lope: and the second way, with the port in the url, works for me
07:03 tobiasvl have you unset GIT_SSH_COMMAND before trying that?
07:04 fuchstronaut joined #git
07:04 p4trix joined #git
07:04 Seveas Lope: why not configure it properly in .ssh/config?
07:05 Seveas Host myserver
07:05 Seveas User bob
07:05 Seveas Port 1234
07:05 Seveas IdentityFile /foo/bar
07:05 phanimahesh joined #git
07:06 deltab joined #git
07:06 star_prone joined #git
07:07 ImJune joined #git
07:07 guardian does git have something builtin to avoid commiting source files with 755 mode?
07:08 guardian or should I write a pre-commit hook for that
07:08 tobiasvl guardian: well git doesn't commit permissions beyond +x
07:08 submitnine joined #git
07:09 Seveas guardian: pre-commit hook it is.
07:09 Seveas or (very evil) core.filemode=false may work
07:10 cdown joined #git
07:11 interne7y joined #git
07:12 DevAntoine joined #git
07:12 guardian pre commit is easy enough
07:12 Lope tobiasvl: okay, checking it out.
07:12 guardian thanks for the reply
07:12 TomyWork joined #git
07:12 Lope Seveas: that config file doesn't suit me.
07:13 Lope Okay I've tested logging in with my SSH user, and I can login with normal ssh. But my shell is git-shell and it's not enabled. So I'm looking up how to do that.
07:13 Lope error: cannot run ssh bob@myserver -p 1234 -i /path/to/bob: No such file or directory
07:13 Lope export GIT_SSH='ssh bob@myserver -p 1234 -i /path/to/bob'
07:13 Seveas GIT_SSH != GIT_SSH_COMMAND
07:13 grawity you need GIT_SSH_COMMAND= for that
07:14 Lope grawity: okay, thanks.
07:14 Lope GIT_SSH_COMMAND seems to be ignored though. It kept trying to connect on port 22 :/
07:14 grawity your git is too old then
07:14 grawity set up ~/.ssh/config instead
07:15 Lope I've got git 1.9.1
07:15 grawity *way* too old
07:15 Lope maybe you're right that it's too old.
07:15 Seveas ancient
07:15 Lope Why is it so old? On ubunty 14.04 :/
07:15 grawity well, ubuntu 14.04 itself is old
07:15 Lope Yeah I've been procrastinating upgrading :/
07:16 grawity and once ubuntu picks a major version, like git 1.9, they tend to stick to it
07:16 Seveas 2.3.0 minimum
07:16 grawity http://packages.ubuntu.com/search?keywords=git and http://sprunge.us/VcCD
07:16 Lope Seveas: thanks bro.
07:16 Lope will see if there's a backport.
07:16 hahuang61 joined #git
07:16 Seveas ppa:dennis/git-next gives you bleeding edge git from the main development branch
07:18 sanketdg joined #git
07:20 david002 joined #git
07:22 aidalgol joined #git
07:22 cdown_ joined #git
07:23 lordjancso joined #git
07:25 Balliad joined #git
07:28 star_prone joined #git
07:36 Macaveli joined #git
07:36 PCatinean joined #git
07:36 Lomex joined #git
07:38 star_prone joined #git
07:42 jceb joined #git
07:46 gtristan joined #git
07:52 josuebrunel joined #git
07:53 mischat joined #git
07:55 FuzzySockets joined #git
07:56 the_cybersphinx joined #git
07:57 Darcidride joined #git
08:00 Lope Seveas: thanks. On bleeding edge now
08:01 Lope how can I setup ~/git-shell-commands so that my SSH user with a GIT shell can run any commands?
08:01 vassagus joined #git
08:01 Seveas just don't use git-shell
08:01 Seveas set your shell to /bin/bash and be done with it
08:02 Lope ah, but I thought it would be more secure?
08:02 Seveas not if you're going to bypass it anyway
08:02 Lope I've seen conflicting information about needing to create a dir or touch a file with that name.
08:02 Lope oh, I see.
08:02 Lope So there is no real git-shell?
08:03 Lope it's just a framework for scripting arbitrary commands?
08:03 Seveas nope.
08:04 Seveas it's a way of allowing people in over ssh while limiting their access
08:04 Lope okidokes
08:04 jaguarmagenta joined #git
08:09 Lope `git push myserver prod --verbose --dry-run --progress` bash: bob@myserver:1234:: command not found
08:09 cyan__ joined #git
08:10 jknetl joined #git
08:10 Lope `echo $GIT_SSH_COMMAND` ssh bob@myserver -p 1234 -i /path/to/bobkey
08:10 Corneliu joined #git
08:11 star_prone joined #git
08:11 Lope `git remote -v` myserver ssh://bob@myserver:1234:/path/to/my/baregit (fetch) (and push same)
08:12 Lope when runnin the GIT_SSH_COMMAND by itself I can login to a bash shell and cd to the bare-git repo with full recursive ownership of it.
08:12 Seveas that remote looks dodgy. change it back to just ssh://myserver/path/to/bare.git
08:13 tomog999 joined #git
08:13 vdv joined #git
08:13 the_cybersphinx joined #git
08:13 zeroed joined #git
08:13 zeroed joined #git
08:13 JeroenT joined #git
08:14 Lope is it okay if my bare git dir is called "git"?
08:14 Lope I've got web/git and web/www (where I will auto-deploy to www)
08:15 Lope I've changed it to: ssh://bob@myserver:1234:/path/to/my/baregit.git but it's got the same error.
08:15 Lope will try your plain form.
08:16 Lope I found a format like what I've used on stackoverflow (with port number and username)
08:16 ki0 joined #git
08:16 Lope okay I ran it without a username or port in the command. now it says bash: myserver: command not found
08:17 Lope fatal: Could not read from remote repository.
08:18 Seveas ah, I *think* I know why.
08:18 Seveas GIT_SSH_COMMAND will be fed the hostname
08:18 Lope oops, I had a colin between the username and the path. I removed it be like yours. But it had the same error.
08:18 Lope okay, so I'll take out the username and port.
08:18 magicTurtle joined #git
08:18 Seveas so you'll want export GIT_SSH_COMMAND='ssh -l bob -p 1234 -i /path/to/key'
08:18 Lope I maen username and host.
08:18 Lope or that.
08:18 Lope okay. good idea :)
08:19 ahmedelgabri joined #git
08:19 marcogmonteiro joined #git
08:20 ArchNoob joined #git
08:20 Lope different error now. no more command not found. now it sayd /path/to/baregit.git does not appear to be a git repository.
08:20 Lope will try without the .git.
08:21 Lope sweet. it looks like it worked :)
08:21 bongjovi joined #git
08:22 eVolutive joined #git
08:22 Lope hmm, it says  * [new branch]      prod -> prod.
08:22 Lope I'm new to git. I think it's because I've not published yet.
08:22 ifra201 joined #git
08:25 Lope oh lol, --dry-run might have something to do with it not actually pushing anything.
08:25 jast the possibility exists :}
08:27 ffs joined #git
08:28 Jonuz How can I insert ' to commit message in git commit command?
08:28 Jonuz \' doesnt work
08:28 ahmed_elgabri joined #git
08:29 bremner Jonuz: are you using a text editor, or -m ?
08:29 tobiasvl Jonuz: huh? what's your command? you mean with -m? if you use "" you should be able to use it regularly
08:29 bremner or use -F
08:30 Jonuz oh, it worked when I used "", I thought I had tested it already.
08:30 Jonuz ty
08:30 Lope Seveas: THANK YOU SO MUCH! works
08:33 N3SS__ joined #git
08:33 Jidoor joined #git
08:33 Jidoor left #git
08:33 Jidoor joined #git
08:34 Jidoor how do i ignore a folder, is it folder, /folder, /folder/ or does it even matter
08:34 cqi joined #git
08:35 tobiasvl Jidoor: well the second and third will only match "folder" in the repo's root
08:35 tobiasvl man gitignore
08:35 gitinfo the gitignore manpage is available at http://jk.gs/gitignore.html
08:37 Jidoor second and third are equal?
08:37 jast / at the beginning anchors it to the same level at which the .gitignore file lives. / at the end applies to folders only, not files with the same name.
08:37 mischat joined #git
08:37 Jidoor ah
08:37 Jidoor so /folder/ is the best if i want to ignore a folder in root
08:37 jast sure, though you're not going to have 'folder' as both a file and a folder in root at the same time, anyway :)
08:39 moei joined #git
08:42 cqi joined #git
08:45 courrier joined #git
08:46 star_prone joined #git
08:51 Anticom joined #git
08:53 peroht joined #git
08:54 Lunatrius` joined #git
08:55 ImJune joined #git
08:56 sylario joined #git
08:57 jceb joined #git
08:59 ahmedelgabri joined #git
09:00 phanimahesh Jonuz: Don't use -m
09:01 phanimahesh It'll create a habit of not writing longer commit messages
09:01 phanimahesh Always do git commit without -m, it'll open up your editor
09:02 phanimahesh Write a short summary on first line (what you'd pass to -m) and after a blank line, explain why the change was made.
09:02 phanimahesh You'll thank yourself when you have to rely on logs anytime.
09:02 a3Dman joined #git
09:05 fuchstronaut joined #git
09:06 vassagus joined #git
09:09 ronskisika joined #git
09:09 Raging_Hog joined #git
09:10 mohabaks joined #git
09:13 JeroenT joined #git
09:15 Lope even though inside myproj/ I've run `git add --all --verbose` it didn't add myproj/packages or myproj/packages/foo.
09:15 mooru joined #git
09:16 jast maybe there's an ignore pattern somewhere?
09:16 Lope There isn't
09:16 Lope Not that I can find, not in .gitignore myproj/packages
09:17 jast you can use 'git check-ignore' so you don't have to search for it yourself :)
09:17 hahuang61 joined #git
09:17 cbreak Lope: find . -name ".git"
09:18 mcqr joined #git
09:18 jast oh yeah, and nested git repos are ignored :)
09:18 Lope myproj/packages/foo was another git repo that I cloned from another project. I'd like to track the changes I make to it as part of my project. I deleted myproj/packages/foo/.git. Then tried `git add --all --verbose again` but it's not adding myproj/packages/foo
09:18 nnyk_ joined #git
09:18 cbreak Lope: git rm --cached myproj/packages/foo
09:18 Lope cbreak: will try :)
09:19 jast and then try your 'add' again
09:19 cbreak if it isn't tracked as submodule, maybe you have to rm myproj/packages
09:19 SourTrout joined #git
09:19 cbreak (if that was ever a submodule)
09:19 Lope Sweet,. it added them now :)
09:19 Lope thanks!
09:19 jast well, that wasn't so bad
09:19 Lope is there some command to flush all the cache?
09:19 cbreak yes.
09:20 cbreak but you don't want that
09:20 Lope Okay
09:20 jast the thing is, the cache/index has not just changes from the last commit
09:20 jast it's a complete snapshot of exacty what would end up in a new commit
09:20 jast so, clearing it would mean your next commit would not go through, or at least not have any files in it at all :)
09:21 cbreak Lope: see man git-update-index for details
09:21 gitinfo Lope: the git-update-index manpage is available at http://jk.gs/git-update-index.html
09:21 jast if you want to re-add everything I guess it's not that much of an issue, but still it's not a good habit
09:21 _kreo joined #git
09:21 jast (to answer anyway, the magic incantation is git read-tree --empty)
09:26 chll_ joined #git
09:27 JanC_ joined #git
09:27 david007 joined #git
09:28 ygeLN joined #git
09:33 a3Dman joined #git
09:34 ArchNoob joined #git
09:36 MrMojito1 joined #git
09:38 darkbit joined #git
09:41 fabio_ joined #git
09:41 AlHafoudh joined #git
09:42 AlHafoudh hi all
09:42 ygeLN joined #git
09:42 AlHafoudh is there anything like statically linked single git.exe file?
09:43 grawity probably not, since quite a few git subcommands are still written in sh
09:45 braderhart joined #git
09:47 JeroenT joined #git
09:47 stealthii joined #git
09:49 WillMoogle joined #git
09:49 noahsussman joined #git
09:50 mooru joined #git
09:50 ahmedelgabri joined #git
09:51 kwmiebach joined #git
09:51 rbr joined #git
09:53 interne7y joined #git
09:53 choki joined #git
09:55 harleypig joined #git
09:57 qsx and a good part in perl
10:03 Raging_Hog joined #git
10:03 denimsoft joined #git
10:04 star_prone joined #git
10:04 wxg joined #git
10:05 irco joined #git
10:05 jaguarmagenta joined #git
10:06 rahtgaz joined #git
10:07 yena joined #git
10:07 ISmithers joined #git
10:09 ronskisika joined #git
10:09 magicTurtle joined #git
10:10 apachebcn joined #git
10:11 nickstenn joined #git
10:11 vassagus joined #git
10:11 afuentes joined #git
10:12 omegak joined #git
10:14 star_prone joined #git
10:17 ffabi joined #git
10:17 rishi joined #git
10:17 Chinorro joined #git
10:18 heftig joined #git
10:18 VampiricPadraig joined #git
10:18 VampiricPadraig joined #git
10:18 mafrasi2 joined #git
10:18 hexa- joined #git
10:18 AlexanderS joined #git
10:18 ManiacTwister joined #git
10:18 ohcibi joined #git
10:18 Learath2 joined #git
10:18 dx joined #git
10:18 languitar joined #git
10:18 stfn joined #git
10:18 Blkt joined #git
10:18 chll_ joined #git
10:18 nioncode joined #git
10:18 nyuszika7h joined #git
10:19 WakiMiko joined #git
10:19 bastelfreak joined #git
10:19 roflin joined #git
10:19 asd5a joined #git
10:19 i7c joined #git
10:19 osse commit, add, push, fetch, merge and cherry-pick are all builtin, so if you compile a static version you should be good to go \o/
10:20 deepy joined #git
10:20 qsx including the underlying helpers?
10:21 noteness joined #git
10:21 bauruine joined #git
10:22 luke_penn joined #git
10:22 osse what helpers?
10:22 osse the one for add -p, no, that's perl
10:22 qsx fetch-pack for example
10:22 qsx well "helper" may not be entirely the right term here
10:23 osse yes
10:23 gitinfo joined #git
10:23 tinajohnson___ joined #git
10:23 osse the http helpers aren't though
10:24 qsx and i doubt it’ll contain openssh
10:24 qsx so well, with some effort you could create such a git.exe, but won’t be easy
10:25 Hobbyboy|BNC joined #git
10:25 qsx and if you take everything in git (excluding contrib), you’d need sh, perl, python, tcl, libcurl, some kind of ssh, a web server and i guess even more
10:26 osse who uses git-p4 anyway
10:26 qsx who uses p4 anyway
10:26 ahmedelgabri joined #git
10:26 osse egg-sack-ly, so you can strike out python \o/
10:27 fuchstronaut joined #git
10:29 Nothing4You joined #git
10:30 clivejo joined #git
10:33 rchavik joined #git
10:33 aguimaraes1986 joined #git
10:40 lordjancso joined #git
10:41 psacrifice joined #git
10:42 tvw joined #git
10:43 ljc joined #git
10:57 t-ask joined #git
10:58 cdown joined #git
10:58 fission6 joined #git
10:58 danslo joined #git
10:59 t-ask HI I have the following situation with git mergetool. I'm not sure what I'm actually looking at. I guess, the Remote column is the one I move to volt.h col2 ... http://storage2.static.itmages.com/i/16/​0802/h_1470182002_2301308_f9c1dde916.png
11:00 osse t-ask: the four files are in order: the one in the current branch, the merged result, the one from the other branch, the common ancestor
11:01 selckin so yes fix up 2nd to final version
11:02 t-ask Is this the fixed order in general? Then I take note
11:02 woodruffw joined #git
11:02 osse t-ask: you can tell from the names of the files
11:03 osse LOCAL, (nothing), REMOTE, BASE
11:03 woodruffw joined #git
11:03 JeroenT joined #git
11:04 nettoweb joined #git
11:04 t-ask so (nothing) is just like a preview of the suggested merge?
11:04 osse i suppose you could call it that
11:04 osse it's the actual file on disk.
11:04 osse the one you're supposed to edit to fix the problem
11:05 Jon28__ joined #git
11:06 selckin kdiff3/meld have nicer view imo
11:07 t-ask ok, just to recap. LOCAL=the currently active local branch, (nothing) = the 'diff view' of the suggested merge, REMOTE = the remote version in that branch, BASE = the root branch of the local repo
11:07 osse t-ask: "root branch" ?
11:07 playfullyExist joined #git
11:08 osse BASE = the version of the file before the branches diverged
11:08 Vinnie_win joined #git
11:08 sdothum joined #git
11:08 t-ask NOt sure how its calld, I guess, the BASE is when I'm looking at the graphical representation of a git version tree, the one main root
11:10 t-ask osse: much nicer explanation
11:10 t-ask osse: I think I understand now. Thank you
11:11 t-ask selckin: I will look into them
11:14 mooru joined #git
11:14 cd-rum joined #git
11:15 alcohol joined #git
11:16 vassagus joined #git
11:16 rnsanchez joined #git
11:16 ahmedelgabri joined #git
11:17 ojdo joined #git
11:18 hahuang61 joined #git
11:18 cd-rum_ joined #git
11:20 yoan joined #git
11:23 danslo joined #git
11:26 fahadash joined #git
11:29 cyan__ joined #git
11:30 mehola joined #git
11:30 kus joined #git
11:35 dsdeiz joined #git
11:35 notebox joined #git
11:38 pandeiro joined #git
11:41 pandeiro joined #git
11:43 airdisa joined #git
11:47 phanimahesh joined #git
11:48 alkino joined #git
11:48 alkino Why does git reimplement tar and zip?
11:49 grawity what should it do instead? use libarchive?
11:49 alkino grawity: do nothing?
11:49 grawity that would make it lose functionality
11:50 alkino If I want to do a git archive in tar.xz I do "git archive | tar | xz"
11:50 grawity except you can't do that because pipes don't have a 'file delimiter'
11:50 alkino grawity: but support only those 2 formats seems a broken functionality
11:50 selckin if you want version control you just do cp file $(md6sum file)
11:50 grawity Windows' powershell might work that way; Unix pipes don't.
11:50 alkino grawity: and why not libarchive?
11:50 grawity and if you start implementing a framing protocol, congrats, you reinvented tar.
11:51 grawity libarchive wouldn't be bad, though since git's support is generate-only (no parsing) and fairly static, it probably wasn't worth adding another dep, I guess?
11:51 alkino hum
11:52 osse git also reimplements diff, option parsing and string buffers
11:52 alkino If I do "git archive HEAD" it write something in my output
11:52 selckin and bitkeeper
11:52 * selckin hides
11:52 alkino so it's useless?
11:52 grawity it writes an uncompressed tar archive
11:52 alkino ok
11:52 grawity so you can indeed use `git archive HEAD | xz > foo.tar.xz`
11:53 djb-irc joined #git
11:53 grawity also – AFAIK – at least with tar, git-archive tries hard to generate identical files every time
11:53 mooru joined #git
11:54 grawity (iirc, that's useful for signing large repos' tarballs)
11:54 alkino ok right ^^
11:55 phanimahesh joined #git
11:55 synthroid joined #git
11:55 davisonio joined #git
11:59 holodoc joined #git
11:59 mooru joined #git
12:00 sdaugherty There are some guarantees about timestamps too with git archive, which wouldn't be the case with tar/zip used on their own, also git archive takes care of removing git artifacts for you, so there's two features that make it especially suitable for releasing software.
12:01 grawity well, no, I assume libarchive lets you set arbitrary timestamps as well
12:01 sdaugherty grawity, it might, but that's clumsy in comparison to a process which does so automatically based on the commitid
12:01 alkino grawity: grawity: you can do manage metadata as you want with libarchivz
12:02 alkino sdaugherty: -^
12:02 grawity sdaugherty: the same process would be doing the same thing automatically
12:02 osse I also think this.
12:02 sdaugherty also, git archive optionally handles .gitattributes directed processes
12:02 grawity sdaugherty: just [for example] libarchive_set_metadata() instead of writing out the same directly
12:02 grawity sdaugherty: sure, it could still handle .gitattributes
12:03 grawity sdaugherty: there's nothing about using a library that would force it to blindly tarball the raw working tree
12:03 grawity it could still specify whatever input data it wants
12:05 dsdeiz_ joined #git
12:06 sdaugherty also, as for why libarchive wasn't used in the first place, both projects seem to have started at about the same time.
12:06 sdaugherty in 2005.
12:06 zeroed joined #git
12:06 jaguarmagenta joined #git
12:06 veilig2000 joined #git
12:07 Sceorem joined #git
12:07 sdaugherty without delving deeply into the development history, I'd take an educated guess that libarchive was not yet mature enough at the time git archive was implemented?
12:08 CheckDavid joined #git
12:08 alkino sdaugherty: surely.
12:09 HanClinto joined #git
12:10 korolev joined #git
12:12 BPL joined #git
12:12 BPL Hi everyone!
12:12 str joined #git
12:14 sdfsdf joined #git
12:14 sigma__ joined #git
12:15 BPL Not sure what's wrong... but I've cloned a couple of projects with git 2.7.0 (cygwin64) and I'm having some problems running the executables or bat files, they spawn this error "Windows cannot access the specified device, path, or file. You may not have the appropriate permissions to access the item" , any clue why is this?
12:15 grawity try to `chmod +x` them via cygwin
12:15 tvw joined #git
12:15 star_prone joined #git
12:16 sigma__ If I've got branches A, B, and C, all created from master, what is the proper method of merging them all back cleanly? I like to keep a linear history without "merge commits" all over the place.
12:16 grawity imho "merge commits" are quite clean
12:16 sigma__ In the past, I've merged A into master, rebased B onto master and merged B into master, then rebased C onto master and merged C into master.
12:17 grawity you can merge 3 times, then rebase <pre-merge-master>..master to flatten everything
12:17 BPL grawity: If i do > chmod -R +X minko i get chmod: cannot read directory 'minko': Permission denied
12:17 sigma__ grawity: Would I have to squash any commits, like merge commits, in that scenario?
12:17 grawity no
12:17 sigma__ Maybe I'll give that a shot.
12:17 jceb joined #git
12:18 sigma__ Seems reasonable enough.
12:18 sigma__ Is there anything wrong with the way I've done it before? Even if it's more work?
12:19 sigma__ git checkout A; git rebase master; git checkout master; git merge A; # repeat for B and C...
12:20 keltvek joined #git
12:20 sdaugherty A linear history isn't necessarily a completely clear history.either. A lot can be inferred from the history when you can see how branches have diverged and merged back in.
12:21 ncd|leeN joined #git
12:21 sigma__ sdaugherty: I understand.
12:21 JeroenT joined #git
12:21 rwb joined #git
12:21 sdaugherty That's especially true if you have upstream or downstream repositories integrating changes back in.
12:21 vassagus joined #git
12:22 kyan joined #git
12:23 sigma__ sdaugherty: Sure. That gets messy, so I try to avoid rewriting history.
12:23 engx joined #git
12:23 BPL On the other hand, when i clone stuff using the git included on Sourcetree (1.9.5.msysgit.0) i don't get any permissions error
12:23 BPL so, what's "wrong" with the cygwin's git? any chance to clone the projects properly on windows?
12:23 mablae joined #git
12:24 sigma__ BPL: There is also git-bash.
12:24 peroht_ joined #git
12:24 grawity that *is* git-bash, I think
12:24 sigma__ TIL
12:24 jast "git for windows" is not based on cygwin
12:24 JeroenT joined #git
12:24 jast it's based on msys
12:24 BPL so? what should i do? not using the provided on cygwin at all?
12:25 sigma__ Correct your permissions issues.
12:25 jast are you running the commands from inside a cygwin terminal, or a normal Windows command prompt?
12:26 _kreo joined #git
12:26 BPL sigma__: how? jast: normal windows command prompt mostly of the time (conemu)
12:26 sigma__ You haven't shown us what the permissions are for the objects you're dealing with, or what user and group(s) you're executing the chmod command as.
12:26 shinnya joined #git
12:27 Mogget joined #git
12:28 jast BPL: I'm not sure how cygwin's path mapping works, my unsubstantiated guess is it's doing bad things when being run from a normal windows environment
12:28 jast just to be sure, have you tried the same thing(s) from cygwin's shell?
12:29 fuchstronaut Is there a way to get a list of all changes to files that match a regex (file ending) in the current branch?
12:30 star_pro_ joined #git
12:30 sigma__ left #git
12:30 bongjovi joined #git
12:31 johnny56 joined #git
12:31 flaguy48 left #git
12:32 bobdobbs joined #git
12:32 BPL jast: Ok, never mind, i guess I'll put on path first the git included on sourcetree, which works alright, although is quite old 1.9.5 :P
12:32 dsdeiz joined #git
12:37 mohabaks joined #git
12:38 syndikate joined #git
12:41 flaguy48 joined #git
12:41 gruuf joined #git
12:42 syndikate joined #git
12:42 nnyk_ joined #git
12:43 rgrinberg joined #git
12:45 syndikate joined #git
12:50 sanketdg joined #git
12:52 korolev joined #git
12:52 jimi_ joined #git
12:52 zivester joined #git
12:53 boushi_ joined #git
12:54 interne7y joined #git
12:57 daniel_rose joined #git
12:58 sdothum joined #git
12:58 cdown joined #git
12:58 artemisart joined #git
12:59 syndikate joined #git
13:01 odinsbane joined #git
13:02 cschneid joined #git
13:02 syndikate joined #git
13:02 odinsbane I made a new branch, git branch mono, then I did git commit, which commited the local changes to the old branch.
13:03 Faylite joined #git
13:03 odinsbane How would I commit changes to a new branch?
13:03 odinsbane When I use git checkout mono, I am placed at a spot before any changes were made.
13:03 perlpilot odinsbane: switch to that branch before you commit :)
13:04 odinsbane perlpilot: When I switch to that branch, all of the changes are lost.
13:04 perlpilot odinsbane: right now, you could just move the branch to the commit where you have those changes
13:04 indistylo joined #git
13:04 mooru joined #git
13:04 tobiasvl odinsbane: they're not "lost", you're just switching to a branch that doesn't have them
13:05 odinsbane True.
13:05 odinsbane So, lets say I make a bunch of changes, now how can I commit those changes to a new branch.
13:06 selckin git checkout -b newbranch; git commit
13:06 korolev joined #git
13:06 perlpilot odinsbane: or, more verbosely, git branch foo; git checkout foo;  git commit
13:07 perlpilot you appear to have skipped that second step
13:07 odinsbane Yes.
13:07 star_prone joined #git
13:08 odinsbane Hmm, so when I checkout a branch, any non-commited changes will not be lost?
13:09 selckin indeed
13:10 perlpilot odinsbane: git's purpose in being is to keep things from being lost.
13:10 tobiasvl odinsbane: !float
13:10 gitinfo odinsbane: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
13:10 Finnoloid joined #git
13:10 odinsbane Okay now how do I fix my problem. I have commited changes to 'multi-threaded' that I want commited to 'mono'
13:10 jast also you can copy your commit to your new branch
13:11 selckin odinsbane: you can cherry-pick that commit and then drop it from the other branch
13:11 jast git checkout mono; git cherry-pick multi-threaded
13:11 guardian is there something shorther than git ls-files --state -- "$file" | cut -d' ' -f1 to figure out whether a file is committed with permissions different than 644?
13:12 jast git ls-files shows things from the index, not from commits
13:12 guardian I'm in pre-commit hook
13:12 jast oh, okay then :)
13:12 perlpilot when did ls-files get a --state option?
13:12 kyan joined #git
13:12 jast probably meant --stage
13:13 guardian s/--state/--stage
13:13 guardian sorry
13:13 perlpilot ah
13:13 jast anyway, can't think of anything shorter
13:13 guardian ok
13:13 guardian is it still the case that git only stores 644 or 755?
13:13 jast strictly speaking the cut is not necessary, though
13:13 jast yes
13:13 guardian yeah I could just grep for 755
13:13 jast well, I don't know if submodules show up in that list, they do have a different mode
13:14 jast they probably do show up
13:14 guardian submodules are marked with 160000
13:15 fission6 joined #git
13:15 danslo joined #git
13:16 phanimahesh joined #git
13:19 hahuang61 joined #git
13:19 korolev joined #git
13:19 cdown joined #git
13:24 zumba_ad_ joined #git
13:24 byteflame joined #git
13:26 vassagus joined #git
13:27 ejb joined #git
13:28 fmcgeough joined #git
13:29 ExoUNX joined #git
13:29 Tachyon_ joined #git
13:30 Angs joined #git
13:30 CEnnis91 joined #git
13:30 Lomex joined #git
13:31 rnsanchez_ joined #git
13:31 kedare joined #git
13:32 Angs when I run "git add -A" on ubuntu, it outputs "...git/index.lock': Permission denied". However, ls -al doesn't show that index.lock exist under .git directory. I run "rm -f index.lock" just in case inside the .git directory, but I still get the same error
13:32 cYmen is there a command to revert only a single file?
13:32 Angs does anyone know how should I fix it?
13:33 jceb joined #git
13:33 _rnsanchez_ joined #git
13:33 cYmen Angs: did you take the ... into account?
13:33 cYmen looks like that file might be one directory up in .git
13:34 Angs I meant ... with the previous project path, I didn't want to copy the all
13:34 Angs I run the command inside the directory
13:35 nilg joined #git
13:35 cYmen do you have permission to access the .git directory?
13:35 HanClinto joined #git
13:36 Softeisbieger joined #git
13:37 Angs cYmen,
13:37 Angs it looks like I don't :) "drwxrwxr-x  8 root    root     4096 Aug  3 15:25 .git
13:37 Angs "
13:37 griffindy joined #git
13:37 Angs thanks
13:37 magicTurtle joined #git
13:38 synthroid joined #git
13:38 phanimahesh joined #git
13:38 Cauiu joined #git
13:38 al-damiri joined #git
13:39 nanga joined #git
13:39 nanga joined #git
13:39 ChristopheT joined #git
13:39 ChristopheT left #git
13:40 alcohol joined #git
13:41 HanClinto_ joined #git
13:42 shinnya joined #git
13:42 Dougie187 joined #git
13:42 Lomex joined #git
13:45 Noldorin joined #git
13:45 Sucks joined #git
13:47 AaronMT joined #git
13:48 aavrug joined #git
13:48 Serg_Penguin joined #git
13:48 sfeinste joined #git
13:48 HoierM joined #git
13:48 phaleth joined #git
13:49 kini joined #git
13:49 Serg_Penguin hi ! I broke my git: pushed to remote then accidentally amended commit, now it won't push: "tip of your current branch is behind its remote counterpart". ANy by-step manual to fix ?
13:50 sdaugherty Serg_Penguin, depending on how much time has passed, and restrictions on the remote, you might be able to force push.
13:51 RichiH Serg_Penguin: if you are working with others, you need to make them aware of this change
13:51 synthroid joined #git
13:51 RichiH else, you "break" their repos
13:51 sdaugherty ^ force pushing breaks anyone who's already pulled/cloned after you
13:51 RichiH and if they pull, merge, push, you have your old commit back
13:51 RichiH sdaugherty: i.e. fetched
13:52 hwoarang joined #git
13:52 Serg_Penguin few hours, the only and master developer, repo on bitbucket.org but don't 'own' it, is granted with access
13:52 garethdaine joined #git
13:52 sdaugherty if you catch it quickly, before other people are affected, the quickest, dirtiest, and easiest solution is a force push.
13:53 sbeller joined #git
13:54 sdaugherty it's normally discouraged, because others who may already have the offending commit will have repo operations fail in a similar way as to how your push is failing now.
13:54 kaldoran joined #git
13:54 Serg_Penguin sdaugherty, RichiH thanks, forced. But what is ultimate remedy ? Can i technically forbid amends to myself if pushed ?
13:55 sdaugherty If at all possible, don't amend commits after they've been pushed.
13:56 sdaugherty The proper solution in most cases, after you've already pushed, is to do a revert, instead of amending the commit.
13:57 sdaugherty However, that's not acceptable if you've committed sensitive info to a public repository.
13:57 Serg_Penguin sdaugherty, revert ? my edit was just a one newline ;( no passwords, luckily
13:58 fuchstronaut joined #git
13:58 sdaugherty yeah, almost always better to revert once something's been pushed, because it's not possible to "erase" a commit that a remote repository has seen without rewriting history.
14:00 sdaugherty git is very particular about history rewrites by design, so that they can't happen without being disruptive to other people using the repository
14:02 wodim left #git
14:03 sdaugherty its annoying in a case like this where you've just made a mistake and want to get rid of it, but that same behavior is invaluable as a defense against someone trying to bury a malicious change in a repo.
14:03 GodGinrai joined #git
14:05 sdaugherty with cvs (and many other inferior VCS) for example, someone can manipulate older commits without anyone easily being able to notice it.
14:06 sdaugherty If they try to do that against a git repository, history won't match between repos, and people suddenly find they can't push/pull/fetch anymore.
14:07 jaguarmagenta joined #git
14:08 korolev joined #git
14:08 soLucien joined #git
14:08 tvw joined #git
14:09 usm4n joined #git
14:09 cdown joined #git
14:10 soLucien hello guys ! I want to ignore the modules folder, but unignore modules/autosync and all contents (recursively). Is that possible ?
14:10 rik316 joined #git
14:11 soLucien i tried modules/*
14:11 soLucien !modules/folder_autosync
14:11 gitinfo [!submodule] git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/boo​k/en/Git-Tools-Submodules
14:12 veilig2000 joined #git
14:13 kbs joined #git
14:15 Serg_Penguin sdaugherty, thanks for deep explain, I was not thinking this way ;)
14:16 madewokherd joined #git
14:17 fuchstronaut joined #git
14:17 catag87 joined #git
14:18 netcarver joined #git
14:18 catag87 joined #git
14:18 subhojit777 joined #git
14:20 LionsMane joined #git
14:20 cyan__ joined #git
14:21 tvw joined #git
14:22 ResidentBiscuit joined #git
14:22 Dazzyp joined #git
14:23 tjone270_ joined #git
14:24 axl_ joined #git
14:25 rik316 joined #git
14:26 Dazzyo joined #git
14:26 sarbs joined #git
14:27 l4v2 joined #git
14:27 ShekharReddy joined #git
14:30 PCatinean joined #git
14:31 vassagus joined #git
14:32 zivester joined #git
14:33 mehola joined #git
14:34 sangy joined #git
14:35 Anupkumar joined #git
14:36 dlaboratory joined #git
14:36 underpantz joined #git
14:37 bsanford joined #git
14:37 Tachyon_ joined #git
14:38 Anupkumar hi, currently I have a main git repository (without master access) and I want to push the changes that I made in the master repo directly to my fork, how can I do that?
14:39 moritz Anupkumar: add your fork as remote, do a git push yourremote yourbranch
14:39 grawity git remote add
14:39 selckin add your fork as a remote and i type to slow
14:42 Silenced_v2 joined #git
14:43 catag87 joined #git
14:46 Codfection joined #git
14:47 dlaboratory joined #git
14:48 phanimahesh joined #git
14:49 korolev joined #git
14:51 kyan joined #git
14:52 chll_ joined #git
14:52 jstein_ joined #git
14:54 xall joined #git
14:55 interne7y joined #git
14:57 odinsbane left #git
14:57 korolev joined #git
14:59 JeroenT joined #git
15:00 cqi joined #git
15:04 Christop` joined #git
15:04 Christop` left #git
15:06 SourTrout joined #git
15:08 kpease joined #git
15:09 dmto joined #git
15:09 JeroenT joined #git
15:09 patarr Does anyone use bitbucket? How do I checkout a pull request so I can locally test it?
15:10 spudowiar joined #git
15:11 InfoTest joined #git
15:12 vassagus joined #git
15:13 dreiss joined #git
15:16 star_prone joined #git
15:17 ahmedelgabri joined #git
15:17 Silenced_v2 joined #git
15:18 farkr joined #git
15:18 eivarv joined #git
15:18 farkr Let's say I have two csv files
15:18 farkr one is as follows:
15:19 farkr a,1
15:19 farkr b,2
15:19 farkr c,3
15:19 farkr and the other is
15:19 farkr b,2
15:19 farkr c,3
15:19 farkr a,3
15:19 farkr how can I diff them in way that it ignores the fact that a is below b and c?
15:19 farkr while also making note of the new value change on a
15:19 hahuang61 joined #git
15:19 * polyzen looks at channel name
15:20 GodGinrai polyzen: indeed
15:20 tyreld joined #git
15:20 Darren_ joined #git
15:20 polyzen sounds like homework
15:21 polyzen :p
15:21 GodGinrai lol
15:21 polyzen farkr, correct the order, then diff?
15:22 crayon joined #git
15:22 dreiss joined #git
15:22 tonyyarusso joined #git
15:24 GodGinrai farkr: so you're just trying to figure out if values changed?
15:27 fuchstronaut joined #git
15:28 aep-shoutlet joined #git
15:30 ben__ joined #git
15:32 moriko joined #git
15:33 brewmaster joined #git
15:33 synthroid joined #git
15:34 GodGinrai farkr: simple, and crude: `awk -F, '{ if ($1 in arr) { if (arr[$1] != $2 ) { changes[$1] = $2 }  } else { arr[$1] = $2 } } END { for (i in changes) { print i }}' a.csv b.csv`
15:34 mehola joined #git
15:34 Tachyon_ joined #git
15:35 GodGinrai or even simpler
15:35 GodGinrai sort a.csv b.csv && diff a.csv b.csv
15:36 nnyk_ joined #git
15:36 farkr sorry, I used a bad example
15:36 kyan joined #git
15:36 farkr it's more like b.csv has an extra line with "d,4"
15:37 farkr here, I'll just give you the files and show you the results I'm getting
15:38 faheem joined #git
15:38 nilg joined #git
15:39 farkr http://pastebin.com/GhedBWv0
15:39 farkr this is the diff
15:39 GodGinrai farkr: pastebin.com is blocked here because of many reasons, use a better pastebin
15:40 jaafar joined #git
15:40 thiago joined #git
15:41 danslo joined #git
15:41 texinwien_ joined #git
15:41 TomyLobo joined #git
15:42 shymega joined #git
15:42 madewokherd joined #git
15:42 farkr http://hastebin.com/qotosoyogi.avrasm
15:42 shymega joined #git
15:43 farkr http://hastebin.com/facorucide.avrasm
15:43 farkr ignore the extensions
15:43 farkr http://hastebin.com/rozapinicu.avrasm
15:43 farkr these are all csv
15:44 farkr first one is diff, last two are csv
15:45 GodGinrai farkr: so, how are you so sure the diff is giving you weird output?  I've tried like 3 random lines and found that it isn't repeated in the diff output as being added and removed.  only one or the other
15:45 rominronin joined #git
15:47 seb7 joined #git
15:47 farkr I don't really understand what you're saying, sorry :/
15:47 anuxivm joined #git
15:48 farkr my problem is that it's basically just combining both of the files into one
15:49 nettoweb joined #git
15:49 GodGinrai Either I'm not understanding what you are getting at, or you don't understand what diff does.
15:51 farkr I want it so that it shows the changed line directly under the old line
15:52 farkr instead it just puts all the '---' at the top and '+++' on the bottom
15:53 jast for complete rewrites there's the -B option
15:54 jast but generally what you're seeing is basically the way diff is definedf
15:55 jast that doesn't look like a valid unified diff, anyway. you're not talking about diffs in git, are you?
15:55 jast GodGinrai: how is pastebin.com "blocked" here?
15:55 danimal2 joined #git
15:56 jast oh wait, you mean a different "here" than me, don't you :)
15:56 GodGinrai jast: yes
15:56 jast today is one of these "thinking N/A" days...
15:56 ahmedelgabri joined #git
15:56 GodGinrai lol
15:56 farkr jast: no, that's in CRAN, but git returns the same thing http://hastebin.com/nerolixutu.avrasm
15:57 jast I have to figure out a way to fix the hurried wide refactoring from last week at work, and it's the mind killer
15:57 AaronMT joined #git
15:58 kbs joined #git
15:58 Zamerick joined #git
15:59 ambro718 joined #git
15:59 texinwien_ joined #git
16:00 dreiss joined #git
16:00 nnyk_ joined #git
16:05 tvw joined #git
16:05 brandonw joined #git
16:07 jaguarmagenta joined #git
16:10 vassagus joined #git
16:14 df\d joined #git
16:15 rgrinberg joined #git
16:17 Electrometro joined #git
16:18 Gitzilla joined #git
16:20 daniel_rose joined #git
16:21 snowkidind joined #git
16:21 moriko joined #git
16:23 EvilPenguin joined #git
16:23 jaequery joined #git
16:25 Derperperd joined #git
16:26 Pulp joined #git
16:26 UTAN_dev joined #git
16:26 Electrom_ joined #git
16:26 harish_ joined #git
16:28 kevwil joined #git
16:35 zarubin joined #git
16:35 mehola joined #git
16:35 devxom joined #git
16:35 jeremyhall joined #git
16:35 JanC_ joined #git
16:35 devxom joined #git
16:37 emPi joined #git
16:38 solrize joined #git
16:38 solrize joined #git
16:39 durham joined #git
16:39 durham joined #git
16:40 nivag joined #git
16:40 ImJune joined #git
16:40 yoan joined #git
16:43 cyan__ joined #git
16:44 kaldoran joined #git
16:45 SteffanW2 joined #git
16:45 grayjoc joined #git
16:47 rominronin joined #git
16:47 eivarv joined #git
16:48 rgrinberg joined #git
16:49 Limes__ joined #git
16:50 BSaboia joined #git
16:51 fuchstronaut joined #git
16:51 daynaskully joined #git
16:54 jfcaron joined #git
16:54 dreiss joined #git
16:54 [gmi] joined #git
16:55 jeremyhall_ joined #git
16:56 interne7y joined #git
16:56 Lomex joined #git
16:59 djapo joined #git
17:01 BSAlb joined #git
17:01 shinnya joined #git
17:02 livingstn joined #git
17:02 foist joined #git
17:04 star_prone joined #git
17:06 nitric joined #git
17:07 fstd joined #git
17:07 LeBlaaanc joined #git
17:11 kadoban joined #git
17:12 str joined #git
17:13 le_melomane joined #git
17:13 WayToDoor joined #git
17:14 tabrez joined #git
17:15 armyriad joined #git
17:17 armyriad joined #git
17:17 eivarv joined #git
17:18 piling joined #git
17:18 phanimahesh joined #git
17:19 jfcaron joined #git
17:20 hahuang61 joined #git
17:20 diegoviola joined #git
17:22 The_Phoenix joined #git
17:22 kevwil joined #git
17:22 fuchstronaut joined #git
17:24 govg joined #git
17:27 Derperperd joined #git
17:27 Spec-Chum joined #git
17:28 daniel_rose joined #git
17:29 texinwien_ joined #git
17:31 gtristan joined #git
17:33 Lyqyd joined #git
17:34 lvns joined #git
17:35 Dyonisos joined #git
17:35 mehola joined #git
17:39 le_melomane joined #git
17:40 maucar joined #git
17:41 MZAWeb joined #git
17:42 ahmedelgabri joined #git
17:42 le_melomane joined #git
17:43 phanimah1sh joined #git
17:43 kevwil joined #git
17:43 thiago joined #git
17:44 durham joined #git
17:46 lvns joined #git
17:46 rominronin joined #git
17:48 tvw joined #git
17:49 ChristopheT joined #git
17:49 ChristopheT left #git
17:50 Sasazuka joined #git
17:51 durham_ joined #git
17:57 ImJune joined #git
17:58 eVolutive joined #git
17:58 vktec joined #git
17:59 durham joined #git
18:00 fuchstronaut joined #git
18:01 zumba_ad_ joined #git
18:01 sagerdearia joined #git
18:02 thekryn__ joined #git
18:04 aard joined #git
18:04 nnyk_ joined #git
18:05 HanClinto joined #git
18:06 aavrug joined #git
18:06 kevwil joined #git
18:10 dminuoso joined #git
18:11 dminuoso Hi, I have a huge source file, and Im interested in the entire history of a particular region of code, but there's too many changes in the surrounding code.
18:11 jeremyhall joined #git
18:11 dminuoso (Basically I know there was some bit of documentation that was there at some time in the past, but I don't know how to find it)
18:12 dminuoso Note, this is a github project, if there's some github-specific functionality that could help me.
18:12 kadoban dminuoso: git blame possibly, or maybe the stuff from git log about pickaxe, like -S and -G and etc. might help.
18:15 anuxivm joined #git
18:16 MacWinner joined #git
18:17 nitric dminuoso: look at the -L option of `git help log`
18:17 dminuoso nitric: Ah brilliant.
18:19 kbs oh, nice - good to know :-)
18:21 bdonnahue joined #git
18:21 jfcaron left #git
18:21 sweb joined #git
18:21 bdonnahue hey guys. when youre writing unit test libraries. d oyou keep them in the same repo as the code?
18:21 bdonnahue not sure what common/best practices are
18:22 sweb is there any mehtod to tell git just remember 10 latest for files in special folders ?
18:22 UTAN_dev joined #git
18:22 mkoskar joined #git
18:22 sweb for example i have project i build the source ... source must be git but i dont need to remember all commits of it ... just 10 latest commits
18:23 rpd bdonnahue: Not sure what you mean by unit test libraries, but it seems okay to keep unit tests in the same repo as the code it tests.
18:24 veilig2000 joined #git
18:24 bdonnahue rpd: for example. I write a c# dll and a NUnit dll with tests. they are both in the same solution. i want to create a build system which build production containers based on the code
18:24 rpd sweb: you could always use --depth when you clone to make a shallow clone
18:24 bdonnahue i wasnt sure if people configure the build system to strip out the tests or if code and tests go to different repos
18:25 sweb rpd: not during clone ... in main repository i dont need all commits but i need git for get latest build sources ... use case is i want to use babeljs for compile to standard javascript but i dont need to build on each repository
18:25 rpd you'd probably have your build system allow multiple targets; one for testing/dev and one for building a production binary
18:25 anuxivm joined #git
18:26 eivarv joined #git
18:26 rpd sweb: why not just get the last 10 commits from the log?
18:26 rpd If you already have all the commit history, there's no reason to get rid of it, just select which parts of the history you care about
18:27 sweb rpd: problem is build can create hug list of file on each build i dont need the history of that files ... i need to just have it not just have entire history build for each file ...
18:27 kevwil joined #git
18:27 sweb it's increase git database and useless
18:28 freimatz joined #git
18:28 jayc joined #git
18:28 rpd I'm not sure if I understand, but you only want to build the files modified in the last 10 commits, right?
18:32 piling guys how do we force to push ?
18:32 piling after rebase -i ?
18:35 sweb rpd: right, 10 or one ... i dont need history of that files .. i just need to be synced with git
18:35 dminuoso bdonnahue: Always keep unit tests in your source, including the required support files to execute that testsuite.
18:35 anuxivm joined #git
18:36 dminuoso bdonnahue: In an ideal scenario a programmer would: clone your repository, obtain any dependencies, and then execute, build or test
18:36 mehola joined #git
18:36 dminuoso piling: Is this for a public repository? Has the work been shared already?
18:36 ki0 joined #git
18:37 iamtakingiteasy joined #git
18:37 dminuoso !rewriting_public_history
18:37 gitinfo [!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
18:37 m0viefreak joined #git
18:38 rnsanchez_ joined #git
18:39 iamtakingiteasy joined #git
18:39 paul424 joined #git
18:39 star_pro_ joined #git
18:40 iamtakingiteasy joined #git
18:40 iamtakingiteasy joined #git
18:42 daniel_rose joined #git
18:43 piling dminuoso: yeah for both
18:44 danslo_ joined #git
18:46 dminuoso piling: Then read the gitinfo comment I provided.
18:46 ambro718 joined #git
18:46 Synthead joined #git
18:47 piling dminuoso: appreciated, thanks.
18:47 rominronin joined #git
18:47 kfunk joined #git
18:48 kevwil joined #git
18:49 anuxivm joined #git
18:51 Mannequin joined #git
18:51 explodes joined #git
18:52 explodes left #git
18:52 Sasazuka joined #git
18:54 anuxivm joined #git
18:54 thekrynn_ joined #git
18:54 jmd joined #git
18:55 iamtakingiteasy joined #git
18:56 jmd I know that at sometime in the past file X contained the string "foo".
18:56 jmd How can I search for the last commit where it existed?
18:56 dreiss joined #git
18:57 interne7y joined #git
18:57 nitin joined #git
18:57 kadoban jmd: 'git log -S foo -- the_file' should work
18:59 jmd kadoban: Thanks
19:00 fuchstronaut joined #git
19:03 avar Generally you want to use -G instead of -S, although in this case -S does what you want
19:04 kevwil_ joined #git
19:08 sweb left #git
19:08 nwkj86 joined #git
19:09 star_prone joined #git
19:10 elementalest joined #git
19:10 elementalest joined #git
19:13 Kulrak joined #git
19:13 Kulrak joined #git
19:15 star_prone joined #git
19:15 offby1 joined #git
19:15 * offby1 waves
19:16 offby1 Howdy git folks.  Is there some clever way to persuade git-grep to emit the _absolute_ file name of the hits that it finds?
19:16 offby1 I often run git-grep in a loop, looking in many different git repositories; I'd love to be able to process the output from emacs' grep-mode
19:17 * offby1 of course only now thinks to google, and finds http://superuser.com/questions/980922/ho​w-to-print-absolute-paths-with-git-grep
19:18 Sazhen86 joined #git
19:19 crayon joined #git
19:19 robotroll joined #git
19:20 Macaveli joined #git
19:20 johnmilton joined #git
19:21 eivarv joined #git
19:21 Takumo joined #git
19:21 Takumo joined #git
19:21 grawity joined #git
19:23 dmto joined #git
19:24 Guest66771 joined #git
19:25 kbs cool (as a fellow emacs user :-)
19:26 offby1 I suspect the answer will be "use sed"
19:26 kbs heh
19:26 offby1 which I will lower myself to, if I must
19:26 alexclark joined #git
19:26 offby1 LIKE AN ANIMAL
19:26 rbern joined #git
19:26 shmuli joined #git
19:27 GavinMagnus joined #git
19:27 fabio_ joined #git
19:27 alexclark im trying to use merge-file to merge disparate files and can't do it for the life of me
19:28 alexclark does anyone know how to use that tool?
19:29 offby1 kbs: actually, sed seems to work fine, and isn't too nasty
19:29 GavinMagnus left #git
19:29 offby1 e.g., searching for @retry in all my Python files:
19:29 offby1 for d in */src/*/; do (cd $d; set -o pipefail; git grep -nH @retry -- '*.py' | sed s,^,$(pwd)/, ); done
19:29 MattMaker joined #git
19:30 MattMaker joined #git
19:30 fahadash joined #git
19:31 IgnitionWeb joined #git
19:31 alexclark maybe its not what i need
19:32 peroht joined #git
19:32 offby1 alexclark: I don't know, but I suspect that's a "plumbing" tool
19:33 offby1 i.e., intended for git's internal use, not really intended for us hairy humans
19:33 offby1 s/hairy/clumsy/
19:33 GodGinrai offby1: `git grep whatever | 'awk -F: '{ "git rev-parse --show-toplevel" | getline base; print base "/" $1; }'
19:33 offby1 GodGinrai: I think I like mine better :)
19:34 alexclark offby1: i imagine whoever wrote it was the hairy one
19:34 offby1 My brother is a smooth man.
19:36 offby1 hm, I don't need the "pipefail"
19:36 irco joined #git
19:37 cdown joined #git
19:37 ImJune joined #git
19:37 mehola joined #git
19:38 GodGinrai offby1: yours assumes a directory.  Mine will work in any git repo, from anywhere in the repo. :)
19:40 offby1 GodGinrai: does that awk script run "git rev-parse" once total, or once for each line that git-grep outputs?
19:41 btree joined #git
19:41 vrishab joined #git
19:41 GodGinrai offby1: every line, but you can throw the rev-parse into a BEGIN block to run it once
19:42 GodGinrai `git grep whatever | 'awk -F: 'BEGIN { "git rev-parse --show-toplevel" | getline base; } { print base "/" $1; }'`
19:43 mariuscc joined #git
19:44 GenZai joined #git
19:46 _kreo joined #git
19:48 rominronin joined #git
19:49 eVolutive joined #git
19:49 paul424 joined #git
19:50 ZexaronS joined #git
19:51 fuchstronaut joined #git
19:52 Darcidride joined #git
19:54 armyriad joined #git
19:55 jimi_sanchez joined #git
19:57 lvns joined #git
19:57 Alejandro-25 joined #git
19:59 kyan joined #git
20:00 ImJune joined #git
20:01 boombatower joined #git
20:02 jeremyhall_ joined #git
20:04 mcmillhj_ joined #git
20:06 mcmillhj_ I have a branch that was merged to our dev branch, but then that commit was reverted. How can I perform that merge again? When I try to merge the normal way via: git co dev -> git merge feature I see 'Already up-to-date.'
20:07 rpd sounds like you're missing a fetch if it thinks it's up to date already
20:07 kadoban mcmillhj_: revert the revert
20:08 mcmillhj_ kadoban: how do I do that exactly? Just git-revert with the sha1, then git push ?
20:08 kadoban mcmillhj_: Yes, git revert thesha1oftherevertcommit, and then ... whatever you want to do with it, push if you like.
20:09 mcmillhj_ kadoban: thanks, I will try that
20:09 jaguarmagenta joined #git
20:10 mcmillhj_ kadoban: worked perfectly, thank you.
20:10 invex joined #git
20:10 kadoban Cool, 'welcome.
20:11 boushi joined #git
20:11 DJ_Spies joined #git
20:12 rgrinberg joined #git
20:12 armyriad joined #git
20:13 a3Dman joined #git
20:16 HappyLoa- joined #git
20:18 jayc joined #git
20:20 PCatinean joined #git
20:21 maroloccio joined #git
20:22 tvw joined #git
20:23 eVolutive joined #git
20:24 Lunatrius` joined #git
20:25 mcmillhj_ left #git
20:25 xpk joined #git
20:25 ajf- joined #git
20:25 btree left #git
20:25 IgnitionWeb joined #git
20:27 a3Dman joined #git
20:28 Spec-Chum joined #git
20:28 nwkj86 joined #git
20:28 drefl joined #git
20:29 Joel joined #git
20:29 Joel if I type git tags, are they listed in the order they where made?
20:31 mariuscc joined #git
20:31 kadoban I thought they're alphabetical or something. I dunno though.
20:32 hahuang61 joined #git
20:35 rominronin joined #git
20:35 shmuli joined #git
20:36 ImJune joined #git
20:37 robotroll joined #git
20:38 mehola joined #git
20:39 Henkie joined #git
20:40 daniel_rose joined #git
20:40 johnmilton joined #git
20:41 rahtgaz joined #git
20:42 pampeho joined #git
20:44 vuoto joined #git
20:44 danslo joined #git
20:51 xnrand joined #git
20:52 JanC joined #git
20:54 TinkerTyper joined #git
21:01 aidalgol joined #git
21:02 aep-shoutlet joined #git
21:04 SwiftMatt joined #git
21:04 avar see "man git-tag" and search for --sort
21:04 gitinfo the git-tag manpage is available at http://jk.gs/git-tag.html
21:05 BPL joined #git
21:05 avar Joel: ^
21:05 haribo joined #git
21:05 dsdeiz joined #git
21:05 dsdeiz joined #git
21:10 LeBlaaanc joined #git
21:14 BSaboia joined #git
21:16 jagob joined #git
21:17 editshare-ericf joined #git
21:17 LeBlaaanc joined #git
21:17 texinwien_ joined #git
21:21 xall joined #git
21:24 ahr3n joined #git
21:25 rkazak joined #git
21:26 rahtgaz joined #git
21:26 mattcen joined #git
21:26 fabio_ joined #git
21:29 eVolutive joined #git
21:29 Charliechin joined #git
21:30 LeBlaaanc joined #git
21:32 Caelum ugh, I have a wrong email in a commit I already pushed to master, what do I do?
21:32 osse Caelum: either force push or create a .gitmailmap
21:33 ImJune joined #git
21:33 vktec But don't force push unless you are _absolutely certain_ that _nobody_ else has pulled that commit
21:33 osse I mean .mailmap
21:33 Caelum thank you
21:34 osse !mailmap
21:34 osse hmm
21:34 osse anyway, see man git-shortlog
21:34 gitinfo the git-shortlog manpage is available at http://jk.gs/git-shortlog.html
21:35 LeBlaaanc joined #git
21:35 mellernoia joined #git
21:35 liamonade joined #git
21:35 jayc joined #git
21:38 kyan joined #git
21:38 adamm joined #git
21:39 netj joined #git
21:41 Brain joined #git
21:41 CrypticGator joined #git
21:42 skinux joined #git
21:43 skinux If I have created a local branch of a project, when I checkout that branch will it over-write the existing branch files or will it check files out to a sub-directory of hte project directory?
21:43 mischat joined #git
21:43 osse skinux: overwrite
21:43 ImJune_ joined #git
21:43 skinux How can I make it checkout the branch to a sub-directory or some way where it won't over-write the existing branch files?
21:44 CrypticGator joined #git
21:44 osse man git-worktree
21:44 gitinfo the git-worktree manpage is available at http://jk.gs/git-worktree.html
21:45 cd-rum joined #git
21:45 osse but the common way to do it is to just checkout the other branch, and check the previoous one back out when you need it
21:47 DieguezZ joined #git
21:47 ImJune joined #git
21:50 kpease_ joined #git
21:51 Dougie187 left #git
21:51 fuchstronaut joined #git
21:55 nnyk_ joined #git
21:56 anuxivm joined #git
21:56 hkm joined #git
21:57 kpease joined #git
21:57 Caelum osse: oh looks like I needed this anyway, because half of my history uses a different email address
21:58 zumba_addict joined #git
21:58 osse Caelum: Pro tip: Don't set your email in ~/.gitconfig so that Git nags you to set it
21:59 osse And set it per repo
22:00 Caelum osse: this doesn't fix 'git log' output, right?
22:01 osse Nop
22:02 osse Just a way to make it not happen in the future
22:02 zumba_addict joined #git
22:04 FelixVi joined #git
22:04 Darcidride_ joined #git
22:05 eVolutive joined #git
22:06 Spec-Chum joined #git
22:07 Caelum meh, would be nice if it did, oh well
22:08 jayc joined #git
22:08 Caelum osse: in this particular case, I used my email from an organization that I later decided I no longer want to be identified with, because cunts, so I switched to my gmail address
22:08 spudowiar joined #git
22:09 xall joined #git
22:09 osse Caelum: That cunty email is etched in stone, unfortunately
22:10 jaguarmagenta joined #git
22:10 osse Because checksums
22:10 Caelum heh
22:11 jeffreylevesque joined #git
22:12 liamonade joined #git
22:13 tvw joined #git
22:13 kadoban xD
22:14 vF3hNGxc47h8 joined #git
22:18 jimi_ joined #git
22:21 xpk_ joined #git
22:23 heroux joined #git
22:25 BSAlb joined #git
22:29 axl__ joined #git
22:29 rnsanchez joined #git
22:30 Derperperd joined #git
22:34 efco joined #git
22:34 madewokherd joined #git
22:35 nickthetait joined #git
22:38 iDanoo joined #git
22:38 iDanoo joined #git
22:39 mehola joined #git
22:45 adante_ joined #git
22:46 danslo joined #git
22:47 larsxschneider joined #git
22:52 jayc joined #git
22:52 cyan__ joined #git
22:52 _Patrick_ joined #git
22:53 ResidentBiscuit joined #git
22:55 ImJune joined #git
22:58 ash_workz joined #git
22:58 HappyLoa- joined #git
22:58 interne7y joined #git
22:59 xall joined #git
23:00 leeN joined #git
23:02 guampa joined #git
23:03 Gitzilla joined #git
23:03 ChristopheT joined #git
23:03 ChristopheT left #git
23:05 ImJune joined #git
23:05 red_ joined #git
23:05 catag87 joined #git
23:06 unreal_ joined #git
23:06 catag87 joined #git
23:07 smakarov_ joined #git
23:07 bluepixel joined #git
23:08 Darcidride joined #git
23:10 moop joined #git
23:13 rkazak joined #git
23:14 drawkula joined #git
23:14 rbern joined #git
23:16 Tachyon_ joined #git
23:16 idmistir joined #git
23:20 Jon28__ joined #git
23:21 strbean joined #git
23:22 strbean hello
23:22 gitinfo strbean: 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.
23:23 d0nn1e joined #git
23:24 dsdeiz joined #git
23:29 vassagus joined #git
23:29 strbean So I have the following situation: Repos A, B, and C. B and C were submodules of A. They have now been moved into repository A as subdirectories. I have a fork of B with numerous commits that were not in B at the time it was moved into A. How do I go about merging my changes into A?
23:30 hahuang61 joined #git
23:30 str joined #git
23:30 dminuoso joined #git
23:30 kadoban strbean: The subtree merging strategy. If you're going to be doing stuff like that a lot, you should use the 'git subtree' command, it's quite nice.
23:31 strbean kadoban: thanks, I'll read up on it.
23:34 ahr3n joined #git
23:39 jj- joined #git
23:41 cqi joined #git
23:52 ReenignE joined #git
23:52 ReenignE joined #git
23:52 fuchstronaut joined #git
23:53 shmuli joined #git
23:58 ariver joined #git

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