Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-18

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

All times shown according to UTC.

Time Nick Message
00:00 joshszep joined #git
00:02 ochorocho__ joined #git
00:03 invisbl joined #git
00:04 dendazen joined #git
00:08 invisbl_ joined #git
00:11 dsdeiz joined #git
00:11 dsdeiz joined #git
00:11 tmsmith_ joined #git
00:11 invisbl joined #git
00:11 howitdo joined #git
00:13 tmsmith joined #git
00:16 Atm0spher1c joined #git
00:21 invisbl joined #git
00:22 krillr joined #git
00:22 Sample joined #git
00:23 mischat joined #git
00:25 bronson joined #git
00:26 bdonnahue joined #git
00:28 Peetz0r joined #git
00:29 dodobrain joined #git
00:30 romerocesar_ joined #git
00:30 fahadash joined #git
00:30 giraffe joined #git
00:32 kaldoran joined #git
00:32 pwnz0r joined #git
00:34 hahuang61 joined #git
00:35 marlinc joined #git
00:39 WhiskerBiscuit joined #git
00:40 cdg joined #git
00:40 cqi joined #git
00:41 cqi joined #git
00:41 cqi joined #git
00:43 cqi joined #git
00:49 [0xAA] joined #git
01:01 bukolay joined #git
01:02 inflames joined #git
01:02 syg_ joined #git
01:02 buffal0 joined #git
01:03 sammyo joined #git
01:03 brent__ joined #git
01:03 mentazoom joined #git
01:03 sammyo joined #git
01:06 marlinc joined #git
01:06 qpdb joined #git
01:08 WhiskerBiscuit joined #git
01:08 joshszep joined #git
01:09 webdev007 joined #git
01:14 AustinMatherne joined #git
01:17 anonymuse joined #git
01:18 geko joined #git
01:18 flavius joined #git
01:19 WhiskerBiscuit joined #git
01:21 flavius joined #git
01:22 Awesomecase joined #git
01:23 SwiftMatt joined #git
01:24 mischat joined #git
01:25 joshszep joined #git
01:26 cdg_ joined #git
01:28 mizu_no_oto joined #git
01:29 Pulp joined #git
01:30 Gsham joined #git
01:31 svm_invictvs joined #git
01:33 WaReZ joined #git
01:33 invisbl joined #git
01:34 WhiskerBiscuit joined #git
01:36 buffal0 joined #git
01:36 Siegfried joined #git
01:38 Sample joined #git
01:40 Lyqyd joined #git
01:46 venmx joined #git
01:47 arescorpio joined #git
01:48 invisbl joined #git
01:48 unbalanced joined #git
01:57 jaguarmagenta joined #git
02:03 ochorocho__ joined #git
02:08 sdothum joined #git
02:10 AustinMatherne joined #git
02:11 d^sh joined #git
02:21 rchavik joined #git
02:22 buffal0 joined #git
02:22 SwiftMatt joined #git
02:25 cdg joined #git
02:25 mischat joined #git
02:25 bronson joined #git
02:26 cdg joined #git
02:27 cdg joined #git
02:27 finalbeta joined #git
02:34 diogenese joined #git
02:35 hahuang61 joined #git
02:46 pks joined #git
02:46 Salander27_ joined #git
02:46 salamanderrake joined #git
02:46 GodGinrai joined #git
02:46 Darren_ joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and serious business | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:49 invisbl joined #git
02:51 Vampire0_ joined #git
02:51 romerocesar joined #git
02:54 invisbl_ joined #git
02:54 ReptilianBrain joined #git
02:55 ToBeCloud joined #git
02:57 invisbl joined #git
02:58 psyb0t joined #git
02:59 joshszep joined #git
02:59 bruce_lee joined #git
02:59 bruce_lee joined #git
03:01 mizu_no_oto joined #git
03:02 yohnnyjoe joined #git
03:05 chigang joined #git
03:06 ResidentBiscuit joined #git
03:06 shgysk8zer0 joined #git
03:07 ResidentBiscuit joined #git
03:08 anonymuse joined #git
03:08 PtxDK joined #git
03:10 anonymuse joined #git
03:11 mizu_no_oto joined #git
03:16 spriz joined #git
03:17 chachasmooth joined #git
03:17 mizu_no_oto joined #git
03:17 aw1 joined #git
03:20 Salander27_ joined #git
03:26 mischat joined #git
03:27 NimeshNeema joined #git
03:29 nukeu666 joined #git
03:32 romerocesar joined #git
03:33 joshszep joined #git
03:33 mizu_no_oto joined #git
03:36 bdonnahue joined #git
03:36 psyb0t joined #git
03:38 psyb0t joined #git
03:39 psyb0t joined #git
03:39 mizu_no_oto joined #git
03:40 psyb0t joined #git
03:40 MrWoohoo joined #git
03:41 pwnz0r_ joined #git
03:47 venmx joined #git
03:51 DolpheenDream joined #git
03:52 hexagoxel joined #git
03:54 inflames joined #git
03:56 breezy_ joined #git
03:57 jaguarmagenta joined #git
04:02 robattila256 joined #git
04:02 Siegfried joined #git
04:03 sunri5e joined #git
04:04 ochorocho__ joined #git
04:05 hahuang61 joined #git
04:06 fstd_ joined #git
04:06 Rodya_ joined #git
04:06 romerocesar joined #git
04:07 shgysk8zer0 joined #git
04:09 menip joined #git
04:11 dsdeiz joined #git
04:16 invisbl joined #git
04:17 arescorpio joined #git
04:25 LiMp^ joined #git
04:26 hiroki joined #git
04:26 hiroki joined #git
04:26 bronson joined #git
04:27 mischat joined #git
04:29 snowkidind joined #git
04:29 quite joined #git
04:32 diogenese joined #git
04:32 HanClinto joined #git
04:37 foist joined #git
04:43 romerocesar joined #git
04:44 aidalgol Conceptually, I want to keep a few repositories in another repository, which also includes some of its own files that apply to the sub-repos.  How do I do this?
04:48 ghostlight joined #git
04:51 cdg joined #git
04:54 markovh joined #git
04:57 pwnz0r joined #git
04:57 safe joined #git
05:00 howdoi joined #git
05:02 nukeu666 left #git
05:07 ResidentBiscuit joined #git
05:09 pks joined #git
05:10 Gsham joined #git
05:11 cqi joined #git
05:19 Rodya_ joined #git
05:21 pks joined #git
05:22 gtristan joined #git
05:25 breezy_ joined #git
05:26 Vgr joined #git
05:26 Vgr joined #git
05:26 Vgr joined #git
05:27 romerocesar_ joined #git
05:28 dreiss joined #git
05:29 mischat joined #git
05:29 johnny56 joined #git
05:29 hfp_work joined #git
05:30 daynaskully joined #git
05:30 hfp joined #git
05:31 foist joined #git
05:37 howitdo joined #git
05:38 romerocesar joined #git
05:40 jaguarmagenta joined #git
05:41 menip joined #git
05:44 Cabanossi joined #git
05:46 Random832 joined #git
05:47 languitar joined #git
05:47 venmx joined #git
05:48 marlinc joined #git
05:48 Nikitaw99 joined #git
05:48 bdonnahue joined #git
05:56 tmsmith joined #git
05:56 function joined #git
05:58 d0nn1e joined #git
06:03 bdonnahue joined #git
06:04 ochorocho__ joined #git
06:06 hahuang61 joined #git
06:09 Lyqyd joined #git
06:14 AlineGomes joined #git
06:15 diogenese joined #git
06:16 raijin joined #git
06:17 yaewa joined #git
06:18 pks joined #git
06:20 AlineGomes joined #git
06:22 mns joined #git
06:27 pks joined #git
06:27 bronson joined #git
06:29 invisbl joined #git
06:30 mischat joined #git
06:30 raijin joined #git
06:33 jon-mac joined #git
06:33 SaberArthur joined #git
06:40 blacksyke joined #git
06:43 netj joined #git
06:46 pks joined #git
06:46 wxg joined #git
07:01 freimatz joined #git
07:02 xall joined #git
07:03 lightstalker joined #git
07:05 Anja joined #git
07:08 parity joined #git
07:08 OOPMan joined #git
07:18 SaberArthur_ joined #git
07:19 breezy_ joined #git
07:20 dreiss joined #git
07:29 llamapixel aidalgol: pull them all into a temp folder and hard / manually copy what you want to a new repo that you made. save or commit this and nope can’t go back with this concept
07:29 Anja joined #git
07:31 mischat joined #git
07:35 pks joined #git
07:39 oskarkv joined #git
07:44 tmg joined #git
07:44 Sample joined #git
07:45 WhiskerBiscuit joined #git
07:48 PioneerAxon joined #git
07:48 venmx joined #git
07:48 slappymcfry joined #git
07:50 ResidentBiscuit joined #git
07:50 mns joined #git
07:53 invisbl joined #git
07:58 hanshenrik joined #git
07:59 hanshenrik is there a local version of .gitignore ?
08:00 hanshenrik that does not get pushed/cloned/etc,
08:00 hanshenrik >Patterns which are specific to a particular repository but which do not need to be shared with other related repositories (e.g., auxiliary files that live inside the repository but are specific to one user's workflow) should go into the $GIT_DIR/info/exclude file
08:00 hanshenrik nvm, i guess that's my answer ^^
08:01 kent\n sometimes one has to ask the question before they understand how to find the answer :)
08:05 pypi_ joined #git
08:06 ochorocho__ joined #git
08:07 Anja joined #git
08:07 hahuang61 joined #git
08:09 venmx joined #git
08:11 glebihan joined #git
08:12 DANtheBEASTman left #git
08:13 slappymcfry joined #git
08:14 mns joined #git
08:17 howitdo joined #git
08:17 Jackneill joined #git
08:18 Ardethian\work joined #git
08:18 Ardethian\work joined #git
08:20 _jan joined #git
08:24 Glooomy joined #git
08:26 nickthetait joined #git
08:28 bronson joined #git
08:30 mda1 joined #git
08:30 Macaveli joined #git
08:31 mischat joined #git
08:32 pypi__ joined #git
08:41 j416 hanshenrik: also, man gitignore see the synopsis part
08:41 gitinfo hanshenrik: the gitignore manpage is available at http://jk.gs/gitignore.html
08:42 shwifty_ joined #git
08:43 shwifty_ If I have a series of commits with different author-date and commit-date which I have not pushed, what is the right way to set the commit-date the same as author-date. The author-date is the one I want to keep.
08:48 j416 shwifty_: you can use filter-branch. But why do you want to change it?
08:56 shwifty_ j416: Since the commit-dates are all messed up because of rebasing
08:56 j416 shwifty_: that's the whole point
08:56 cyan__ joined #git
08:57 shwifty_ j416: You mean the commit date should reflect the date of rebasing?
08:57 j416 shwifty_: it reflects when the actual commit was created, hence the name
08:57 shwifty_ What about unpushed commits that I want to even out in a period by setting their commit/author dates?
08:57 j416 shwifty_: but I understand your wanting to change it; I was like that before. Look att --env-filter of man git-filter-branch
08:57 gitinfo shwifty_: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
08:58 shwifty_ j416: Ha ha what do you mean you were like that before?
08:58 shwifty_ What made you not do it?
08:58 j416 shwifty_: I used to be really picky and annoyed by them not being the same, since I was both author and committer
08:59 j416 shwifty_: I realised that it's a waste of time and that the commit date actually tells me more about the commit than having just one date (which is what forcing them to be the same becomes)
08:59 shwifty_ Ah. I see. Sometimes I want to maintain a streak so I do it.
09:00 j416 shwifty_: there's also "git commit --amend --reset-author", it'll reset all author (and committer) info
09:00 shwifty_ Reset it to?
09:00 j416 to whatever your current settings are
09:00 shwifty_ Also isn't that only for the last commit?
09:00 j416 and current date/time
09:00 j416 the last one yes
09:00 _ng joined #git
09:00 hussam joined #git
09:00 j416 but you could use it in rebase
09:00 shwifty_ Ah. Unfortunately, I need it for a couple of commits.
09:01 j416 but then filter-branch is probably nicer
09:01 _main_ joined #git
09:01 j416 oh, and there's another way that may suit you better
09:01 j416 you can use git-replace
09:01 j416 !backup
09:01 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.c​om/GitBestPractices/#backups
09:01 shwifty_ Something like GIT_COMMITTER_DATE="date" git commit --amend --no-edit --date="date" during interactive rebase seems to work. Any pitfalls in this?
09:01 j416 and then try git replace --edit <somecommit>
09:01 j416 it'll let you edit the raw commit
09:02 j416 change whatever
09:02 realtime joined #git
09:02 _main_ joined #git
09:02 j416 then just run plain "git filter-branch" without arguments to make the changes permanent
09:02 j416 shwifty_: no, that's fine too
09:03 shwifty_ Nice.
09:03 shwifty_ Thanks :)
09:04 __main__ joined #git
09:08 venmx joined #git
09:09 slappymcfry joined #git
09:09 Siegfried joined #git
09:12 vuoto joined #git
09:15 ochorocho__ joined #git
09:16 invisbl joined #git
09:16 navidr_ joined #git
09:18 navidr_ left #git
09:18 SteffanW joined #git
09:20 robotroll joined #git
09:21 thesha joined #git
09:21 navidr joined #git
09:22 sssilver joined #git
09:31 sea-gull joined #git
09:32 vdv joined #git
09:32 theoceaniscool joined #git
09:33 mischat joined #git
09:40 jnavila joined #git
09:43 thesha joined #git
09:47 shwifty_ joined #git
09:52 theoceaniscool joined #git
09:53 venmx joined #git
09:56 Domhack joined #git
09:58 Gloomy joined #git
10:02 Sample joined #git
10:02 iLembus joined #git
10:02 Siegfried joined #git
10:04 rafalcpp joined #git
10:06 Pulp joined #git
10:06 pothepanda joined #git
10:08 hahuang61 joined #git
10:08 cdown joined #git
10:09 venmx joined #git
10:11 howitdo joined #git
10:11 QuestionTime joined #git
10:11 thesha joined #git
10:13 parity left #git
10:13 ikrabbe joined #git
10:14 paraparaparity joined #git
10:15 ochorocho__ joined #git
10:16 m0viefreak joined #git
10:17 catsup joined #git
10:18 paraparity joined #git
10:18 catsup joined #git
10:21 theoceaniscool joined #git
10:23 ochorocho__ joined #git
10:25 overlord_tm joined #git
10:26 misgit joined #git
10:26 paraparity joined #git
10:29 bronson joined #git
10:33 mischat joined #git
10:35 Juzzika joined #git
10:36 mentazoom joined #git
10:37 yohnnyjoe joined #git
10:41 misgit joined #git
10:41 cdown_ joined #git
10:42 rafalcpp joined #git
10:42 mns joined #git
10:43 jimi_ joined #git
10:44 jnavila joined #git
10:45 cdown joined #git
10:47 thesha left #git
10:49 xall joined #git
10:52 freimatz joined #git
10:53 mentazoom joined #git
10:53 Nilesh_ joined #git
10:58 Juzzika joined #git
11:05 rafalcpp joined #git
11:07 vrlx joined #git
11:08 cdown_ joined #git
11:13 [0xAA] joined #git
11:15 t0by joined #git
11:15 iLembus_ joined #git
11:17 aw1 joined #git
11:17 hhee joined #git
11:19 King_Hual joined #git
11:21 realtime joined #git
11:22 cdown_ joined #git
11:24 cdown joined #git
11:24 byte512 joined #git
11:28 shwifty_ I've already pushed my commits to feature branch without rebasing on top of master. Is there a way to do it after having pushed to maintain linear history?
11:31 rafalcpp joined #git
11:34 mischat joined #git
11:35 nettoweb joined #git
11:36 spacelord_ joined #git
11:36 invisbl joined #git
11:36 Macaveli joined #git
11:37 cdown joined #git
11:40 ochorocho__ joined #git
11:40 arand shwifty_: Linear in relation to what?
11:40 shwifty_ To master. I rebased and force pushed.
11:40 tmg joined #git
11:40 thief joined #git
11:41 mda1 joined #git
11:42 arand If you can reasonably guarantee that no one is now relying on the old remote feature branch, deleting it and replacing it (force-push) with the new rebased version is often reasonable, yes.
11:44 invisbl_ joined #git
11:47 rafalcpp joined #git
11:50 romerocesar joined #git
11:52 thief joined #git
11:53 cqi joined #git
11:56 mda joined #git
11:56 pothepanda joined #git
11:57 ochorocho__ joined #git
11:58 buffal0 joined #git
12:03 PioneerAxon joined #git
12:04 Starky joined #git
12:05 yohnnyjoe joined #git
12:06 gtristan joined #git
12:07 askb joined #git
12:08 hahuang61 joined #git
12:09 bdonnahue joined #git
12:16 cdown joined #git
12:18 subhojit777 joined #git
12:21 robotroll joined #git
12:25 roflin joined #git
12:27 donught joined #git
12:27 PCatinean joined #git
12:29 PioneerAxon joined #git
12:30 cdown joined #git
12:30 bronson joined #git
12:32 diogenese joined #git
12:34 sdothum joined #git
12:40 psyb0t joined #git
12:43 tango_ joined #git
12:47 nettoweb joined #git
12:48 rorro joined #git
12:49 psyb0t joined #git
12:50 leeN joined #git
12:50 davimore_ joined #git
12:51 psyb0t joined #git
12:52 jstein_ joined #git
12:52 nikivi joined #git
12:55 iLembus joined #git
12:56 ojdo joined #git
13:00 mns joined #git
13:00 los joined #git
13:01 invisbl joined #git
13:02 pks joined #git
13:14 mikecmpbll joined #git
13:15 Electrometro joined #git
13:20 Singmyr joined #git
13:21 _28_ria joined #git
13:27 Thorn joined #git
13:28 Jackneill joined #git
13:29 Singmyr joined #git
13:29 LarArT joined #git
13:34 mischat joined #git
13:40 de-vri-es joined #git
13:40 johnmilton joined #git
13:40 joki joined #git
13:44 unbalanced joined #git
13:45 manuel_ joined #git
13:49 cdown joined #git
13:49 LiMp^ joined #git
13:51 Oebele joined #git
13:54 Masber joined #git
13:57 cjohnson agreed, that's my approach. I push my feature up daily and then probably once or twice a week I'll rebase master onto my feature and force push after rewriting history
13:57 cjohnson Once the feature gets merged I have to stop rebasing, so additioanl changes will happen as hotfix branches
13:59 j416 cjohnson: I didn't read the scrollback, but I suppose you mean you'll rebase your feature branch onto master, not the other way round.
13:59 cjohnson oh maybe, I always screw those up
13:59 cjohnson git checkout feature
14:00 cjohnson git rebase master
14:00 j416 cjohnson: also, I would advise you do that more often than once or twice a week; it'll give you less headache.
14:00 j416 cjohnson: (unless master only ever changes once or twice a week, of course)
14:00 cjohnson nah small team, that's as often as it needs to avoid headache
14:00 cjohnson yep
14:00 j416 alright
14:01 j416 I typically rebase as soon as my branch is in a /somewhat/ stable state and there are changes upstream
14:01 j416 as fast as possible
14:02 Black_knight joined #git
14:04 _ngz_ngzz joined #git
14:05 SwingShock joined #git
14:05 buffal0 joined #git
14:06 cjohnson I don't usually even have to rebase, but for those longer-lived branches, I rebase regularly to keep up to date
14:06 cjohnson or specifically after other major features are merged
14:07 PioneerAxon joined #git
14:08 afuentes joined #git
14:09 hahuang61 joined #git
14:09 keltvek joined #git
14:10 Sleepy63 joined #git
14:12 SwingShock Is it possible to create a branch with checkout command like this ? Will it be just like other branches then ?
14:12 SwingShock git checkout -b subbranch_of_b1 branch1
14:14 xall joined #git
14:16 Thorn joined #git
14:16 DrRobotic joined #git
14:17 nicoulaj joined #git
14:17 nilg joined #git
14:20 lumc joined #git
14:21 spacelord_ joined #git
14:21 SwingShock I was trying to create a branch under another branch. Like a hierarchy tree.
14:24 hpieu joined #git
14:26 Peetz0r joined #git
14:27 ochorocho__ joined #git
14:28 Gsham joined #git
14:30 bitri joined #git
14:31 bronson joined #git
14:31 canton7 SwingShock, all branches are created equal
14:32 canton7 SwingShock, you can name branches according to a hierarchy, e.g. 'features/foo', but that's just naming
14:32 canton7 'git checkout -b branch2 branch1' wil create a new branch, branch2, based on branch1
14:33 sea-gull joined #git
14:33 ochorocho__ joined #git
14:33 SwingShock Ok. Now i understand it. Thanks.
14:35 shgysk8zer0 joined #git
14:35 mischat joined #git
14:38 spacelord_ joined #git
14:38 PCatinean Hey guys if I have a repo and a fork and I want to cherry-pick only certain parts of certain commits from the repo, how do I go about that?
14:39 overlord_tm joined #git
14:40 PioneerAxon joined #git
14:42 ToxicFrog PCatinean: `git cherry-pick -n` will patch the changes in but not commit them
14:42 ToxicFrog Then you can make further edits to prune it down to just the part of the change you actually want before you commit
14:43 j416 PCatinean: I would probably do ^ that, and then use e.g. `git add -p` to add just parts of it.
14:44 mischat joined #git
14:46 PioneerAxon joined #git
14:49 cdg joined #git
14:50 jnavila joined #git
14:58 nettoweb joined #git
15:02 Gsham joined #git
15:02 nikivi_ joined #git
15:04 rominronin joined #git
15:06 PCatinean j416, git add -p is what I went for
15:06 PCatinean thanks guys!
15:07 j416 o/
15:08 _ng joined #git
15:12 Noldorin joined #git
15:12 zivester joined #git
15:13 jimi_ joined #git
15:13 venmx joined #git
15:13 cqi joined #git
15:14 eb0t joined #git
15:14 Siegfried joined #git
15:15 cqi joined #git
15:18 PioneerAxon joined #git
15:20 jnavila joined #git
15:21 nuil joined #git
15:21 LiMp^ joined #git
15:22 invisbl joined #git
15:23 dreiss joined #git
15:23 ochorocho__ joined #git
15:23 donught joined #git
15:26 freimatz joined #git
15:29 bocaneri joined #git
15:33 phanimah1sh joined #git
15:34 texasmynsted joined #git
15:35 miczac joined #git
15:35 fahadash joined #git
15:35 cdg joined #git
15:36 def_jam joined #git
15:42 miczac joined #git
15:43 Remram joined #git
15:45 shinnya joined #git
15:52 LiMp^ joined #git
15:52 gtristan joined #git
15:53 msonntag joined #git
15:53 derk0pf joined #git
15:53 netj joined #git
15:54 rorro joined #git
15:55 kyan joined #git
15:56 shgysk8zer0 joined #git
15:56 [0xAA] joined #git
16:00 LiMp^ joined #git
16:01 gtristan Hi, bit confused, how come I cannot git checkout a tree sha ?
16:02 gtristan Or can I somehow ?
16:04 ugjka joined #git
16:04 ToxicFrog gtristan: you can `git checkout` commits, but not arbitrary trees
16:05 gtristan Hmmm, can I find a commit which matches a tree ?
16:05 gtristan I suppose with some loopy ugly script ?
16:05 ToxicFrog If you want to inspect the contents of a subtree, you need to use its <commit id>:<directory path> pair, not the raw tree sha
16:05 ToxicFrog There might be more than one commit that contains that tree, too.
16:06 ToxicFrog What's the root problem you're trying to solve here? This might be an !xy
16:06 gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
16:06 gtristan Yes, this would be fine for my purposes actually
16:06 nettoweb joined #git
16:07 axisys joined #git
16:07 cdown joined #git
16:07 gtristan ToxicFrog, so I am implementing a software builder which downloads from various sources, one of those source kinds are git; I work with branch and commit IDs for the user (user can enter a branch and ref, I have a feature to update the user's project refs from the branches on a specific command too), that's all fine and doesnt require this
16:07 gtristan However now I'm writing a test case for the git Source plugin
16:08 gtristan And I need the input to tell a commit id, and need my test fixture to create a git repo on the fly kindof
16:08 gtristan but commit shas are a bit random, I can use a tree and I know that in my test case it will always be correct
16:09 gtristan tricky problem :-/
16:09 cdg joined #git
16:09 mikecmpbll joined #git
16:09 tcurdt joined #git
16:09 gtristan my test input data should contain commit sha instead of a tree then, or, I could tar up a tiny git repo and untar it in the test fixture
16:09 gtristan maybe the latter is best
16:10 hahuang61 joined #git
16:12 gtristan actually, this would be much simpler if I could sort of seed git with a hard coded seed for it's commit shas, can I do that ?
16:12 gtristan then I could predict what the sha will be
16:14 osse gtristan: It's a checksum. There is no seed.
16:14 gtristan osse, the tree is a checksum, but the commit sha ?
16:14 osse gtristan: They're the same algorithm
16:14 gtristan osse, I tried earlier today, creating 2 git repos in exactly the same way, first commit has different sha in both repos
16:15 gtristan same message, same test file, same content
16:15 osse gtristan:Different dates
16:15 gtristan oh, so I could set the date on my commit maybe to a deterministic one
16:16 gtristan nice
16:16 osse Yep, that's what git's own test suite does
16:16 gtristan osse, that's gonna save me a hurdle of trouble thanks !
16:18 spacelord_ joined #git
16:19 kazantip joined #git
16:20 osse gtristan: the algorithm for calculating trees and commits is the same one: SHA1
16:20 inflames joined #git
16:21 osse GIT_{AUTHOR,COMMITTER}_DATE to the rescue
16:23 gtristan yep, me just figuring out the right format for specifying the --date
16:25 gtristan so 2011-11-11 works fine, but how do I specify 0 seconds after midnight ?
16:28 SwingShock joined #git
16:28 osse gtristan: i'd use an unix timestamp
16:29 osse gtristan: like this one 1320966000
16:29 Ekho joined #git
16:29 madewokherd joined #git
16:30 Ekho joined #git
16:31 gtristan osse, yeah, and have to add timezone I think
16:31 gtristan 1320966000 +0200
16:32 gtristan or such
16:32 bronson joined #git
16:32 Shentino joined #git
16:32 flavius joined #git
16:32 ratdeptrai joined #git
16:32 gtristan So I need GIT_AUTHOR_DATE _and_ GIT_COMMITTER_DATE, seems I can't accomplish this with only git commit args
16:32 gtristan just with env vars
16:33 gtristan ok well, I'm on the way to figuring it out ;-)
16:33 mns joined #git
16:35 Vortex34 joined #git
16:36 gtristan nice, works :)
16:37 SwingShock When i look at more professional or leading git projects, they seem to have only 2-3 branches. But when i created a game project, it was filled with lot of branches. Am i organizing it wrong ?
16:38 jnavila joined #git
16:40 mns joined #git
16:42 govg joined #git
16:42 snowkidind joined #git
16:42 Gloomy joined #git
16:43 jw4242 joined #git
16:44 gtristan SwingShock, maybe I dont know what you are doing, I generally have one stable release branch for every major point release, which branches off of master, then I may have any number of active wip branches waiting to land on master
16:46 invisbl joined #git
16:48 SwingShock Ok. I am just having trouble organizing the branches. I only started using git few days ago. I first tried to create a sort of hierarchy with branches within branches.
16:48 kline left #git
16:48 gtristan Not sure why you would do that
16:49 gtristan SwingShock, some software teams have more branches, for instance you may have many side projects, adaptations you make to your embedded code base for releases in china vs brazil
16:49 gtristan but even then, you strive to mainline that as much as possible
16:50 canton7 popular git repos on github are often just a central place for people to clone from. Developers work in their own individual repos, and submit PRs against the main repo. Therefore you'll often see the main repo have few branches, and the developers will have a lot more temporary/abandoned branches
16:50 gtristan ah yes, the github/gitlab way
16:50 gtristan I wouldnt say that is representative of "professional or leading git projects", but sure :)
16:51 SwingShock Seems like i have to develop my own branching structure from experience then.
16:51 Guest58506 joined #git
16:52 gtristan SwingShock, if you are "creating a project" as you say, I would just caution to not maintain more branches than necessary, more maintained divergence is just bad practice if at all avoidable
16:53 gtristan SwingShock, keep not-ready-to-land stuff on wip branches, and once you go into production, then branch off of your release tags in order to be able to easily backport bugfixes
16:53 SwingShock What are wip branches ?
16:53 gtristan work-in-progress
16:54 SwingShock Are they regular branches ?
16:54 gtristan they are just the same as any branch sure, but you'd generally use them differently
16:54 gtristan you are the maintainer, you maintain master, for example
16:54 oskarkv joined #git
16:54 dreiss joined #git
16:54 gtristan buddy comes up and proposes a wip/frobnication branch
16:54 djb-irc joined #git
16:55 gtristan you decide it's not ready, buddy must often rebase his branch against master
16:55 gtristan until you decide it's ready
16:55 gtristan merging a wip branch *should* normally be a fastforward merge (i.e. *all* of his commits are in the future, buddy *rebased* before you merged it)
16:55 SwingShock I understand it now. I will try that.
16:58 SwingShock So where will the friends branch appear ? Is it best kept in his local repo ?
16:58 shgysk8zer0 joined #git
16:58 kristenbb joined #git
16:59 kristenbb hello, Git stash list returns 'warning: ignoring broken ref refs/stash'.  I assume this is due to a file corruption. How to fix it ?
17:00 ratdeptrai joined #git
17:00 markus3 joined #git
17:03 theoceaniscool joined #git
17:03 nettoweb joined #git
17:08 LordRyan joined #git
17:10 cdg joined #git
17:11 LordRyan joined #git
17:13 venmx joined #git
17:15 LordRyan joined #git
17:16 jaguarmagenta joined #git
17:16 cdg joined #git
17:19 ratdeptrai joined #git
17:20 LordRyan joined #git
17:20 jknetl joined #git
17:21 djb-irc joined #git
17:21 dave0x6d joined #git
17:24 dirtyroshi joined #git
17:24 jaguarmagenta joined #git
17:25 osse kristenbb: try renaming the file .git/refs/stash
17:25 dviola joined #git
17:27 romerocesar_ joined #git
17:28 venmx joined #git
17:30 menip joined #git
17:30 austin987 joined #git
17:36 dirtyroshi joined #git
17:37 ResidentBiscuit joined #git
17:37 cdown joined #git
17:38 rorro joined #git
17:38 armyriad joined #git
17:40 yohnnyjoe joined #git
17:42 mischat joined #git
17:43 SteffanW joined #git
17:47 cdg joined #git
17:47 bernardio joined #git
17:49 cdown joined #git
17:50 byte512 joined #git
17:53 SuperSeriousCat joined #git
17:53 cdown joined #git
17:57 zarel joined #git
17:57 arooni hey folks; trying to upgrade my synergy installation by compiling from source but when i ran hm.sh conf ;; i got Error: Could not get revision, git error: 128
17:57 _ikke_ <-- #git
18:00 gigq joined #git
18:04 YuGiOhJCJ joined #git
18:04 aoilotr joined #git
18:04 SuperSeriousCat joined #git
18:05 aoilotr Hello how could I remove all the modification on my project after a specific commit ?
18:05 inflames joined #git
18:07 osse aoilotr: you have to be more specific. do you want to pretend everything after never happened? Do you want to just restore the file contents?
18:07 alhariel joined #git
18:07 invisbl joined #git
18:08 cyan__ joined #git
18:08 djb-irc joined #git
18:08 aoilotr I want to say that after this commit nothing never happened and restore my project to this commit state
18:09 osse aoilotr: git reset --hard {thatcommit}. git push -f
18:10 garethdaine joined #git
18:11 hahuang61 joined #git
18:11 aoilotr GitLab said 'remote: GitLab: You are not allowed to force push code to a protected branch on this project.' but i'm the admin of the project on my page
18:11 osse then you have permission to change that setting
18:13 aoilotr Ah i see
18:13 invisbl joined #git
18:13 djb-irc joined #git
18:13 aoilotr and is there any way I could remove commit before one commit occured ? My coworker created the project with old commits and it's not very clean
18:14 osse yes, with rebase -i or filter-branch
18:14 osse rebase -i is easier, but not suitable if it's an ooold commit
18:15 romerocesar joined #git
18:15 paraparity joined #git
18:16 paraparity joined #git
18:19 oskarkv joined #git
18:19 aoilotr I'm scared to do something wrong with my files
18:19 aoilotr can you explain to me how to deal with rebase -i ?
18:20 SwingShock Getting 'Everything up-to-date error' with git for a friend. What is possibly wrong ?
18:21 avar You guys aren't productive enough?:)
18:22 djb-irc joined #git
18:23 Gsham joined #git
18:24 invisbl joined #git
18:33 bronson joined #git
18:33 CEnnis91 joined #git
18:35 hariel joined #git
18:35 cdown joined #git
18:40 djb-irc joined #git
18:41 venmx joined #git
18:43 nwkj86 joined #git
18:46 kristenbb left #git
18:49 arooni how can i clone a specific release or git revision?
18:50 alhariel joined #git
18:53 rewt arooni, what do you mean?
18:53 arooni rewt: i found it on stackoverflow;  git checkout <sha1>
18:53 arooni but a related question; do i first need to run git clone repourl
18:54 arooni it seems like git clone would take a lot of stuff i dont necessarily need
18:54 arooni if i'm just trying to compile a revision
18:54 jaguarmagenta joined #git
18:54 rewt git clone clones the whole repo
18:55 garethdaine joined #git
18:55 arooni so what would i want to do instead
18:56 rewt if you don't want to clone it all, you can do a shallow clone, which gets the last x commits from the tip of each branch
18:56 rewt but then you're not guaranteed to have the commit you're interested in if it's not in the last x
18:57 romerocesar joined #git
18:59 qwerty2 joined #git
18:59 djb-irc joined #git
19:00 denisMone joined #git
19:00 nilg joined #git
19:00 shyam joined #git
19:01 _28_ria joined #git
19:02 Gloomy joined #git
19:05 osse many hosts provide a way to get a tarball or zip
19:05 osse maybe you want that instead
19:05 osse if it's for a build server, then use clone. subsequent times you can fetch
19:07 SwingShock Getting 'Everything up-to-date error' with git for a friend. What is possibly wrong and how to check it ?
19:07 rewt that's not an error; it's just tell you that everything is up to date
19:08 SwingShock So the remote must be same as the local ?
19:09 rewt yes
19:09 rewt if you get that for a fetch
19:09 astrofog joined #git
19:09 SwingShock Ok.
19:09 howitdo joined #git
19:09 howitdo joined #git
19:14 sdlnv joined #git
19:15 cdown joined #git
19:16 Shakeel_ joined #git
19:17 qwerty2 How to be included in the git mailinglist?
19:19 aw1 joined #git
19:23 garethdaine joined #git
19:24 ratdeptrai I'm having some behavior that I don't understand when using 'git am' on a repo cloned from an hg remote by cinnabar.
19:25 ratdeptrai Starting with a freshly cloned repo, HEAD of current branch is checked out (commit A). I apply a patch using 'git am', get a new HEAD, (commit B, parent is A). This is expected. But now, when I apply a second (different) patch using 'git am', I get a new HEAD (commit C), but so far as I can see, C's parent is not B, but rather A.
19:25 grawity ratdeptrai: how are you checking this?
19:26 grawity !repro
19:26 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
19:26 ratdeptrai grawity: git show raw
19:26 realtime joined #git
19:26 ratdeptrai OK, I'll prepare a transcript.
19:27 ratdeptrai Maybe I should ask a simple question first,
19:28 ratdeptrai Can 'git am' produce a commit with multiple parents?
19:28 grawity no, it cannot
19:29 invisbl joined #git
19:29 grawity merges are practically never considered as patches
19:30 msonntag joined #git
19:31 rewt also check what `git log --oneline --graph` shows
19:31 ratdeptrai Right, that's what I thought. I'm obviously looking in the wrong direction, let me prepare that transcript.
19:31 ratdeptrai rewt, OK, will do.
19:32 misgit joined #git
19:32 alex1a joined #git
19:37 ResidentBiscuit joined #git
19:39 invisbl_ joined #git
19:41 paintenzero joined #git
19:44 GenZai joined #git
19:44 nikivi joined #git
19:45 aidalgol joined #git
19:47 invisbl joined #git
19:47 sea-gull joined #git
19:48 durham joined #git
19:48 diego1 joined #git
19:49 diego1 joined #git
19:49 buffal0 joined #git
19:49 diego1 joined #git
19:50 diego1 joined #git
19:50 misgit left #git
19:50 sLite joined #git
19:50 garethdaine joined #git
19:51 diego1 joined #git
19:51 durham joined #git
19:51 diego1 joined #git
19:52 DelphicOkami joined #git
19:53 multi_io joined #git
19:55 ratdeptrai Alright, it appears that I lied! :-)  When I tried to make the transcript, "it worked".  In fact 'git show --format=raw' never showed the incorrect parent; the problem was in the alias that I was using to show the log, which had --simplify-by-decoration turned on.
19:55 DrRobotic joined #git
19:57 mrkake joined #git
19:57 ratdeptrai I don't know why that was in my .gitconfig, it's a machine I rarely use.
19:57 paul424 joined #git
19:58 relgar joined #git
19:59 ratdeptrai In my defense, it was late at night.  "Never drink and git", I guess! ;-)
20:01 Muzer joined #git
20:03 bket joined #git
20:03 d0nn1e joined #git
20:03 buffal0 joined #git
20:04 Hawk3ye joined #git
20:05 cdg joined #git
20:07 yohnnyjoe joined #git
20:09 iron_houzi Can I define a gitignore for the file "tags", but not any directories named "tags"?
20:11 hahuang61 joined #git
20:12 kadoban iron_houzi: tags <newline> !tags/   should do it?
20:15 Muzer joined #git
20:16 pypi__ joined #git
20:16 _ng joined #git
20:18 mischat joined #git
20:18 prg3 joined #git
20:19 MrWoohoo joined #git
20:20 unreal joined #git
20:21 bocaneri joined #git
20:24 buffal0 joined #git
20:26 pks joined #git
20:29 bocaneri joined #git
20:33 AfroThundr joined #git
20:33 bronson joined #git
20:34 King_Hual joined #git
20:37 shgysk8zer0 joined #git
20:39 askb joined #git
20:42 Darcidride joined #git
20:43 bocaneri joined #git
20:45 bocaneri joined #git
20:49 hanneso joined #git
20:49 garethdaine joined #git
20:49 invisbl joined #git
20:50 veverak left #git
20:50 bocaneri joined #git
20:54 mischat joined #git
20:56 Guest81587 joined #git
20:56 dreiss joined #git
20:57 watabou joined #git
21:00 astrofog joined #git
21:00 invisbl joined #git
21:06 bocaneri joined #git
21:07 _ng joined #git
21:07 derk0pf joined #git
21:09 nocaberi joined #git
21:10 svm_invictvs joined #git
21:11 howitdo joined #git
21:14 troulouliou_dev joined #git
21:14 SexgirLLLL joined #git
21:15 brent__ joined #git
21:16 SwingShock joined #git
21:16 netcarver joined #git
21:17 davimore__ joined #git
21:19 snowkidind joined #git
21:20 tmsmith joined #git
21:22 tmsmith joined #git
21:22 msonntag joined #git
21:24 SwingShock In github, when you are checking out someone's pull request, is it necessary to go to the requester's forked repository by clicking on his name link and then go their repository to find the branch ?  Isn't there a shortcut link somewhere to directly take it there ?
21:25 norotartagen thanks linus
21:25 norotartagen this stuff is great
21:25 norotartagen left #git
21:25 garethdaine joined #git
21:25 * bremner hates impatient trolls
21:26 bremner that person has been more trollish in the past. Maybe they are now a positivity-troll.
21:26 strugee joined #git
21:27 tmsmith joined #git
21:27 bdonnahue joined #git
21:28 diogenese joined #git
21:30 rewt !github
21:30 gitinfo Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)
21:30 cdg joined #git
21:31 SwingShock Ok. Thanks. I will ask there.
21:32 mischat joined #git
21:33 Ciccio1 joined #git
21:33 Ciccio1 left #git
21:33 romerocesar_ joined #git
21:37 ojacobson SwingShock: "find" for what? Most of the github-side bits are in the pull request itself; you can fetch the pull request directly, too, if you happen to know the number
21:37 ojacobson (it's refs/pull/NNNN/head)
21:38 bocaneri joined #git
21:38 ResidentBiscuit joined #git
21:38 nikivi joined #git
21:40 sLite joined #git
21:41 sea-gull joined #git
21:41 msonntag joined #git
21:42 anonymuse joined #git
21:43 Nilesh_ joined #git
21:43 SwingShock ojacobson: Thanks.
21:43 AfroThundr joined #git
21:43 romerocesar joined #git
21:44 hahuang61 joined #git
21:55 cdown joined #git
21:57 msonntag joined #git
22:00 Gsham joined #git
22:01 dreiss joined #git
22:04 spacelord_ joined #git
22:04 buffal0 joined #git
22:04 jaafar joined #git
22:08 Siegfried joined #git
22:11 pbrewczynski joined #git
22:11 [Saint] joined #git
22:12 Atm0spher1c joined #git
22:13 diogenese joined #git
22:14 astrofog joined #git
22:15 mindfart joined #git
22:15 rishi joined #git
22:15 mischat joined #git
22:16 NeverDie joined #git
22:21 pypi_ joined #git
22:22 nd_ joined #git
22:25 hfp joined #git
22:26 Puffball joined #git
22:26 hfp_work joined #git
22:31 unbalanced joined #git
22:33 dreaddymck joined #git
22:34 Lea2 joined #git
22:34 bronson joined #git
22:36 msonntag joined #git
22:37 buffal0 joined #git
22:38 [0xAA] joined #git
22:42 kyan joined #git
22:45 hahuang61 joined #git
22:47 paws_ joined #git
22:48 breezy_ joined #git
22:50 cagedwisdom joined #git
22:50 JanC_ joined #git
22:55 ochorocho__ joined #git
23:01 fmeerkoetter joined #git
23:01 onmeac joined #git
23:07 ratdeptrai Is there any consensus on which git-local-to-hg-remote bridge tool is best?
23:08 Eugene !HG
23:09 Eugene Apparently not on this bot, sorry.
23:10 llamapixel http://hg-git.github.io/  I havent tested it
23:11 moei joined #git
23:16 mischat joined #git
23:16 howitdo joined #git
23:16 howitdo joined #git
23:17 salamanderrake joined #git
23:19 sdothum joined #git
23:19 tmg joined #git
23:21 ratdeptrai llamapixel: I think that's the wrong direction, I was thinking of I'm running git locally, the remote repo is hg.
23:22 ratdeptrai There are several bridges, cinnabar, gitifyhg, others listed here: https://github.com/buchuki/gitif​yhg/wiki/List-of-git-hg-bridges
23:22 theoceaniscool joined #git
23:22 ratdeptrai But I'm wondering if there's any "winner" emerging.
23:23 Spec-Chum joined #git
23:24 ojacobson winner: using one scm system at a time, rather than two
23:25 joelsmith joined #git
23:25 ShapeShifter499 joined #git
23:25 ojacobson unless there's a super-compelling thing you can only practically do with git - note that git and mercurial have fairly compatible data models, so most git actions can be translated in some way.
23:25 ratdeptrai ojacobson: well, if one wants to participate in multiple projects, some of which use different scm for the repo, that would mean using multiple scm locally.
23:25 ojacobson (it's not always easy, git and hg have very different default assumptions about workflow)
23:25 ojacobson yes, and?
23:26 ratdeptrai Yes, but that's a lot of friction for the developer.  A distributed scm tool is a very intimate part of your local workflow, for me anyhow. Akin to choice of text editor.
23:27 nckpz joined #git
23:27 ratdeptrai I really don't want to have to repeat the process of figuring out how to get all of my various local tasks done in yet another SCM.
23:29 ratdeptrai You said yourself it's not easy.  Pull/push to the remote is a tiny fraction of what (I anyhow) use the distributed vc system for.  It's primarily a local tool, for my local branches, commits, etc. If we can just have a reasonable ability to bridge between the local and remote repos, I can just use my one tool and no one upstream's the wiser.
23:30 ojacobson There's nothing further I can say on this that's in any way constructive - best of luck, you have a very different set of needs and experiences, with which I have no tools to help you :)
23:31 ratdeptrai OK, to each his own! :-)
23:31 nickabbey joined #git
23:31 ojacobson The usual advice of "try one and see what works for you" applies, of course :)
23:32 ratdeptrai Right, I'm in the process of that but thought maybe someone could save me some time.
23:33 ochorocho__ joined #git
23:34 rorro joined #git
23:35 tobiasBora joined #git
23:36 wagle joined #git
23:37 venmx joined #git
23:41 ojacobson Right. Like I said: nothing productive to add.
23:45 Limes joined #git
23:45 WhiskerBiscuit joined #git
23:48 robattila256 joined #git
23:50 tobiasBora joined #git
23:57 dreiss joined #git
23:58 Poppa joined #git

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