Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-01

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

All times shown according to UTC.

Time Nick Message
00:00 mingrammer joined #git
00:00 mizu_no_oto joined #git
00:06 Milijus joined #git
00:08 heroux joined #git
00:08 Kitty- joined #git
00:10 talos_ joined #git
00:11 prawnzy joined #git
00:16 snthsnth joined #git
00:19 talos_ joined #git
00:21 Milijus joined #git
00:28 snowkidind joined #git
00:33 mischat joined #git
00:33 snthsnth joined #git
00:33 eka joined #git
00:36 _sjs joined #git
00:38 kerrick joined #git
00:38 star_prone joined #git
00:43 kerrick joined #git
00:44 codfection joined #git
00:46 ruby_ joined #git
00:48 ruby__ joined #git
00:49 pksadiq`` joined #git
00:49 timvisher joined #git
00:50 ac_slater_ left #git
00:51 Puffball joined #git
00:52 daithioc joined #git
00:53 daithioc left #git
00:53 daithioc joined #git
00:54 mizu_no_oto joined #git
00:54 fuchstronaut joined #git
00:56 Puffball joined #git
00:56 mingrammer joined #git
00:59 dsantiago joined #git
01:05 ruby_ joined #git
01:06 wasjosh joined #git
01:07 ruby_ joined #git
01:08 Puffball joined #git
01:09 moei joined #git
01:10 zumba_addict joined #git
01:10 arescorpio joined #git
01:10 watabou joined #git
01:19 d^sh joined #git
01:27 sunri5e joined #git
01:32 aax joined #git
01:33 mischat joined #git
01:34 romerocesar joined #git
01:36 fstd_ joined #git
01:37 AustinMatherne joined #git
01:38 timvisher joined #git
01:39 Dougie187 joined #git
01:40 pks joined #git
01:46 freddymungo joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help and electronically-induced comas | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-daemon: the evil rises
01:51 mingrammer joined #git
01:52 snthsnth joined #git
01:53 mizu_no_oto joined #git
01:53 Puffball joined #git
01:54 JamesBaxter joined #git
01:54 ash_workz joined #git
01:55 e14 joined #git
01:57 ResidentBiscuit joined #git
02:01 Limes_ joined #git
02:06 wololokatamari[m joined #git
02:07 chachasmooth joined #git
02:08 e14 joined #git
02:18 hahuang62 joined #git
02:27 star_prone joined #git
02:28 Puffball joined #git
02:30 le_melomane joined #git
02:33 SwiftMatt joined #git
02:34 mischat joined #git
02:34 olalonde joined #git
02:34 lagothri1 joined #git
02:36 Puffball_ joined #git
02:39 timvisher joined #git
02:39 danimal2 joined #git
02:40 JamesBaxter joined #git
02:41 duderonomy joined #git
02:41 quackgyver joined #git
02:45 mizu_no_oto joined #git
02:46 ALoGeNo joined #git
02:49 pksadiq`` left #git
02:49 boombatower joined #git
02:51 Milijus joined #git
02:52 snthsnth joined #git
02:52 JanC_ joined #git
02:56 Motoko joined #git
02:57 fstd joined #git
02:58 thomas_25 joined #git
02:58 Dougie187 left #git
03:00 rgrinberg joined #git
03:02 fstd joined #git
03:03 fedepad joined #git
03:06 Puffball joined #git
03:06 johnny56 joined #git
03:06 fstd joined #git
03:07 mingrammer joined #git
03:08 romerocesar joined #git
03:09 gfixler joined #git
03:09 HoloPed joined #git
03:10 meadmoon joined #git
03:10 fstd joined #git
03:11 Puffball_ joined #git
03:13 mangolisk joined #git
03:14 meadmoon joined #git
03:15 Vortex34 joined #git
03:16 PaulCapestany joined #git
03:16 fstd joined #git
03:18 Goplat joined #git
03:20 fstd joined #git
03:21 PaulCapestany joined #git
03:24 fstd joined #git
03:29 fstd joined #git
03:30 Puffball joined #git
03:34 roentgen_ joined #git
03:34 fstd joined #git
03:34 Puffball_ joined #git
03:35 mischat joined #git
03:36 stupidystupid joined #git
03:37 KnownSyntax joined #git
03:37 KnownSyntax joined #git
03:39 mizu_no_oto joined #git
03:41 noyb joined #git
03:42 mingrammer joined #git
03:43 SwiftMatt joined #git
03:45 Kitty- joined #git
03:46 fmcgeough joined #git
03:47 dreiss joined #git
03:47 Puffball joined #git
03:48 t0n1c joined #git
03:53 jstimm_ joined #git
03:53 aidalgol joined #git
03:53 sagerdearia joined #git
03:55 nilg joined #git
03:55 mehola joined #git
04:00 a_thakur joined #git
04:02 HoloPed joined #git
04:04 a_thakur joined #git
04:04 tomasm- joined #git
04:06 CEnnis91 joined #git
04:06 prawnzy joined #git
04:08 danslo_ joined #git
04:09 daey_ joined #git
04:11 shinnya joined #git
04:14 Puffball joined #git
04:14 e14 joined #git
04:21 tomasm- left #git
04:21 danimal2 joined #git
04:26 Puffball joined #git
04:27 mizu_no_oto joined #git
04:28 DSLegends joined #git
04:31 Puffball_ joined #git
04:32 SteffanW joined #git
04:40 stupidystupid joined #git
04:42 DSLegends left #git
04:43 PioneerAxon joined #git
04:48 Raed joined #git
04:50 texasmynsted joined #git
04:59 phaleth joined #git
04:59 Cabanossi joined #git
05:02 EvanDotPro joined #git
05:08 InfoTest joined #git
05:10 danslo_ joined #git
05:12 prawnzy joined #git
05:13 mmlb joined #git
05:13 romerocesar joined #git
05:14 snthsnth joined #git
05:17 xall joined #git
05:20 Masber_080 joined #git
05:25 Remram[m] joined #git
05:25 kikijiki[m] joined #git
05:26 hallogallo[m] joined #git
05:26 M-shine joined #git
05:26 M-meznak joined #git
05:26 M-mistake joined #git
05:26 aviraldg joined #git
05:26 Ineentho[m] joined #git
05:26 shuiniu joined #git
05:30 mingrammer joined #git
05:36 qws-user-1228 joined #git
05:37 mischat joined #git
05:43 snthsnth joined #git
05:48 NicholasDM joined #git
05:50 pluc_pilou joined #git
05:54 subhojit777 joined #git
05:58 romerocesar joined #git
06:02 daishan joined #git
06:04 star_prone joined #git
06:06 jaguarmagenta joined #git
06:07 jaguarmagenta joined #git
06:11 danslo_ joined #git
06:13 xall joined #git
06:16 tmg joined #git
06:17 tmg can someone provide a reference for the "$@" magic in line 176 of run-command.c? Why is this necessary & how does it work?
06:27 DSLegends joined #git
06:29 phanimahesh joined #git
06:31 ojacobson Link?
06:32 ojacobson Ah, never mind, found it
06:32 ojacobson Note that the arg list being built up is destined for a shell
06:33 ojacobson in sh, "$@" expands to the command line arguments to the current script, with whitespace and token boundaries preserved properly
06:33 ojacobson ($@ on its own expands to the command line arguments, retokenized on whitespace, so an argument with a space in it becomes two tokens.)
06:34 krs93 joined #git
06:38 mischat joined #git
06:39 phanimahesh joined #git
06:43 rendar joined #git
06:43 shuiniu joined #git
06:43 tmg ojacobson: so when I write into a shell `sh -c '$EDITOR file'` and it works as anticipated, the "parent" shell is doing similar-to-this-git-code arg list munging?
06:44 isBEKaml joined #git
06:44 shuiniu joined #git
06:45 krs93 joined #git
06:46 tmg I think the editor is launched with something like:
06:46 tmg 'excvp("/bin/sh", (char * const[]){ "sh", "-c", "vim @", "vim", "filename"} })'
06:46 tmg which just looks totally bizarre
06:47 tmg ...oh, I think I get it now; so excvp runs the script 'vim $@' with arg list 'vim, filename'?
06:47 tmg thanks ojacobson, you are a great sound board
06:52 grift joined #git
06:55 subhojit777 joined #git
06:55 laumann joined #git
06:56 sheck_ joined #git
06:57 ojacobson Yep, exactly
06:57 ojacobson The quoted $@ helps ensure that files like "this name has a space" get handled as you'd expect
06:57 ojacobson rather than being broken up into "this", "name", "has", "a", "space" by the shell
06:58 mangolisk joined #git
06:58 shuiniu joined #git
06:59 fuchstronaut joined #git
06:59 jknetl joined #git
07:03 shuiniu^ joined #git
07:04 fedepad joined #git
07:06 mingrammer joined #git
07:08 tvw joined #git
07:12 danslo_ joined #git
07:13 timvisher joined #git
07:13 yshuiniu joined #git
07:14 hahuang62 joined #git
07:16 King_Hual joined #git
07:18 mycyber joined #git
07:22 SwiftMatt joined #git
07:23 dreiss joined #git
07:25 shinnya joined #git
07:26 kjsage[m] joined #git
07:28 krs93_ joined #git
07:31 qws-user-1228 joined #git
07:35 fuchstronaut joined #git
07:37 isBEKaml joined #git
07:39 mischat joined #git
07:41 theskillwithin hmmm I wonder if I can have my build folder not ignored just on my gh-pages branch so that can be shown there
07:45 theskillwithin hmm https://www.npmjs.com/package/gh-pages
07:49 Samual joined #git
07:49 Samual joined #git
07:50 mycyber joined #git
07:50 qws-user-1228 joined #git
07:50 snthsnth joined #git
07:57 ixian joined #git
07:58 ThomasLocke joined #git
08:00 mingrammer joined #git
08:03 t0by joined #git
08:05 mingrammer joined #git
08:08 subhojit777 joined #git
08:10 [^^AloN3^^] joined #git
08:10 zeroed joined #git
08:11 [^^AloN3^^] left #git
08:12 kakashi_ joined #git
08:12 phanimahesh joined #git
08:12 kakashi_ left #git
08:13 Kamilion joined #git
08:16 qws-user-1228 joined #git
08:16 LebedevRI joined #git
08:18 LebedevRI hi. is there any way to make git apply a patch while ignoring case-only changes? or to format a patch ignoring case-only changes?
08:21 timvisher joined #git
08:22 sleepster joined #git
08:23 sleepster for a specific file, is there a way to go through its history and create a separate file for each file in its history?
08:23 cagedwisdom joined #git
08:23 sleepster for each commit I mean
08:23 Raansu joined #git
08:26 Raansu joined #git
08:27 Raansu joined #git
08:27 LebedevRI or is there a way to git add while ignoring case-only changes?
08:32 noyb joined #git
08:34 Raansu joined #git
08:35 DJ_Spies joined #git
08:36 fuchstronaut joined #git
08:38 Raansu joined #git
08:38 eivarv joined #git
08:39 cbreak sleepster: yes
08:39 cbreak LebedevRI: I don't think so
08:40 mischat joined #git
08:40 qws-user-1228 joined #git
08:41 Raansu joined #git
08:42 bocaneri joined #git
08:42 polyzen joined #git
08:42 jknetl joined #git
08:43 fedepad joined #git
08:44 LebedevRI strange, even GIT_EXTERNAL_DIFF='diff -ipu "$2" "$5" #' git diff --ext-diff  does not ignore case changes..
08:48 fees joined #git
08:50 phanimahesh joined #git
08:55 AndreSomers joined #git
08:57 lexxis joined #git
08:58 tvw joined #git
08:59 katherine joined #git
08:59 prawnzy joined #git
09:00 mycyber joined #git
09:01 katherine joined #git
09:07 ixian joined #git
09:08 cdown joined #git
09:08 katherine joined #git
09:08 jstein_ joined #git
09:09 dbck joined #git
09:12 Brain joined #git
09:13 cbreak joined #git
09:15 hahuang62 joined #git
09:16 jberkus joined #git
09:17 timvisher joined #git
09:17 Masber_080 joined #git
09:20 Chill_Surf joined #git
09:22 bocaneri joined #git
09:24 PCatinean joined #git
09:30 mycyber joined #git
09:34 maret joined #git
09:35 dodobrain joined #git
09:36 fuchstronaut joined #git
09:41 aax joined #git
09:41 mischat joined #git
09:42 Vinnie_win joined #git
09:43 qws-user-1228 joined #git
09:45 robotroll joined #git
09:46 ych joined #git
09:46 ych question about git, how does it know which files have been modified compared to last commit?
09:46 ych and also, how does it know which were deleted?
09:47 Error404NotFound joined #git
09:48 mniip joined #git
09:48 Bombe ych, git status knows all that.
09:48 ych yes, but how?
09:48 thesha joined #git
09:49 jstein Hi, I want to get my current HEAD to be the master and origin/master should I merge 6a5b1c7 and 792fbd3?
09:49 jstein * 6a5b1c7 (HEAD, 79cf8ab) next fix problems with linker and compile again.
09:49 jstein * 79cf8ab (boostless) just save. This version does not compile.
09:49 jstein * 792fbd3 (origin/master, origin/HEAD, withboost, master) add hints on g
09:49 Zarthus the deletion of files is pretty easy, it knows which files existed and the ones which no longer do
09:50 ych Zarthus yes, but how does it know that?
09:50 Zarthus you know what a commit is, right?
09:50 ych yes
09:50 Zarthus it's basically a diff that involves changes to files
09:51 Zarthus based on the latest commits (and preceeding ones in the chain), you can figure out which files exist, and which ones don't
09:51 dunaeth joined #git
09:51 Zarthus you can look into the source code if you're really interested, of course
09:51 dalias joined #git
09:53 Zarthus for modifying files I'd wager git also peeks at the file mod time, but I have no idea how it really works.
09:53 armyriad joined #git
09:53 Zarthus you can look at git ls-files to see a list of files git is aware of
09:54 Err404NF joined #git
09:57 kerrick joined #git
10:01 ochorocho__ joined #git
10:02 qws-user-1228 joined #git
10:03 Mobutils joined #git
10:04 Limes_ joined #git
10:05 mehola joined #git
10:06 mingrammer joined #git
10:09 Err404NF joined #git
10:11 Err404NF joined #git
10:12 satifant joined #git
10:14 ahmedelgabri joined #git
10:16 Err404NF joined #git
10:17 timvisher joined #git
10:19 glebihan joined #git
10:20 thebope joined #git
10:21 Error404NotFound joined #git
10:21 Error404NotFound joined #git
10:21 spriz joined #git
10:23 fstd joined #git
10:25 fstd joined #git
10:26 qws-user-1228 joined #git
10:26 mycyber joined #git
10:28 theskillwithin joined #git
10:29 Yuki_ joined #git
10:31 cbreak joined #git
10:35 manuels joined #git
10:35 m0viefreak joined #git
10:35 maret joined #git
10:36 ochorocho__ joined #git
10:37 Error404NotFound joined #git
10:37 Error404NotFound joined #git
10:42 mischat joined #git
10:45 ixian joined #git
10:45 jnavila joined #git
10:52 mycyber joined #git
10:52 demize Commits are actually full snapshots of the changed files.
10:52 dalias joined #git
10:53 dodobrain joined #git
10:53 demize But, when they're packed into packfiles, they're stored as diffs in ther.
10:53 demize Though not in a linear succession.
10:53 theskillwithin http://stackoverflow.com/questions/13907038/build-into-gh-pages-branch-from-master-branch  hrmmmmm
10:53 demize Anyway
10:54 demize theskillwithin: Could use git-subtree-split for that, hmm.
10:54 qws-user-1228 joined #git
10:55 theskillwithin demize https://github.com/theskillwithin/hrtcup/blob/master/package.json
10:55 monty joined #git
10:55 ixian joined #git
10:56 theskillwithin https://i.imgur.com/HVgz1XW.png   hmmm
11:00 Spec-Chum joined #git
11:00 prawnzy joined #git
11:01 Samual joined #git
11:05 pks joined #git
11:06 mingrammer joined #git
11:07 a3Dman joined #git
11:07 a3Dman joined #git
11:10 stamina joined #git
11:12 jnavila joined #git
11:14 Milijus joined #git
11:21 mycyber joined #git
11:22 a3Dman joined #git
11:24 titankiller joined #git
11:26 nuck joined #git
11:27 maret joined #git
11:28 ojdo joined #git
11:29 Khisanth joined #git
11:31 eivarv joined #git
11:32 phillly joined #git
11:34 anberg joined #git
11:35 NuckingFuts joined #git
11:35 Error404NotFound joined #git
11:36 dling joined #git
11:38 fuchstronaut joined #git
11:40 mycyber joined #git
11:42 mischat joined #git
11:44 zeroed joined #git
11:44 zeroed joined #git
11:44 QwertyDragon joined #git
11:45 thomas_25 joined #git
11:46 laumann joined #git
11:53 marlinc joined #git
11:57 Duikb00t-home joined #git
11:58 DonRichie joined #git
12:00 sdothum joined #git
12:00 mingrammer joined #git
12:00 ixian joined #git
12:04 qws-user-1228 joined #git
12:05 WizJin joined #git
12:05 Samual joined #git
12:06 Masber_080 joined #git
12:08 thomas_25 joined #git
12:09 Gloomy joined #git
12:12 a_thakur joined #git
12:16 rahtgaz joined #git
12:17 danslo_ joined #git
12:17 qws-user-1228 joined #git
12:17 msonntag joined #git
12:17 leeN joined #git
12:19 Samual joined #git
12:29 dunaeth joined #git
12:32 maret joined #git
12:33 ochorocho__ joined #git
12:35 fuchstronaut joined #git
12:35 fuchstronaut joined #git
12:35 Gamecubic joined #git
12:38 Error404NotFound joined #git
12:39 Error404NotFound joined #git
12:39 mycyber joined #git
12:39 Rodya_ joined #git
12:43 mischat joined #git
12:44 navidr joined #git
12:44 qws-user-1228 joined #git
12:45 terravires joined #git
12:46 qws-user-1228 joined #git
12:46 ochorocho__ joined #git
12:47 terravires hi all, I've some source I've kept in git, I've added a bunch of things I want to commit, but think a branch would be best.  If I try and create a branch, will that lose my local changes?
12:49 JSharpe joined #git
12:49 JSharpe joined #git
12:50 Balliad joined #git
12:50 jknetl joined #git
12:50 nedbat terravires: http://ohshitgit.com/ has an answer for this
12:50 Error404NotFound joined #git
12:51 Error404NotFound joined #git
12:52 terravires nedbat, sorry, I don't see that.  I was asking if creating a branch will erase my local changes.  I haven't actually done anything yet. :)
12:53 nedbat terravires: creating a branch will not erase your changes
12:53 terravires so I just create a branch, and commit to that branch, correct?
12:53 terravires I don't need to checkout after creating the branch?
12:54 ^7heo terravires: depends how you create it
12:55 ^7heo terravires: checkout -b will do both
12:55 mingrammer joined #git
12:55 terravires I guess I'm worried that checking out after creating branch will blow away my local changes
12:55 jesk i have a large directory of multiple directories with many files. But just few are added to git, non-deterministic.
12:55 jesk Now I did many changes to files I dont remember
12:55 thesha joined #git
12:56 leeN joined #git
12:56 jesk but I just want to commit those who are already added into git
12:56 jesk so like "update files into git which are already there"
12:56 t0n1c joined #git
12:57 jesk any idea how to do that?
12:58 qws-user-1228 joined #git
12:59 le_melomane joined #git
13:00 ochorocho__ joined #git
13:01 prawnzy joined #git
13:05 aax joined #git
13:06 Error404NotFound joined #git
13:06 Error404NotFound joined #git
13:09 rorro joined #git
13:09 crameth joined #git
13:09 cdown_ joined #git
13:11 Samual joined #git
13:12 a_thakur joined #git
13:12 qws-user-1228 joined #git
13:13 masuberu joined #git
13:14 constant joined #git
13:15 t0by joined #git
13:18 rbern joined #git
13:18 danslo_ joined #git
13:21 HoloPed left #git
13:21 codfection joined #git
13:25 dermoth_ joined #git
13:26 khmarbaise joined #git
13:26 constant joined #git
13:27 qws-user-1228 joined #git
13:29 ThomasLocke joined #git
13:29 Limes_ joined #git
13:29 fuchstronaut joined #git
13:31 constant joined #git
13:33 rgrinberg joined #git
13:36 CEnnis91 joined #git
13:38 Samual joined #git
13:38 thomas_25 joined #git
13:46 star_prone joined #git
13:48 Samual joined #git
13:49 mingrammer joined #git
13:50 roentgen joined #git
13:50 blackwind_123 joined #git
13:50 raijin joined #git
13:51 rossome joined #git
13:56 freimatz joined #git
13:58 barteks2x joined #git
14:01 mischat joined #git
14:03 hfp_work joined #git
14:03 ixian joined #git
14:03 hfp joined #git
14:05 _ikke_ either git add -u, git commit, or git commit -a
14:05 _ikke_ jesk: ^^
14:06 Jackneill joined #git
14:11 shafun joined #git
14:11 lolmac joined #git
14:17 Masber_080 joined #git
14:20 LebedevRI left #git
14:20 WayToDoor joined #git
14:22 masuberu joined #git
14:23 timvisher joined #git
14:23 xall joined #git
14:23 ixian joined #git
14:24 nettoweb joined #git
14:25 Samual joined #git
14:25 prawnzy joined #git
14:28 carandraug left #git
14:30 ixian joined #git
14:30 fuchstronaut joined #git
14:31 snowkidind joined #git
14:32 jstein__ joined #git
14:32 a3pq51 joined #git
14:43 mingrammer joined #git
14:47 sweatsuit joined #git
14:47 cbreak joined #git
14:48 jost joined #git
14:51 diogenese joined #git
14:52 e14 joined #git
14:53 pothepanda joined #git
14:53 jimi_ joined #git
14:53 cyan__ joined #git
14:53 isysd joined #git
14:59 shufan joined #git
14:59 SwiftMatt joined #git
15:01 qws-user-1228 joined #git
15:01 ruhz joined #git
15:01 shufan left #git
15:02 shafun joined #git
15:05 eshlox joined #git
15:05 sunri5e joined #git
15:08 qws-user-1228 joined #git
15:10 fuchstronaut joined #git
15:10 fuchstronaut joined #git
15:11 thgs_ joined #git
15:16 pothepanda joined #git
15:16 mand0 joined #git
15:17 ayjay_t joined #git
15:18 led_belly joined #git
15:18 cdown__ joined #git
15:21 jesk thx _ikke_
15:23 lexxis joined #git
15:25 phoenixh joined #git
15:26 chamunks joined #git
15:26 qws-user-1228 joined #git
15:27 Goplat joined #git
15:27 ixian joined #git
15:30 marlinc joined #git
15:35 Limes__ joined #git
15:35 Iee joined #git
15:37 mingrammer joined #git
15:38 dreiss joined #git
15:40 Gamecubic joined #git
15:40 eivarv joined #git
15:40 madewokherd joined #git
15:41 thesha joined #git
15:42 dave0x6d joined #git
15:48 jeffreylevesque joined #git
15:52 InfoTest joined #git
15:55 nckpz joined #git
15:56 zeroed joined #git
16:00 e^1 joined #git
16:01 e^1 there was nice link that was shared over here which explained git in figures, that guide was from an Indian Guy
16:01 e^1 it was using reveal.js for the presentation
16:01 CEnnis91 joined #git
16:01 robotroll joined #git
16:01 e^1 may be it was _ikke_  who shared it
16:04 Samual joined #git
16:09 _ikke_ Yup, hold on
16:09 eivarv joined #git
16:12 _ikke_ !gcs
16:12 gitinfo [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html
16:12 _ikke_ This was it
16:14 jberkus joined #git
16:15 nettoweb joined #git
16:17 fuchstronaut joined #git
16:18 nedbat e^1: hmm, depending on your audience, i think starting with "blob" and "tree" is the wrong approach
16:20 rnsanchez joined #git
16:21 thesha joined #git
16:22 Guest_ joined #git
16:25 Guest_ left #git
16:27 dviola joined #git
16:29 thiago joined #git
16:29 dviola joined #git
16:31 eivarv joined #git
16:31 a_thakur joined #git
16:33 tom[] joined #git
16:35 tom[] what plumbing command tests that branch x is merged into the checked-out branch ?
16:35 nettoweb joined #git
16:36 grawity git merge-base --is-ancestor x HEAD
16:36 Urbany joined #git
16:36 jaequery joined #git
16:38 pikajude joined #git
16:38 tom[] grawity: works for me. thanks!
16:39 pikajude joined #git
16:43 hfp_work joined #git
16:43 hfp joined #git
16:47 e^1 _ikke_: yes this is it..!!
16:48 e^1 nedbat:  means ?
16:49 jeffreylevesque_ joined #git
16:49 ruskie joined #git
16:49 nedbat e^1: his first slide talks about blobs and trees, which is unneeded for normal use. but it's ok, he ignores those things until much later, where he says it's unneeded for normal use :)
16:50 Limes_ joined #git
16:53 shgysk8zer0 joined #git
16:54 e^1 nedbat: oh ok :)
16:55 Surfer2010 joined #git
16:56 no_gravity joined #git
16:56 no_gravity Good Evening! I wonder if it's a good idea to softlink or hardlink config files for apache, mysql etc into the source dir of a project so that the config files are under version control.
16:56 fuchstronaut joined #git
16:56 shgysk8zer0 joined #git
16:57 shgysk8zer0 joined #git
16:57 grawity hardlinks are very easy to accidentally break, and symlinks will be tracked by git as links – not as content
16:58 no_gravity grawity: How would hardlinks break?
16:58 grawity many editors implementing 'atomic save' first write to a temporary file, then move it over the old one
16:58 grawity not to mention Git itself – there's no guarantee that checkouts will update files in-place
16:59 no_gravity grawity: Hmm... so these tools would "rm filename" and then create a new one with the same name?
16:59 grawity you could say that, yes
16:59 no_gravity Another option would be to have the original in the source dir and a softlink in /var/apache2/
17:00 grawity that would work
17:00 jaguarmagenta joined #git
17:00 no_gravity I wonder what gotchas this might have.
17:02 tom[] no_gravity: i keep such config files in the git repo together with the automation to copy them into place and make them take effect
17:03 no_gravity tom[]: What happens if you change the config file? Which process makes it go from development to production?
17:03 mSSM joined #git
17:03 tom[] i use ansible. but there are many options
17:04 eivarv joined #git
17:04 no_gravity tom[]: Ansible notices that you changed the apache config in the git repo and copies it to /var/apache2/ ?
17:04 synne joined #git
17:05 tom[] no_gravity: yes. if there is no difference, no copy happens. if the copy happens, the server reload happens at the end of the update
17:06 mSSM I made two changes to a file and saved it (it's not staged nor commited). In the second change I only removed a few lines. Is it possible to "cherry-pick" in git checkout HEAD ./myfile to only undo the second change?
17:06 rgrinberg joined #git
17:06 mSSM I basically want to undo the removal of those lines, but keep the other stuff
17:06 no_gravity tom[]: I see
17:06 tom[] no_gravity: i man, other stuff can happen after the apache config file copy, then eventually the daemon reload happens at the end of it all
17:07 tom[] i mean*
17:07 jberkus is there some way to advance one checkout at a time through an existing repo which isn't a 120-character bash line?
17:07 jberkus I thought "git checkout HEAD@{1}" worked, but apparently not
17:07 Bombe “Advancing one commit” (which I presume you mean) is hilariously undefined.
17:08 no_gravity tom[]: Yup, I got that.
17:08 Bombe Because each commit can have multiple children as well as multiple parents.
17:08 jberkus Bombe: there's no branches, just a single linear set of commits
17:08 bremner "git rebase -i --exec foo" might be relevant.
17:08 bremner jberkus: yes, but what you actually want to do with those commits is not clear
17:09 tom[] no_gravity: ot to close: #ansible is active and helpful in my experience
17:09 jberkus it's a demo, which goes from simple to complex
17:09 jberkus I want to check out each commit, and run a demo, and then go to the next one
17:09 Bombe jberkus, well, if by advancing you mean going back in time, that’s pretty simple then.
17:09 Bombe However, if you’re talking about a commit’s children, that’s not so easy.
17:09 no_gravity tom[]: So far I think the softlink solution will work nicely.
17:10 bremner jberkus: then the rebase -i trick I mentioned may work
17:10 Bombe Unless you choose to go from <branch>~20 to <branch>~1 to <branch>.
17:10 jberkus bremner: rebase seems like a bad idea.  how does that work?
17:10 jberkus Bombe: so, I'm on the first checkin for the repo
17:11 tyreld_ joined #git
17:11 jberkus I want to go to the first commit after the initial commit
17:11 Bombe jberkus, what “first?” The root commit?
17:11 jberkus then I want to go to the second one
17:11 jberkus right
17:11 jberkus there are no branches, no rebasing, no complicated anything
17:11 Bombe jberkus, as previously mentioned, that’s not easy because there is no reference from root to root+1, only the other way around.
17:13 jberkus Bombe: I've done this before though, I just can't remember the command line for it
17:13 grawity even if the *history* is linear, git still simply has no revision syntax for "going forward"
17:13 grawity you can dig through all of `man gitrevisions`
17:13 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
17:13 Bombe jberkus, I don’t think you understand the underlying problem.
17:14 Bombe jberkus, it is _impossible_ to go the “next” commit because for a “next commit" to exist you _need_ something like a pointer to the latest commit, i.e. a branch.
17:14 Bombe jberkus, I’ll simply assume you have a branch (probably called “master”) that your commits live on, and let’s just assume there are 20 commits.
17:14 jberkus ok
17:14 Bombe The root commit could then be reached by “master~19.”
17:14 Bombe The next commit would be master~18.
17:15 Bombe That’s pretty much the only way to do it because there is no “next commit” otherwise.
17:15 jberkus what's the syntax for that?  "git checkout master~10" doesn't actually work
17:15 Bombe If you have 11 commits it actually does work.
17:16 Bombe Or did I mix up ~ and ^ again?
17:16 grawity yes, ~10 is "10 commits back"
17:16 grawity ^10 would be "10th parent in octopus merge"
17:16 Bombe Okay, then I got it right, thanks. :)
17:16 jberkus Bombe: no that's right, I'd just miscounted my commits
17:17 Bombe Yes, counting is hard. :)
17:17 CheckDavid joined #git
17:17 jberkus yeah, that's why I didn't want to do it relative to present
17:18 jberkus but sounds like I need a script if I want to not
17:18 Bombe “master” is not the same as “present” (which is “HEAD”).
17:18 cyphase joined #git
17:18 Bombe Unless you commit stuff on top of master, master will not change if you checkout one of its ancestors.
17:18 grawity tbh, if `git log` has --children, there /could/ be a syntax for it in gitrevisions, but :(
17:19 cyphase joined #git
17:19 l4v2 joined #git
17:19 cdg joined #git
17:19 no_gravity left #git
17:20 githogori joined #git
17:20 hahuang62 joined #git
17:22 star_prone joined #git
17:22 _ikke_ The problem is that there is no defined way to express which child you want
17:23 _ikke_ All children at least has a definition
17:23 fuzzmz joined #git
17:23 _ikke_ nth parent also, because the
17:23 Urbany joined #git
17:23 _ikke_ they are ordered in the commit
17:23 Bombe Sure.
17:24 Bombe I’m not sure you could really get all children without an exhaustive search of the complete 2^160-sized commit space. :)
17:24 _ikke_ You can within single repository of course
17:25 _ikke_ You can just traverse each object and collect which commits have the desired commit as a parent
17:25 Bombe True. O(n) for the win! :)
17:25 morenoh149 joined #git
17:26 _ikke_ O(n*m) more precicely
17:26 _ikke_ but m usually does not play a big role
17:26 _ikke_ (# of parents)
17:26 mingrammer joined #git
17:26 Bombe Ah, yes.
17:26 Bombe True, probably negligible.
17:30 rorro joined #git
17:31 Rodya_ joined #git
17:33 cspack joined #git
17:34 jberkus Bombe, bremner: git geek here came up with a better solution: tagging each commit
17:34 fuchstronaut joined #git
17:34 _ikke_ makes much more sense
17:34 _ikke_ That's what you get with XY questions :P
17:34 Bombe :)
17:35 jberkus yeah, it's also why stackoverflow isn't everything
17:35 * bremner shrugs.
17:35 bremner I use rebase -i for testing all the time
17:35 jberkus bremner: doesn't that require a new branch, though?
17:35 bremner no
17:35 Bombe Hmm. Interesting. I never thought of rebase for a scenario like this.
17:36 bremner git rebase -i --exec the-demo.sh $distant_ancenstor
17:36 jimmyeatworld joined #git
17:37 bremner I guess I do that mainly with unshared history, but I don't think it actually changes the sha1's. Could be wrong though.
17:37 dharriga1 joined #git
17:38 _ikke_ it shouldn't
17:38 bremner I test before I push ;)
17:38 _ikke_ You'll notice soon enough when you push
17:39 aard_ joined #git
17:43 nettoweb joined #git
17:43 mizu_no_oto joined #git
17:45 l4v2 left #git
17:46 jberkus bremner: but does that put in into that point in the history for purposes other than exec?
17:47 bernardio joined #git
17:51 bremner I can't parse your question.
17:52 Alex64 joined #git
17:53 mSSM left #git
17:54 wogi joined #git
17:55 fmcgeough joined #git
17:59 jaafar joined #git
18:00 f3r70rr35f joined #git
18:00 joki joined #git
18:00 tribly joined #git
18:02 multi_io joined #git
18:04 flavius joined #git
18:07 up_the_irons joined #git
18:08 gmh joined #git
18:15 thomas_25 joined #git
18:16 Kitty- joined #git
18:17 dviola joined #git
18:19 OnOut2k16 joined #git
18:19 NeverDie_ joined #git
18:20 armyriad joined #git
18:21 mingrammer joined #git
18:21 thesha joined #git
18:22 heroux joined #git
18:23 danslo_ joined #git
18:23 nettoweb1 joined #git
18:24 jeffreylevesque joined #git
18:25 eivarv joined #git
18:26 ahmedelgabri joined #git
18:27 Gloomy joined #git
18:28 ahmedelgabri joined #git
18:28 glebihan joined #git
18:30 jozwior joined #git
18:32 pi_erre joined #git
18:32 justanotheruser joined #git
18:35 fuchstronaut joined #git
18:36 cdown joined #git
18:36 f3r70rr35f joined #git
18:42 jozwior_ joined #git
18:43 star_prone joined #git
18:43 manuels joined #git
18:45 nettoweb joined #git
18:46 SpeakerToMeat joined #git
18:46 jozwior joined #git
18:47 jozwior joined #git
18:48 LeBlaaanc joined #git
18:49 shgysk8zer0 joined #git
18:51 mangolisk joined #git
18:51 WizJin joined #git
18:52 dsantiago joined #git
18:52 jaguarmagenta joined #git
18:52 f3r70rr35f joined #git
18:53 beecushman joined #git
18:56 vuoto joined #git
19:00 bastelfreak1 joined #git
19:05 fuchstronaut joined #git
19:05 jon-mac joined #git
19:05 mehola joined #git
19:05 flavius I have a initialized a directory as a repository, and a subdirectory inside it also as a different repository. None of them have any remote. How do I add the subdirectory as a submodule of the "superproject"?
19:06 hahuang62 joined #git
19:14 Derridada joined #git
19:16 howitdo joined #git
19:18 BlaXpirit flavius, first of all i'd advise checking if you really want submodules. i assume you haven't yet discovered the disadvantages of using subprojects
19:18 BlaXpirit submodules*
19:18 flavius I have discovered them, my requirement is to not use third party tools
19:18 flavius Other than that, I'm open to suggestions
19:19 BlaXpirit flavius, and as far as I know  a submodule links to a particular commit of a remote repository so what you want to do is doubly unusual. in particular linking to a changing repository when only commits can be linked
19:19 flavius I know how they work
19:19 prawnzy joined #git
19:20 flavius please, just my question. I understand that you want to do good and I appreciate it
19:20 BlaXpirit if i knew i would've answered :(   my hunch would be to check how to represent local files as a URL for git
19:21 flavius That would be the file:// protocol, git can do that with local bare repositories
19:21 BlaXpirit so maybe try the usual way  with    file:///path/to/repo
19:21 flavius thanks, I'll try
19:23 BlaXpirit > 'b' already exists in the index
19:23 danslo_ joined #git
19:25 hahuang62 joined #git
19:26 flavius git submodule add file:/home/flavius/.vim/ .vim/
19:27 flavius I don't like the absolute local path but yeah, it's good enough for now
19:28 star_prone joined #git
19:30 herr_barium joined #git
19:30 pi_erre left #git
19:34 f3r70rr35f joined #git
19:39 archaic joined #git
19:41 jnewt joined #git
19:42 rgrinberg joined #git
19:43 mizu_no_oto joined #git
19:45 mischat joined #git
19:45 fuzzmz joined #git
19:45 tomz joined #git
19:45 mischat joined #git
19:46 mischat joined #git
19:47 mischat joined #git
19:48 grawity submodules can be added without an URL, using just `git add .vim` (no trailing slash)
19:48 mischat joined #git
19:48 Mobutils joined #git
19:49 apotry joined #git
19:50 nilg joined #git
19:51 Atm0spher1c joined #git
19:52 DJ_Spies joined #git
19:54 thomas_25 joined #git
19:56 glebihan joined #git
19:57 Anja joined #git
19:57 flavius grawity: then it lists the files inside the submodule as staged in the superproject
19:58 grawity it doesn't
19:58 Darcidride joined #git
19:58 grawity it would if you did `git add .vim/`
19:58 grawity but not with `git add .vim`
19:59 flavius it did in my situation, just after git init
19:59 wogi joined #git
19:59 flavius it does behave as you say after the first commit is done in the subdirectory, fortunately
19:59 ash_workz joined #git
20:00 flavius I think this is a bug, it should report an error
20:00 kulelu88 joined #git
20:00 flavius adding a subdir which is a repo without a HEAD yet (the state after git init)
20:01 stupidystupid joined #git
20:02 f3r70rr35f joined #git
20:04 Kitty- joined #git
20:04 cyphase joined #git
20:06 drizztbsd joined #git
20:06 fuchstronaut joined #git
20:06 mehola joined #git
20:06 aidalgol joined #git
20:07 cagedwisdom joined #git
20:09 SwiftMatt joined #git
20:09 mingrammer joined #git
20:11 mizu_no_oto joined #git
20:13 beecushman joined #git
20:15 inflames joined #git
20:16 snthsnth joined #git
20:22 theskillwithin I'm trying to automate a way in my package.json npm scripts to make a gh-pages branch based off a subfolder in side the repo.
20:22 Duikb00t-home joined #git
20:22 e14 joined #git
20:23 prawnzy joined #git
20:23 grawity do you need the history or only the latest commit in there?
20:25 p4trix joined #git
20:26 shgysk8zer0 joined #git
20:27 mehola joined #git
20:27 bmahe joined #git
20:29 mattcen joined #git
20:30 theskillwithin grawity not really, almost like a deploy
20:30 bmahe joined #git
20:30 theskillwithin the tricky part is making the /dist folder which is in .gitignore all the sudden the root of the gh-pahes branch
20:31 Vaelatern joined #git
20:31 grawity that's the simplest part
20:31 theskillwithin maybe I can just chain a bunch of git commands together somehow and just write it
20:31 dinoocch joined #git
20:31 grawity git branch -f gh-pages $(git commit-tree -m "auto" master:dist) && git push --force origin gh-pages
20:31 flavius theskillwithin: just a thought, I would use a new orphan branch for gh-pages and move the content of the subdir into the root
20:32 grawity in fact
20:32 grawity git push --force origin $(git commit-tree -m "auto" master:dist):gh-pages
20:33 ResidentBiscuit joined #git
20:33 theskillwithin grawity that last command will work?
20:33 grawity both of them should
20:34 theskillwithin maybe I can also make it an alais
20:34 bmahe joined #git
20:34 theskillwithin but if I run that command won't I be left sitting on the gh-pages branch?
20:34 grawity though, maybe $(git commit-tree -p master -m "auto" master:dist) would be better, so that you'd later know what commit it was based on
20:34 grawity no, why would you"
20:34 grawity it doesn't do anything like that...
20:36 freimatz joined #git
20:37 theskillwithin grawity https://i.imgur.com/PysVOsH.png   hmmm
20:37 glebihan joined #git
20:37 grawity theskillwithin: does master actually have a directory named 'dist'?
20:38 theskillwithin grawity it's in .gitignore
20:38 grawity why did you say it's in the repo then...
20:38 theskillwithin <theskillwithin>the tricky part is making the /dist folder which is in .gitignore all the sudden the root of the gh-pahes branch
20:38 nettoweb joined #git
20:39 theskillwithin getting close tho
20:39 grawity honestly, just track it like a normal branch
20:39 grawity git branch --orphan gh-pages; git worktree add ../mything_dist gh-pages; move stuff there and commit
20:40 grawity you get Git history tracking as a free bonus
20:40 theskillwithin the dist folder is built from the frontend devops from the src folder, so don't want it to exist in master branch
20:40 theskillwithin https://github.com/theskillwithin/hrtcup
20:41 jnavila joined #git
20:41 beecushman joined #git
20:43 WayToDoor joined #git
20:44 f3r70rr35f joined #git
20:47 Mobutils joined #git
20:49 mischat joined #git
20:50 khmarbaise_ joined #git
20:50 cyphase joined #git
20:50 jaguarmagenta joined #git
20:51 noyb joined #git
20:51 cdg joined #git
20:54 Derperperd joined #git
20:58 texasmynsted joined #git
21:00 xall joined #git
21:02 kerrick joined #git
21:04 mingrammer joined #git
21:06 chris2 joined #git
21:06 fuchstronaut joined #git
21:08 ariporad_ joined #git
21:08 ToBeCloud joined #git
21:16 boombatower joined #git
21:17 Duikb00t-home joined #git
21:17 star_prone joined #git
21:18 cyphase joined #git
21:18 mizu_no_oto joined #git
21:19 al-damiri joined #git
21:20 joki joined #git
21:21 yazdmich joined #git
21:22 rbr joined #git
21:23 JSharpe joined #git
21:26 khmarbaise left #git
21:27 e14 joined #git
21:28 prodhe joined #git
21:28 nikivi joined #git
21:28 prodhe left #git
21:30 nikivi joined #git
21:32 m_antis joined #git
21:33 canuk joined #git
21:34 cyphase joined #git
21:46 Kitty- joined #git
21:46 jeffreylevesque joined #git
21:47 cyphase joined #git
21:50 mischat joined #git
21:58 mingrammer joined #git
21:59 prawnzy joined #git
22:00 cyphase joined #git
22:00 Mobutils joined #git
22:04 plasticle joined #git
22:05 theskillwithin I'm trying to automate a way in my package.json npm scripts to make a gh-pages branch based off a subfolder in side the repo.  the tricky part is making the /dist folder which is in .gitignore all the sudden the root of the gh-pahes branch.
22:09 nikivi joined #git
22:11 Duikb00t-home joined #git
22:13 cyphase joined #git
22:13 hfp_work joined #git
22:14 hfp joined #git
22:14 fatalhalt joined #git
22:15 hexagoxel joined #git
22:16 cdg_ joined #git
22:17 kyan joined #git
22:17 Dougie187 joined #git
22:22 cagedwisdom joined #git
22:23 monoprotic joined #git
22:23 monoprotic joined #git
22:23 diprotic joined #git
22:26 cyphase joined #git
22:27 marlinc joined #git
22:33 ResidentBiscuit joined #git
22:36 jimi_ joined #git
22:39 cyphase joined #git
22:40 firebalrog joined #git
22:40 multiproc joined #git
22:40 gfixler joined #git
22:41 cyphase joined #git
22:48 ibbxa joined #git
22:50 stupidystupid joined #git
22:51 mischat joined #git
22:52 navidr joined #git
22:52 mingrammer joined #git
22:55 nd joined #git
22:56 cyphase joined #git
22:56 arand joined #git
23:01 Arinerron joined #git
23:01 Arinerron hi
23:01 gitinfo Arinerron: 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:01 jimi_ joined #git
23:02 fiddlerwoaroof joined #git
23:05 cdown_ joined #git
23:05 Duikb00t-home joined #git
23:05 mozzarel1 joined #git
23:05 mar77i_ joined #git
23:05 perlpilot_ joined #git
23:06 rafalcpp joined #git
23:06 leprechau joined #git
23:07 the_cybersphinx joined #git
23:07 leprechau joined #git
23:07 Limes joined #git
23:07 Mixologic joined #git
23:07 JanC joined #git
23:08 fuchstronaut joined #git
23:08 Eryn_1983_FL joined #git
23:09 peaches joined #git
23:09 peaches joined #git
23:12 prawnzy joined #git
23:13 cyphase joined #git
23:15 MissionCritical joined #git
23:16 monoprotic joined #git
23:16 monoprotic joined #git
23:21 mablae joined #git
23:21 xameada joined #git
23:23 e14 joined #git
23:25 theskillwithin this is cool https://github.com/robbyrussell/oh-my-zsh/wiki/Cheatsheet
23:25 AndreSomers joined #git
23:27 cyphase joined #git
23:30 jatt joined #git
23:36 theskillwithin git push --force origin $(git commit-tree -m "auto" master:dist):gh-pages        this doesn't work cuz my dist folder is in .gitignore i guess
23:37 theskillwithin https://git-scm.com/docs/git-write-tree  will this help?
23:42 tmg joined #git
23:42 cyphase joined #git
23:44 bronson joined #git
23:44 e14 joined #git
23:45 doublel93 joined #git
23:46 doublel93 hey there, probably a dumb question, but do you use your full name or username on the git config user.name ?
23:46 mingrammer joined #git
23:47 dreiss joined #git
23:50 bronson_ joined #git
23:50 i7c I do.
23:52 theskillwithin trying to figure out how to do it  https://i.imgur.com/QJm0J8p.png
23:52 mischat joined #git
23:55 bronson joined #git
23:56 SporkWitch theskillwithin: depends on situation.  I use different names and emails depending on the project.  You can have per-repo settings for username, email, or any other; local takes precedence over global
23:57 SporkWitch doublel93, rather ^
23:58 doublel93 I see, I was curious if it was common to use the username or the name, but it seems doesn't make much difference, right ?
23:58 bronson_ joined #git
23:58 SporkWitch doublel93: reall depends on the project.  If it's for work or school you'd obviously want your real name and work / uni email respectively.  Personal proejct, it's whatever you prefer
23:59 doublel93 makes sense, thanks for explaining
23:59 Duikb00t-home joined #git
23:59 theskillwithin SporkWitch ?  how does that help with gh-pages deploy?
23:59 SporkWitch it _is_ about attriubtion though; the user.name field has _nothing_ to do with accounts, and everything to do with logging
23:59 SporkWitch theskillwithin: highlighted the wrong person, sorry
23:59 theskillwithin tree="$(export GIT_INDEX_FILE="$(mktemp)"; cat .git/index >"$GIT_INDEX_FILE"; git add -f dist && git write-tree --prefix=dist)"
23:59 theskillwithin git update-ref refs/heads/gh-pages "$(git commit-tree -p gh-pages -m auto "$tree")"

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