Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-07-17

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

All times shown according to UTC.

Time Nick Message
00:00 cagedwisdom joined #git
00:00 user2468_ joined #git
00:00 kozy joined #git
00:02 user2468 joined #git
00:04 chris_wot joined #git
00:05 acalycine joined #git
00:09 venmx joined #git
00:10 hahuang65 joined #git
00:12 kadoban joined #git
00:13 Maskettaman joined #git
00:13 inovas joined #git
00:14 stutter joined #git
00:18 dsdeiz joined #git
00:18 dsdeiz joined #git
00:19 valhala__ joined #git
00:20 nixjdm_ joined #git
00:21 vignesh joined #git
00:24 dsdeiz joined #git
00:24 dsdeiz joined #git
00:30 TbobbyZ joined #git
00:30 rorro joined #git
00:32 Cabanossi joined #git
00:32 snowkidind joined #git
00:34 dendazen joined #git
00:34 digitalway joined #git
00:36 valhala_22 joined #git
00:40 pandeiro joined #git
00:43 Orbitrix joined #git
00:43 Darren_ joined #git
00:43 dsdeiz joined #git
00:43 dsdeiz joined #git
00:47 buffal0 joined #git
00:48 valhala_22 joined #git
00:50 Goplat joined #git
00:52 EvilPenguin joined #git
00:52 Arcanoid joined #git
00:59 dsdeiz joined #git
01:09 lelexia joined #git
01:10 svm_invictvs joined #git
01:12 chachasmooth joined #git
01:15 buffal0 joined #git
01:16 Arcaelyx_ joined #git
01:18 webdev007 joined #git
01:20 t-mart joined #git
01:20 nixjdm_ joined #git
01:23 JanC_ joined #git
01:23 finalbeta joined #git
01:27 chachasmooth joined #git
01:30 sunri5e joined #git
01:30 bronson joined #git
01:30 shinnya joined #git
01:32 a3Dman joined #git
01:35 shinnya joined #git
01:36 Maskettaman_yo joined #git
01:37 fitbobcat joined #git
01:37 fitbobcat Hi
01:37 gitinfo fitbobcat: 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.
01:38 buffal0 joined #git
01:40 shinnya joined #git
01:43 ngui joined #git
01:47 Murr joined #git
01:49 bambs joined #git
01:52 d^sh joined #git
01:52 ngui1 joined #git
01:57 nikio_ joined #git
01:57 cagedwisdom joined #git
01:57 nikio_ u have a local branch which uses a different ip for testing purposes and a serverbranch which uses the actual vps ip;
01:58 nikio_ each time i change the local branch i do git cherry-pick ..localBranch;
01:58 shinnya joined #git
01:58 nikio_ then wehn i do  git merge master;
01:58 nikio_ it still merges something
01:59 nikio_ sorry, *git merge localBranch;
01:59 nikio_ but when i do git diff HEAD^ HEAD; obviously there are no changes.. so whats the point of that merge?
01:59 cqi joined #git
02:00 kpease joined #git
02:01 netj joined #git
02:02 digitalway joined #git
02:02 nikio_ anyway im just trying to avoid merge commits
02:02 Cabanossi joined #git
02:02 nikio_ all im doing is updating one branch with new commits from the other
02:02 nikio_ that one branch never gets commits of its own
02:04 pks joined #git
02:11 TbobbyZ joined #git
02:11 hahuang65 joined #git
02:13 rchavik joined #git
02:13 rohitpaulk joined #git
02:16 chachasmooth joined #git
02:19 auzty joined #git
02:19 jameser joined #git
02:20 vignesh joined #git
02:21 nixjdm_ joined #git
02:22 hahuang65 joined #git
02:22 user2468_ joined #git
02:23 hash-z3r0 joined #git
02:23 EvilPenguin joined #git
02:23 chachasmooth joined #git
02:24 lagothri1 joined #git
02:25 sunri5e joined #git
02:33 jameser joined #git
02:36 chachasmooth joined #git
02:36 theiostr_ joined #git
02:45 venmx joined #git
02:47 valhalla_22 joined #git
02:48 ahrs joined #git
02:50 PioneerAxon joined #git
02:51 Darren_ joined #git
02:51 Vortex34 joined #git
02:51 om_henners joined #git
02:56 xPucTu4 joined #git
02:58 bambs joined #git
03:00 tnecniv joined #git
03:04 Vgr joined #git
03:04 Vgr joined #git
03:07 theiostream joined #git
03:07 humboldt joined #git
03:11 cam27 joined #git
03:13 rohitpaulk joined #git
03:17 Cabanossi joined #git
03:18 jameser joined #git
03:21 nixjdm_ joined #git
03:23 om_henners joined #git
03:23 robotroll joined #git
03:26 impermanence joined #git
03:26 venmx joined #git
03:27 impermanence so I'm moving my app from version 0.1 to 0.2 and I'm curious about best practices regarding git.
03:27 impermanence Should I try to save my files in some static bundle and call it my_app_0.1 and then just move on
03:28 impermanence should I just say fuck it, move on and if I need to move backwards in time depend on git diffs to do resets?
03:28 impermanence or...?
03:31 thiago you save your files in git
03:31 bronson joined #git
03:31 thiago you've committed and you created a tag when you released
03:31 thiago now move on
03:31 Guest35472 joined #git
03:31 impermanence so tagging
03:31 impermanence is tagging a common practice, though?
03:31 albel727 joined #git
03:31 thiago yes
03:32 impermanence thx :)
03:33 donmichelangelo joined #git
03:34 fstd_ joined #git
03:34 fstd_ joined #git
03:36 h12o joined #git
03:38 bambs joined #git
03:39 PioneerAxon joined #git
03:40 bambs joined #git
03:40 venmx joined #git
03:41 snowkidind joined #git
03:46 Cabanossi joined #git
03:46 orbyt_ joined #git
03:47 Murr joined #git
03:49 Darren_ joined #git
03:49 duderonomy joined #git
03:53 EvilPenguin joined #git
03:53 venmx joined #git
03:55 lelexia joined #git
03:56 lelexia joined #git
03:57 lelexia joined #git
04:02 Keavon joined #git
04:04 hahuang65 joined #git
04:04 _kk22kk_ joined #git
04:05 Timvde joined #git
04:06 nd_ joined #git
04:07 venmx joined #git
04:11 TbobbyZ joined #git
04:12 nd joined #git
04:14 nd_ joined #git
04:15 rohitpaulk joined #git
04:15 RichardC joined #git
04:17 bambs joined #git
04:18 blackwind_123 joined #git
04:20 nd joined #git
04:21 nixjdm_ joined #git
04:24 nd_ joined #git
04:25 Goplat joined #git
04:27 Guest36 joined #git
04:28 inovas joined #git
04:29 nd joined #git
04:30 sunri5e joined #git
04:31 RichardC joined #git
04:33 kisonecat joined #git
04:34 nd joined #git
04:35 t-mart joined #git
04:37 dre_ joined #git
04:41 CBF16888 joined #git
04:42 blackwind_123 what is the proper way of moving changes from one branch to another..?  currently what im doing is cheerypick the changes in one branch and push to the other branch in remote.. i guess this is not the right way to use GIT
04:42 humanBird joined #git
04:43 humanBird http://pasteall.org/474492 and http://pasteall.org/474493 do not make sense. i think something is broken
04:44 humanBird oh. it doesnt' consider folders files
04:44 humanBird which is wrong
04:46 humanBird i don't know....
04:46 humanBird the .idea/ and .cache/ files aren't even tracked
04:46 humanBird there's .idea in my .gitignore file which i git added.
04:46 humanBird i think the interface for gitignore is poorly documented and pretty unituitive to say the least
04:47 _ikke_ Ok, what part is confusing?
04:48 humanBird oh i see what happened
04:48 humanBird left #git
04:50 svm_invictvs joined #git
04:51 kisonecat joined #git
04:51 holodoc joined #git
04:51 Maskettaman joined #git
04:52 valhalla_22 joined #git
04:53 shgysk8zer0 joined #git
04:54 malide joined #git
04:59 rchavik joined #git
04:59 dpl joined #git
05:00 dersand joined #git
05:01 Cabanossi joined #git
05:04 om_henners joined #git
05:04 overlord_tm joined #git
05:06 Khisanth joined #git
05:07 dec0n joined #git
05:11 robertparkerx joined #git
05:16 dsdeiz joined #git
05:16 fatihgenc joined #git
05:19 user2468 joined #git
05:19 nixjdm_ joined #git
05:20 hash-z3r0 joined #git
05:20 df0 joined #git
05:21 conarch joined #git
05:21 imack_ joined #git
05:23 EvilPenguin joined #git
05:28 YuGiOhJCJ joined #git
05:31 Cabanossi joined #git
05:32 Hyp3ri0n joined #git
05:32 bronson joined #git
05:34 Hyp3ri0n joined #git
05:35 derekjc joined #git
05:37 cam27 joined #git
05:38 jimmyrcom joined #git
05:40 brent__ joined #git
05:41 nckpz joined #git
05:41 t-mart joined #git
05:43 fakenerd joined #git
05:43 freimatz joined #git
05:44 fakenerd joined #git
05:46 nomad242 joined #git
05:47 Murr joined #git
05:48 alcohol joined #git
05:51 indistylo joined #git
05:53 indistylo joined #git
05:55 pks joined #git
05:55 jfr joined #git
05:58 ThomasLocke joined #git
05:58 ThomasLocke joined #git
05:58 chachasmooth joined #git
06:02 nisseni joined #git
06:03 vignesh joined #git
06:05 rscata joined #git
06:08 chigang__ left #git
06:13 chachasmooth joined #git
06:14 lb1c joined #git
06:15 netj joined #git
06:15 jceb joined #git
06:16 valhalla_22 joined #git
06:18 khatri joined #git
06:18 k0lv joined #git
06:19 nixjdm_ joined #git
06:19 theoceaniscool joined #git
06:25 valhalla_22 joined #git
06:28 jknetl joined #git
06:29 opalepatrick joined #git
06:29 tnecniv joined #git
06:29 gareppa joined #git
06:31 valhalla_22 joined #git
06:33 TbobbyZ joined #git
06:34 dreiss joined #git
06:34 _kk22kk_ joined #git
06:35 jknetl joined #git
06:35 fakenerd joined #git
06:41 Anja_ joined #git
06:41 hash-z3r0 joined #git
06:44 seishun joined #git
06:46 lordjancso joined #git
06:46 tarkus joined #git
06:47 indistylo joined #git
06:47 Anja_ joined #git
06:47 ogny joined #git
06:48 t-mart joined #git
06:49 Es0teric joined #git
06:50 Eryn_1983_FL joined #git
06:51 Stath joined #git
06:51 Anja_ joined #git
06:52 lelexia joined #git
06:52 jas4711 joined #git
06:52 valhalla_22 joined #git
06:54 EvilPenguin joined #git
06:54 aax joined #git
06:56 Diaoer joined #git
06:58 jknetl joined #git
07:00 jknetl joined #git
07:02 rchavik joined #git
07:03 jknetl joined #git
07:03 ojdo joined #git
07:04 venmx joined #git
07:04 jknetl joined #git
07:06 chachasmooth joined #git
07:08 valhalla_22 joined #git
07:09 Anja_ joined #git
07:10 seschwar joined #git
07:11 neunon joined #git
07:13 wandering_vagran joined #git
07:17 rohitpaulk joined #git
07:19 venmx joined #git
07:19 nixjdm_ joined #git
07:20 vuoto joined #git
07:20 Mowgli joined #git
07:21 chrisml joined #git
07:26 shiranuidong joined #git
07:26 ogny joined #git
07:28 shiranuidong joined #git
07:31 Murii joined #git
07:32 venmx joined #git
07:33 overlord_tm joined #git
07:33 bronson joined #git
07:34 imack_ joined #git
07:37 valhall__ joined #git
07:39 valhalla_22 joined #git
07:39 hahuang65 joined #git
07:42 gxt joined #git
07:46 venmx joined #git
07:47 Murr joined #git
07:52 chachasmooth joined #git
07:53 m4sk1n joined #git
07:53 ogny joined #git
07:53 pbandark joined #git
07:53 doev joined #git
07:56 rasto joined #git
07:57 tnecniv joined #git
07:57 netj joined #git
07:59 dege joined #git
08:00 venmx joined #git
08:01 vamiry joined #git
08:01 dreiss joined #git
08:05 mikecmpbll joined #git
08:05 Macaveli joined #git
08:05 maarhart joined #git
08:06 marcogmonteiro joined #git
08:12 Tobbi joined #git
08:13 rohitpaulk joined #git
08:13 venmx joined #git
08:16 djb-irc joined #git
08:16 om_henners joined #git
08:17 hash-z3r0 joined #git
08:18 navidr joined #git
08:19 nixjdm_ joined #git
08:21 Darcidride joined #git
08:22 sarbs joined #git
08:22 vamiry joined #git
08:25 EvilPenguin joined #git
08:25 dege joined #git
08:26 chele joined #git
08:26 _kk22kk_ joined #git
08:27 venmx joined #git
08:29 indistylo joined #git
08:31 cdown joined #git
08:31 bambs joined #git
08:31 Cabanossi joined #git
08:31 schleppel joined #git
08:33 wohfab joined #git
08:33 dwmw2_gone joined #git
08:33 chele joined #git
08:36 durham joined #git
08:39 chll_ joined #git
08:41 venmx joined #git
08:41 chachasmooth joined #git
08:41 oxymoron93 joined #git
08:41 pks joined #git
08:42 ferr joined #git
08:44 aruns joined #git
08:44 Macaveli joined #git
08:45 k0lv joined #git
08:45 pks_ joined #git
08:46 TbobbyZ joined #git
08:47 mikiones joined #git
08:48 Macaveli_ joined #git
08:50 marcogmonteiro joined #git
08:54 venmx joined #git
08:57 _ADN_ joined #git
08:58 Macaveli joined #git
09:01 hash-z3r0 joined #git
09:02 jknetl joined #git
09:05 rohitpaulk joined #git
09:08 venmx joined #git
09:13 jstein_ joined #git
09:14 kurkale6ka joined #git
09:15 TheFuzzball joined #git
09:17 hussam joined #git
09:17 _ADN_ joined #git
09:17 rvgate joined #git
09:19 fakenerd joined #git
09:19 nixjdm_ joined #git
09:20 durham_ joined #git
09:21 venmx joined #git
09:22 stoner23 joined #git
09:22 durham__ joined #git
09:23 acalycine joined #git
09:23 acalycine joined #git
09:28 wohfab joined #git
09:29 chachasmooth joined #git
09:31 ZyX-I joined #git
09:34 floppydh joined #git
09:34 bronson joined #git
09:35 manuelschneid3r joined #git
09:35 venmx joined #git
09:47 Murr joined #git
09:49 venmx joined #git
09:51 sarri joined #git
09:51 sarri joined #git
09:54 kurkale61 joined #git
09:55 j08nY joined #git
09:55 EvilPenguin joined #git
09:57 kurkale6ka joined #git
10:01 cstratak joined #git
10:01 Cabanossi joined #git
10:02 venmx joined #git
10:04 t-mart joined #git
10:07 hash-z3r0 joined #git
10:08 star_prone joined #git
10:09 tvw joined #git
10:10 quackgyver joined #git
10:10 star_prone joined #git
10:11 star_prone joined #git
10:16 venmx joined #git
10:16 hahuang65 joined #git
10:19 nixjdm_ joined #git
10:20 basiclaser joined #git
10:26 fakenerd joined #git
10:29 venmx joined #git
10:30 kurkale61 joined #git
10:30 netj joined #git
10:31 Cabanossi joined #git
10:33 star_prone joined #git
10:33 star_prone joined #git
10:37 sarri joined #git
10:37 sarri joined #git
10:38 ckruczek joined #git
10:39 ckruczek hey guys I have question regarding changelog. anyone knows how the linux/git-maintainer generate their changelogs? for example, how do they distinguish between changes that should go in the changelog and changes that shouldn't?
10:39 kurkale6ka joined #git
10:39 ams__ joined #git
10:41 sarbs joined #git
10:43 venmx joined #git
10:43 hash-z3r0 joined #git
10:44 cebula joined #git
10:48 TbobbyZ joined #git
10:48 floppydh joined #git
10:48 inovas joined #git
10:49 mentazoom joined #git
10:51 chachasmooth joined #git
10:51 AndreasLutro ckruczek: I'd be surprised if anyone here knew for sure, but my guess would be that changelogs are more or less manually maintained
10:52 ckruczek AndreasLutro: yes I think so too. I was just thinking that maybe anyone of you already had the experience to do it and can give me a hint.
10:52 AndreasLutro either that or it just includes every commit
10:52 AndreasLutro which is also probable in my mind, since the kernel does not allow "useless" commits
10:53 _ikke_ AndreasLutro: Usually not every commit
10:53 _ikke_ more on topic branch level
10:56 biertie joined #git
10:56 AndreasLutro right
10:57 venmx joined #git
11:01 ckruczek _ikke_: for git I tried to reproduce this and searched for a noticable word in the log to find this word in any commit, but I wasn't able to, so I suspect they do it by hand and rewrite the log respectivly. But I don't think this is a reasonable way, escpecially for the huge amount of commits in both git and linux per release-cycle.
11:01 zxd hi
11:01 zxd I don't understand if I add multiplie remotes with: git remote add   , then do git fetch --all   what happens if from more than one remote the same name for a tag exists?
11:02 zxd what will be in refs/tags ?
11:03 zxd I am using a  git init --bare   repository
11:04 Vampire0_ joined #git
11:11 bambs joined #git
11:11 t-mart joined #git
11:11 ckruczek zxd: try it
11:13 fakenerd joined #git
11:14 zxd try what?
11:14 zxd ckruczek: I see only one entry for the tag
11:14 acalycine joined #git
11:14 zxd the other is not there
11:19 nixjdm_ joined #git
11:23 zxd actually I don't understand anything, from one  folder the same repository have different sha512 hash for the same tag
11:24 zxd from two folders
11:24 ti2 zxd: depends on your refspecs.  Do you have a special tag refspec (e.g. 'refs/tags/*:refs/tags/*')?
11:24 Cavallari joined #git
11:25 zxd ti2: no
11:25 ti2 If you do not have a special fetch refspec for tags, the first one wins (as the default refspec is the above one).  If a second or third remote would have a tag with the same name, that one will not be considered anymore.
11:25 EvilPenguin joined #git
11:25 ti2 That do you want to acchieve?
11:26 zxd I see, so I need to create a seperate refspec for each remote
11:26 zxd ti2:
11:27 ti2 You can also "redirect" tags from a remote to a specific ref/ prefix (e.g. 'refs/tags/*:refs/tags/upstream/*')
11:27 LeMike wow. I may have something to enhance in git: `git status` is creating a lock file. This is sad as I like to paginate through `git status | less` and add files while looking what has changed. But this fails due to the lock file. Where do I report this?
11:28 Cavallari joined #git
11:28 rominronin joined #git
11:28 zxd ti2: what you mean a specific ref/ prefix?  that does not require a refspec for each remote?
11:28 zack_s_ joined #git
11:28 zxd if I use refs/tags/*:refs/tags/upstream/*  for all they still will end up in one folder
11:29 altendky what is the file format for use with `git flow init --file <file>`?
11:29 zack_s_ how can I install a hook an push it into the repository?
11:30 rzo1 joined #git
11:30 zack_s_ so that everybody gets the hook?
11:30 LeMike zack_s_: only directly on the server . You may like to put the code for the hook in the repo and then create a symlink on the other server.
11:30 LeMike And everyone has to create that symlink too
11:30 ti2 zxd: right. If you want to rename the tags locally according to the originating remote, then you need to have a refspec for each of them; and you have to disable the default tag fetching (e.g.: git config remote.origin.tagopt --no-tags)
11:31 bambs joined #git
11:31 d10n-work joined #git
11:32 kurkale61 joined #git
11:33 feodaron joined #git
11:33 sarri joined #git
11:33 sarri joined #git
11:34 jknetl joined #git
11:36 bronson joined #git
11:36 SkyPatrol joined #git
11:37 zack_s_ LeMike: do you have experience with hooks?
11:37 zack_s_ I wanted to try this hook: http://waiting-for-dev.github.io/blog/2014/07/19/append-issue-number-to-commit-message-automatically-with-git-hooks/
11:38 zack_s_ but I failed
11:38 zack_s_ not issue was appended
11:40 ToBeCloud joined #git
11:41 dsdeiz joined #git
11:41 dsdeiz joined #git
11:42 sarri joined #git
11:42 sarri joined #git
11:42 in1t3r_ joined #git
11:44 LeMike zack_s_: which you tried on CLI or within an IDE? IDEs mostly fail all the time doing this.
11:45 zack_s_ LeMike: IDE
11:46 LeMike zack_s_: Take phpStorm for instance which creates the commit message without asking git to build one. So nothing in the mind of git will happen. The message is actually brought to you by your IDE then. I opened an issue for JetBrains IDEA somewhere.
11:46 kurkale6ka joined #git
11:47 LeMike Try it on CLI ;) If it works there then you did everything right
11:47 Murr joined #git
11:48 sostenuto joined #git
11:48 valhall__ joined #git
11:49 mentazoom joined #git
11:49 absolutejam Hey guys and gals
11:49 absolutejam Am I right in thinking that git always has to point to a SHA of a commit when trackign submodules?
11:50 absolutejam I mean, I know you can track a branch and pull that with a command
11:50 absolutejam but the superproject will always point to a commit in the branch
11:50 canoon joined #git
11:50 canton7 yes
11:50 canton7 that's right
11:50 absolutejam Cool, thought so
11:50 irqq joined #git
11:52 rominronin joined #git
11:53 bambs joined #git
11:53 bybb joined #git
11:53 h12o joined #git
11:54 zack_s_ LeMike: doesnt work either
11:55 zack_s_ LeMike: also with CLI
11:56 osse !transcript
11:56 gitinfo 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
11:59 synthroid joined #git
11:59 absolutejam Could I have a submodule and also add it to my .gitignore?
11:59 absolutejam I would like the submodule to always be the latest, so I'm tracking the HEAD of master
12:00 absolutejam But I don't want it nagging that there's updates
12:00 absolutejam I just wanna pull changes when needed
12:00 AndreasLutro you can just git clone into a subdirectory instead of using submodules then
12:00 finalbeta joined #git
12:00 Stummi "I want always the latest version, but I don't want allways the latest version"?
12:00 Stummi *always
12:01 zack_s_ osse: https://paste.ee/p/ZacM1#SM5rhSQGAyouEJEAJ720EMPZMHPJbusT
12:01 absolutejam I want it store a repo with references to other repos HEAD
12:01 zack_s_ nothing really to see
12:01 absolutejam but I don't want to have to constantly update the master repo to point to the latest commit
12:01 bybb joined #git
12:01 absolutejam I mean, I don't have to
12:02 absolutejam But the message that there's changes in the submodule irks me
12:02 buffal0 joined #git
12:03 sunri5e joined #git
12:05 SkyPatrol_ joined #git
12:07 LeMike zack_s_: what is your `ls -la .git/hooks` ? please add that to the pastee
12:07 dendazen joined #git
12:09 Tobbi joined #git
12:09 jameser joined #git
12:10 zack_s_ LeMike: https://paste.ee/p/4OGBS#grw3qbiUTAQrd1trDr15bx5LTAcyS1L6
12:11 kurkale61 joined #git
12:13 h12o joined #git
12:13 sarri joined #git
12:13 sarri joined #git
12:15 whisllayjr joined #git
12:15 zxd does git pull  fetch tags by default?
12:16 zxd when does git decide to put tags in  packed-refs  vs refs/tags
12:17 ronator joined #git
12:17 hahuang65 joined #git
12:17 EvilDMP left #git
12:18 kurkale6ka joined #git
12:19 whisllayjr joined #git
12:19 Acerific joined #git
12:19 Acerific joined #git
12:19 hash-z3r0 joined #git
12:20 nixjdm_ joined #git
12:21 t-mart joined #git
12:22 stutter joined #git
12:23 digitalway joined #git
12:23 whisllayjr joined #git
12:24 mkoskar joined #git
12:24 zack_s_ LeMike: everything ok?
12:27 skered joined #git
12:28 LeMike zack_s_: yee. I am also working atm. so it's executable and looks fine. You may want to create a commit message file as "/tmp/foo" and run it by hand `.git/hooks/pre-commit-msg /tmp/foo` and then look at `cat /tmp/foo` .
12:29 LeMike this is your debugging environment now ;) maybe it's not parsing correct. maybe sed is not replacing correct. From here on a lot of things can be which need to be checked by hand as I don't see the problem there. Maybe outdated script with some flaws. dunno
12:30 AndreasLutro erm
12:30 LeMike to check add "set -e" to the second line of "pre-commit-msg" (call it debugging mode or so).
12:30 AndreasLutro zack_s_: I think your file should be named "prepare-commit-msg" or "pre-commit", there's no hook named "pre-commit-msg"
12:31 LeMike rofl. yes. next coffee instensifies
12:31 perlpilot joined #git
12:31 Cabanossi joined #git
12:32 kurkale6ka joined #git
12:32 feodaron joined #git
12:32 sarri joined #git
12:32 sarri joined #git
12:32 Vargas joined #git
12:33 zack_s_ AndreasLutro: thx, now I get: "sed: can't read : No such file or directory"
12:36 bambs joined #git
12:36 cdown joined #git
12:36 jameser joined #git
12:37 cqi joined #git
12:39 osse That's a general script error
12:40 dsdeiz joined #git
12:40 osse So we need to see the script
12:40 osse zack_s_:
12:42 zack_s_ osse: https://paste.ee/p/4OGBS#grw3qbiUTAQrd1trDr15bx5LTAcyS1L6
12:42 LeMike zack_s_: Is it "prepare-commit-msg" already? As Andreas Lutro mentioned.
12:43 sarri joined #git
12:43 sarri joined #git
12:43 zack_s_ its now called "pre-commit"
12:44 Tobbi joined #git
12:45 LeMike zack_s_: go `cat .git/hooks/pre-commit.sample` -- it says: "Called by 'git commit' with no arguments." -- But sed needs the $1 which is the file where the commit message lives. Please name it "prepare-commit-msg".
12:45 osse zack_s_: As per the man page it takes no parameters so $1 is empty
12:48 TbobbyZ joined #git
12:50 Gurkenglas joined #git
12:50 phanimahesh joined #git
12:51 brent__ joined #git
12:55 kurkale6ka joined #git
12:56 EvilPenguin joined #git
12:57 Tobbi joined #git
12:57 cdown joined #git
12:59 Darren_ joined #git
12:59 zack_s_ LeMike: thx, now it works
12:59 zack_s_ also with IDE
13:00 SkyPatrol joined #git
13:01 str joined #git
13:02 impermanence joined #git
13:04 tanuki joined #git
13:05 ExoUNX joined #git
13:06 ExoUNX joined #git
13:10 acalycine joined #git
13:13 jameser joined #git
13:13 cdown_ joined #git
13:15 jlewis joined #git
13:15 theiostream joined #git
13:16 hash-z3r0 joined #git
13:16 iron74 joined #git
13:17 p4trix joined #git
13:17 user2468 joined #git
13:18 Lunatrius` joined #git
13:19 kurkale61 joined #git
13:19 nixjdm_ joined #git
13:19 h12o joined #git
13:19 tvw joined #git
13:20 jottr joined #git
13:24 cdown_ joined #git
13:24 relipse joined #git
13:25 netj joined #git
13:27 kurkale6ka joined #git
13:27 Noldorin joined #git
13:28 tarkus joined #git
13:29 tinanoo joined #git
13:32 sarri joined #git
13:32 sarri joined #git
13:33 elect joined #git
13:35 Dougie187 joined #git
13:35 elect I am in the following situation: the test branch turned to be the ok. Now I want it to overwrite/become the master and delete the test branch
13:35 elect as far as I have understood
13:35 elect git checkout master
13:35 elect git reset --hard test
13:35 elect git push -f origin master
13:36 AndreasLutro do `git merge --ff-only test` instead of reset. it's safer
13:36 elect but I'd like to keep the history commits
13:36 elect does it matter if the master has some additional commits?
13:36 elect I don't care about those, I'd like a pure overwrite
13:37 bronson joined #git
13:37 AndreasLutro yes, in that case you would need a reset, but then you'd have to push --force, which will cause issues for anyone doing `git pull`
13:37 AndreasLutro I would recommend just doing `git checkout master; git merge test`
13:37 bybb joined #git
13:38 elect ok, I'll try then the classical way
13:39 elect it worked flawness, thanks AndreasLutro!
13:41 zxd ! [remote rejected] some_remote/master -> refs/master (funny refname)  I am using git push --tags local refs/remotes/some_remote/master:refs/master
13:41 zxd why does it reject
13:42 AndreasLutro probably history has diverged
13:42 zxd it has no history
13:42 zxd git init --bare
13:42 zxd on "local"
13:42 theiostream joined #git
13:42 swift1 joined #git
13:43 AndreasLutro mm, then I don't know
13:44 daksh joined #git
13:44 Tobbi joined #git
13:44 fahadash_ joined #git
13:45 zxd refs/heads/master
13:46 zxd works
13:46 zxd forgot the heads
13:47 Murr joined #git
13:47 bybb_ joined #git
13:47 kurkale61 joined #git
13:49 phinxy joined #git
13:49 daksh left #git
13:50 mentazoom joined #git
13:51 kurkale6ka joined #git
13:52 nathani_ joined #git
13:52 valhalla_22 joined #git
13:53 minot joined #git
13:54 zxd git push remote --tags is  a short cut for  git push remote refs/tags/*:refs/tags/*  ?
13:57 Es0teric joined #git
13:58 Ryanar joined #git
13:59 plasticle joined #git
13:59 h12o joined #git
13:59 Lunatrius joined #git
14:01 Cabanossi joined #git
14:02 HyP3r joined #git
14:02 HyP3r How can I recusive checkout a repository? I have here repository which has a lot of sub and subsub modules....
14:03 glad joined #git
14:05 wohfab joined #git
14:07 osse HyP3r: After checkout do git submodule update --recursive
14:08 ResidentBiscuit joined #git
14:08 ResidentBiscuit joined #git
14:10 Gustavo6046 joined #git
14:14 hs366 joined #git
14:14 HyP3r osse: okay thanks
14:15 menip joined #git
14:16 cdg joined #git
14:17 AaronMT joined #git
14:18 hahuang65 joined #git
14:19 cdg_ joined #git
14:19 h12o joined #git
14:20 nixjdm_ joined #git
14:20 jab416171 joined #git
14:21 donmichelangelo joined #git
14:21 cam27 joined #git
14:23 ewitz joined #git
14:26 EvilPenguin joined #git
14:27 Myk267 joined #git
14:27 Literphor joined #git
14:29 osse HyP3r: You can use the post-checkout hook to make it automatic
14:29 masuberu joined #git
14:31 valhalla_22 joined #git
14:32 TomyLobo joined #git
14:33 chase joined #git
14:34 TbobbyZ joined #git
14:34 tarkus joined #git
14:34 fakenerd joined #git
14:35 kaldoran joined #git
14:35 Es0teric joined #git
14:36 acalycine joined #git
14:37 crose joined #git
14:38 jameser joined #git
14:38 jab416171 joined #git
14:40 mymacpro joined #git
14:41 ewitz joined #git
14:43 davidosomething joined #git
14:43 Tobbi joined #git
14:44 shgysk8zer0 joined #git
14:45 nckpz joined #git
14:46 Cabanossi joined #git
14:51 chardan joined #git
14:53 jameser joined #git
14:54 aw1 joined #git
14:54 snowkidind joined #git
14:55 chardan joined #git
14:56 h12o joined #git
14:58 TbobbyZ joined #git
14:58 db8093246 joined #git
15:01 valhall__ joined #git
15:01 AndreaACME joined #git
15:02 valhalla_22 joined #git
15:02 njbair joined #git
15:02 impermanence joined #git
15:04 sarri joined #git
15:04 sarri joined #git
15:05 aw1 joined #git
15:07 kpease joined #git
15:10 fakenerd joined #git
15:11 tcorneli joined #git
15:11 valhalla_22 joined #git
15:12 neunon joined #git
15:14 jameser joined #git
15:15 hash-z3r0 joined #git
15:17 zack_s_ I have a new tag on the repository at origin
15:17 heroux joined #git
15:17 zack_s_ now I want to update my local repo with this tag
15:17 zack_s_ when I do a git pull
15:17 zack_s_ the tag is still not available
15:17 zack_s_ what am I doing wrong?
15:19 osse Trying git fetch --tags
15:19 osse *Try
15:20 nixjdm_ joined #git
15:21 thiago joined #git
15:22 impermanence joined #git
15:22 AndreaACME Hello,  I have a master and loads of commits.  Some of those commits there are branch merges.  One of the merges (in the middle) is wrong and I would like to un-merge it leaving all the rest alone
15:22 acalycine joined #git
15:23 AndreaACME and leaving the branch intact (for later re-merge)
15:23 AndreaACME I have seen many suggesting "git reset --soft "HEAD^""
15:23 AndreaACME others suggesting "git revert --strategy resolve <commit>"
15:24 AndreaACME which way is the best and why?
15:24 pbandark1 joined #git
15:24 osse AndreaACME: There first can't work since the merge you want to undo is not the most recent one
15:24 osse So youre left with the second
15:24 AndreaACME ok
15:25 netj joined #git
15:25 cagomez joined #git
15:26 AndreaACME what would happen with the first one of I use the specific SHA or maybe go back with checkout to SHA
15:26 AndreaACME destroy all the succesive commits?
15:26 osse Yes
15:26 osse !reset
15:26 gitinfo reset does two things! (1) without file/path argument: 'git reset [flags] [<commit>]' = make the current branch point to <commit> (default: HEAD). --soft = don't do anything else. --mixed (default) = overwrite the index to match. --hard = overwrite the working files to match. (2) 'git reset [<commit>] -- <path>' = overwrite the index entries for <path> with the content from <commit> (default: HEAD)
15:26 AndreaACME ok
15:27 AndreaACME what about the second way?
15:27 AndreaACME --strategy resolve   ??
15:27 ozcanesen joined #git
15:28 AndreaACME will that create a load of alternative commits from the modification onwards?
15:28 belmoussaoui_ joined #git
15:28 AndreaACME (the same but without changes made from the bad branch)
15:28 cagomez joined #git
15:29 AndreaACME A   B  C  D'  E'  F'  G' .....
15:29 AndreaACME A   B  D'  E'  F'  G' .....
15:29 AndreaACME actually if the C was the bad one
15:29 osse AndreaACME: The point is using revert. The --strategy option doesn't affekt much
15:30 AndreaACME ok, would that leave trace of this change or will it "delete"?
15:30 dreiss joined #git
15:30 AndreaACME I would like to leave a trace for others to see/understand
15:30 _ikke_ It will
15:30 cagomez joined #git
15:31 _ikke_ It creates a new commit, doing the opposite of the commit being reverted
15:31 hash-z3r0 joined #git
15:31 AndreaACME but it will do it NOW  (lets say at H in time)
15:31 AndreaACME or will it go back, change and then come back to present
15:32 AndreaACME I still have difficulties with changes on history .... sorry
15:32 _ikke_ It will add it now
15:32 GT4066 joined #git
15:32 AndreaACME Ok
15:32 _ikke_ git revert does not change history
15:32 _ikke_ it just creates new history
15:32 AndreaACME kind of ...   A B C D E F G (-C)
15:32 _ikke_ right
15:32 AndreaACME (if C is bad)
15:32 _ikke_ exactly
15:33 AndreaACME ahhhh ok, getting clearer
15:33 AndreaACME so it will not be :   A B D' E' F' G'
15:33 t-mart joined #git
15:33 cagomez_ joined #git
15:33 _ikke_ no
15:33 AndreaACME ok good
15:34 osse AndreaACME: A new commit will be created that does the opposite of the original
15:35 AndreaACME and what if at some time later I would like to implement C again (change of mind) .... which would be the best way to re-revert?
15:35 AndreaACME and leave trace of it
15:35 osse Revert the revert
15:35 AndreaACME the (-C)
15:35 AndreaACME so it will be :   (-(-C)C)
15:36 AndreaACME oh no
15:36 stoner23 joined #git
15:36 TbobbyZ_ joined #git
15:36 AndreaACME ... (-C) H I (-(-C))
15:37 AndreaACME there
15:37 AndreaACME My brain is imploding
15:37 AndreaACME but I think I got the idea
15:38 bronson joined #git
15:38 AndreaACME Thanks osse
15:38 AndreaACME Thanks _ikke_
15:38 dave0x6d joined #git
15:38 AndreaACME (this time I won't thank the bot ... LOL!!)
15:38 osse AndreaACME: It's easier to think of it as just creating a commit that does the opposite
15:39 sondr3 joined #git
15:39 mmlb joined #git
15:41 stoner23 joined #git
15:41 Jackneillll how can i undo git rebase -i HEAD~4 ?
15:44 jameser joined #git
15:44 osse Jackneillll: reset to HEAD@{1} probably. Check the !reflog
15:44 gitinfo Jackneillll: The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
15:45 swalladge joined #git
15:46 stoner23 joined #git
15:47 Murr joined #git
15:48 YuGiOhJCJ joined #git
15:48 brent__ joined #git
15:48 synthroid joined #git
15:50 zumba_addict joined #git
15:51 wohfab joined #git
15:51 acalycine joined #git
15:52 rohitpaulk joined #git
15:59 Jackneillll thanks
15:59 EvilPenguin joined #git
16:00 h12o joined #git
16:01 ahmedsamer joined #git
16:01 madewokherd joined #git
16:02 HardlySeen joined #git
16:03 Noldorin joined #git
16:03 acalycine joined #git
16:05 Ryanar joined #git
16:06 rohitpaulk joined #git
16:09 orbyt_ joined #git
16:10 Masber_080 joined #git
16:10 duderonomy joined #git
16:11 _Bin4ry joined #git
16:12 ohm joined #git
16:13 Quetzal2 joined #git
16:16 hagridaaron joined #git
16:16 Tobbi joined #git
16:19 hahuang65 joined #git
16:19 seishun joined #git
16:20 acalycine joined #git
16:20 nixjdm_ joined #git
16:20 ohm Hey. I'd like to set up a post-checkout/merge hook that sets file/folder permissions of a freshly cloned repo (or a pull) for all users. A quick web search brings up an issue: if I use a client-side hook, every user has to manually add it to their hook/ directory; if I use a server-side hook, I do not have the post-checkout/merge option. How do I achieve this in an automated way?
16:21 j08nY joined #git
16:23 rda-mac joined #git
16:23 Masber_080 joined #git
16:24 belmoussaoui_ joined #git
16:24 InfoTest joined #git
16:24 bitmod joined #git
16:25 rorro joined #git
16:25 relipse joined #git
16:28 duderonomy joined #git
16:28 phanimahesh No solution that I know of that can be done purely in git hooks
16:29 ohm That's what I feared. Would be nice, though.
16:29 h12o joined #git
16:29 peacememories joined #git
16:30 pmercado joined #git
16:30 tnecniv joined #git
16:31 raynold joined #git
16:31 Eugene ohm - you don't. It would be a hilarious security risk for git to set up automatic hooks from inside the repo after a clone
16:32 Eugene ohm - the usual solution is to have a hooks/ directory in your repo, and a script that a user runs post-clone to set up .git/hooks/ as a symlink to hooks/
16:32 Eugene Its not perfect, but eh
16:37 snits joined #git
16:37 star_prone joined #git
16:38 star_prone joined #git
16:38 dviola joined #git
16:39 unCork joined #git
16:44 mikecmpbll joined #git
16:44 star_prone joined #git
16:44 hahuang65 joined #git
16:44 Es0teric joined #git
16:44 star_prone joined #git
16:44 bitmod joined #git
16:44 belmoussaoui_ joined #git
16:45 blahdodo joined #git
16:45 iamthad joined #git
16:48 ribasushi joined #git
16:50 Argylelabcoat joined #git
16:53 hudu joined #git
16:53 math-alpha joined #git
16:54 Macaveli joined #git
16:55 Macaveli joined #git
16:56 belmoussaoui_ joined #git
16:56 hashtagstrashtag joined #git
16:57 TbobbyZ joined #git
16:57 hagridaaron joined #git
16:59 math-alpha joined #git
16:59 cagomez joined #git
17:00 eshlox joined #git
17:00 mikecmpbll joined #git
17:01 h12o joined #git
17:03 peacememories joined #git
17:04 peterppp joined #git
17:04 irqq joined #git
17:05 bybb joined #git
17:05 thiago joined #git
17:06 peterppp hi, I have a branch A and branch B that I regularly rebase on A, and now I accidentally made a number of commits in B that are supposed to be in A
17:06 SteffanW joined #git
17:07 peterppp how can I set things straight again?
17:07 osse peterppp: Cherry pick them to A
17:07 osse Then rebase
17:07 peterppp I'm afraid...
17:08 peterppp ok
17:08 peterppp thank you
17:11 raynold ahh it's a wonderful day
17:14 jaeckel joined #git
17:14 belmoussaoui joined #git
17:14 hagridaaron joined #git
17:14 durham joined #git
17:18 monomon[m] joined #git
17:20 nixjdm_ joined #git
17:20 acalycine joined #git
17:24 str joined #git
17:25 yogiman joined #git
17:26 energizer joined #git
17:27 h12o joined #git
17:29 kadoban joined #git
17:31 hagridaaron joined #git
17:32 relipse joined #git
17:37 Es0teric joined #git
17:38 duderonomy joined #git
17:39 Topic for #git is now Welcome to #git, the place for git help and ______ | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.13.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This space intentionally left ______
17:39 bronson joined #git
17:40 gugah joined #git
17:42 raijin joined #git
17:43 dermoth joined #git
17:44 Tobbi joined #git
17:44 star_prone joined #git
17:46 tchan joined #git
17:46 TbobbyZ_ joined #git
17:47 ecuanaso joined #git
17:47 Ryanar joined #git
17:48 Sharker joined #git
17:52 Fez joined #git
17:56 dege joined #git
17:56 Phylock joined #git
17:56 k999k joined #git
17:57 raijin joined #git
17:57 rohitpaulk joined #git
17:58 Ryanar joined #git
17:58 al-damiri joined #git
17:59 gopar joined #git
18:01 PaulCapestany joined #git
18:02 hotpancakes joined #git
18:02 LeBlaaanc joined #git
18:02 dikiaap joined #git
18:02 unclechu joined #git
18:02 Remramm joined #git
18:02 UncleCJ joined #git
18:02 heftig joined #git
18:02 deepakbn[m] joined #git
18:02 M-meznak joined #git
18:02 aviraldg joined #git
18:02 SpEcHiDe joined #git
18:02 musicmatze[m] joined #git
18:02 waltervargas[m] joined #git
18:02 reactormonk[m] joined #git
18:02 aidalgol joined #git
18:02 am2on joined #git
18:02 dyce[m] joined #git
18:02 dbn[m] joined #git
18:02 spinningarrow[m] joined #git
18:02 hiq[m] joined #git
18:02 flo[m] joined #git
18:02 swalladge[m] joined #git
18:02 jascot[m] joined #git
18:02 patrickr[m] joined #git
18:02 logos[m] joined #git
18:02 KevinMGranger joined #git
18:03 Satchmo1[m] joined #git
18:03 dijit[m] joined #git
18:04 tnecniv joined #git
18:06 thiago_ joined #git
18:06 Pwccx joined #git
18:09 h12o joined #git
18:10 Sasazuka joined #git
18:11 digitalway joined #git
18:14 TbobbyZ joined #git
18:15 czart joined #git
18:15 SpeakerToMeat joined #git
18:17 imack_ joined #git
18:18 Gianormagantrous joined #git
18:18 nixjdm_ joined #git
18:19 sucks joined #git
18:22 nuked0ne joined #git
18:24 johnny56 joined #git
18:24 valhall__ joined #git
18:25 overlord_tm joined #git
18:25 orbyt_ joined #git
18:27 digitalway joined #git
18:28 ForeignBiscuit joined #git
18:28 pmercado left #git
18:28 ForeignBiscuit joined #git
18:28 bitmod joined #git
18:28 ForeignBiscuit joined #git
18:32 h12o joined #git
18:32 TbobbyZ joined #git
18:35 boombatower joined #git
18:39 bwn joined #git
18:41 Ryanar joined #git
18:43 belmoussaoui joined #git
18:46 Cabanossi joined #git
18:49 Phylock joined #git
18:50 styler2go joined #git
18:50 rohitpaulk joined #git
18:52 svm_invictvs joined #git
18:54 Jimmy_Tango joined #git
18:55 Jimmy_Tango What's the best way to keep a python project updated through git on multiple machines?
18:55 qqseo6 joined #git
18:55 relipse joined #git
18:55 _ikke_ It depends on how often you switch, but imo git is not suited to just keep files up-to-date between machines
18:57 Jimmy_Tango I was looking at using an API, that each client checks in with, to see if an updated is needed. Then if so, it would run a script to git pull all the new updates from the master.
18:57 Maskettaman joined #git
18:57 ZyX-I joined #git
18:57 robotroll joined #git
18:58 netj joined #git
19:00 irqq joined #git
19:01 orbyt_ joined #git
19:01 rohitpaulk joined #git
19:01 Jimmy_Tango _ikke_ does that sound like an ok solution?
19:02 fission6 joined #git
19:02 hashtagstrashtag joined #git
19:04 Es0teric joined #git
19:05 Zfih joined #git
19:05 Eugene Jimmy_Tango - !deploy
19:05 gitinfo Jimmy_Tango: 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
19:05 druonysus_ joined #git
19:07 Jimmy_Tango thanks Eugene, I'll look into that.
19:08 iota_pi joined #git
19:08 relipse joined #git
19:08 shinnya joined #git
19:08 Tobbi joined #git
19:09 netj joined #git
19:10 paultreny joined #git
19:10 bambs joined #git
19:10 hagabaka joined #git
19:10 POQDavid joined #git
19:11 gsingh93 joined #git
19:13 hashtagstrashtag joined #git
19:13 Smarticles101 joined #git
19:15 ochorocho_ joined #git
19:15 oxguy3 joined #git
19:18 TheFuzzball joined #git
19:19 nixjdm_ joined #git
19:19 cagomez joined #git
19:20 wilbert joined #git
19:21 bybb joined #git
19:21 Stath joined #git
19:22 TbobbyZ joined #git
19:26 belmoussaoui joined #git
19:27 fission6 joined #git
19:30 rominron_ joined #git
19:30 energizer joined #git
19:31 nibt joined #git
19:31 finalbeta joined #git
19:32 belmoussaoui joined #git
19:32 _ADN_ joined #git
19:33 mikiones joined #git
19:36 basiclaser joined #git
19:37 sparr joined #git
19:37 orbyt_ joined #git
19:40 bronson joined #git
19:41 upperdeck joined #git
19:41 Argylelabcoat joined #git
19:42 finalbeta joined #git
19:43 ertes joined #git
19:45 h12o joined #git
19:47 cdg joined #git
19:47 Murr joined #git
19:49 t-mart joined #git
19:50 Atemu joined #git
19:51 dsdeiz joined #git
19:52 cdg_ joined #git
19:53 acalycine joined #git
19:54 nomad242 joined #git
19:54 Ryanar joined #git
19:55 linuxmodder joined #git
19:56 TbobbyZ joined #git
19:58 EvilPenguin joined #git
19:59 hotpancakes joined #git
20:00 hudu joined #git
20:00 johnny56 joined #git
20:01 paultreny joined #git
20:02 JoshL joined #git
20:03 ecuanaso joined #git
20:04 bambs joined #git
20:05 WhiskerBiscuit joined #git
20:08 cjohnson Jimmy_Tango: fwiw that's a technique I use for developer tooling
20:08 cjohnson It's a long-lived process and every half hour or so it will check git for new changes
20:08 cjohnson and warn the user if they're out of date
20:09 Jimmy_Tango Nice! How do you like the system?
20:09 hotpancakes joined #git
20:09 Brian|2 joined #git
20:10 bigasgit joined #git
20:13 synthroid joined #git
20:13 cjohnson It's not something I would use for production, but it works well for dev tools
20:13 cjohnson I make it print in big bright red letters
20:13 cjohnson then when they show me screenshots with problems I say "look at that bright ass red message saying you're out of date"
20:13 Jimmy_Tango haha that's awesome
20:14 Jimmy_Tango what' would you suggest for production env?
20:14 bigasgit I am cloning some very large git repos from a bare repository in one directory to a regular repository elsewhere on the local filesystem. I do not expect git-upload-pack to be doing a lot of work (and for the clone to be near instantaneous) but for some reason it is taking a long time and git-upload-pack is busy in top.
20:14 cjohnson well for production I believe in a more stable approach and an explicit deployment process
20:14 cjohnson Which can use git but shouldn't necessarily be automated
20:14 tnecniv joined #git
20:14 cjohnson when you tag for release and deploy, it should update all the servers, rather than just hoping they all sorta update after you release
20:15 apotry joined #git
20:16 Jimmy_Tango That makes sense. I'm just looking at different options. Kinda my first time with deploying to other servers without just logging in and doing a git pull master
20:18 nixjdm_ joined #git
20:18 Spydar007 joined #git
20:18 df0 joined #git
20:21 cjohnson In ruby we use capistrano, a quick google tells me this might be comparable for python: https://github.com/dlapiduz/fabistrano
20:21 cjohnson or you could even use capistrano itself: https://github.com/yyuu/capistrano-virtualenv
20:21 Jimmy_Tango What do you think about using docker?
20:21 aruns joined #git
20:21 netj joined #git
20:21 cjohnson It has a lot going for it but it's also a big thing to adopt
20:22 btree joined #git
20:22 Spydar007 joined #git
20:22 Jimmy_Tango for sure. I know it pretty well, and just figured if that's kinda the way the industry is going, might as well get on the train early with my software
20:23 Jimmy_Tango damn should have used the "get on the ship" metaphor. What a missed opportunity
20:25 cjohnson ha
20:25 cjohnson Yeah I mean if it's not too much work for you I think personally it's a good move, it seems a lot more sane
20:25 cjohnson I always liked the concept of "cattle, not pets"
20:25 cjohnson re: servers
20:26 irqq joined #git
20:26 cjohnson You should be fully confident that you can destroy a server and stand another in its place in minutes
20:26 cagomez joined #git
20:29 acalycine joined #git
20:30 jim hi... getting this output... can I attach it back? http://termbin.com/xt0z
20:30 moritz !reattach
20:30 gitinfo Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue
20:30 JeffH joined #git
20:31 JeffH_ joined #git
20:31 Cabanossi joined #git
20:31 rebrec joined #git
20:31 jim any clue as to how it got that way?
20:31 ted_ joined #git
20:32 moritz jim: your shell history should contain the best clues
20:32 JeffH_ Is there a good process to follow when one developer is making interface changes that will affect multiple modules?
20:33 moritz jim: or git reflog
20:33 moritz JeffH_: give the modules versions, and declare dependencies on specific versions
20:33 moritz JeffH_: though I don't know that that has got to do with git
20:35 JeffH_ moritz: unless got provides that infrastructure we don't have anything like that setup. All this code compiles into a single image.
20:35 star_prone joined #git
20:35 JeffH_ Damn autocorrect.
20:35 jim hmm... I think I'm in a bit of trouble here... when I try git checkout master, I get this output (sec, I'll pastebin it)
20:37 cjohnson JeffH: well...start doing that haha
20:37 cdg joined #git
20:37 cjohnson JeffH: it's not git's job to help you properly establish dependencies and inter-related code
20:37 cjohnson read up on SemVer
20:37 cjohnson it's important to follow
20:38 jim http://termbin.com/7a7e
20:38 m0viefreak joined #git
20:38 moritz JeffH: then keep those changes in a branch until you changed all code to use the new API
20:38 h12o joined #git
20:39 cdg joined #git
20:39 gopar joined #git
20:40 cdg__ joined #git
20:41 gopar joined #git
20:41 btree left #git
20:41 Tobbi joined #git
20:41 JeffH moritz: that was my thought. There's some pushback because some modules are going through their own changes and fixing interface updates on a branch may result in work that is obsolete by those changes.
20:42 linuxmodder_ joined #git
20:43 netj joined #git
20:44 Maskettaman joined #git
20:44 JeffH For example. Currently some registrations are all done in one file. This file would need to be updated for the interface changes. Meanwhile, the work on the module has deleted the registration file and implemented it differently.
20:45 moritz big changes always come with some pain
20:45 moritz either duplicate work, breakage, or the need to stop other work at the same time
20:46 Eugene git is not a magic wand that solves workflow / interaction friction. That's a human problem.
20:48 JeffH Rug ene: I know. I'm just trying to figure out a good plan and thought maybe people here had run across similar situations.
20:48 oxguy3 joined #git
20:49 Spydar007 joined #git
20:50 catch22 joined #git
20:50 JeffH We've adopted a "don't break (compilation wise) master". I think that's generally a good thing.
20:52 AndreasLutro JeffH: you could try to configure your CI/CD system to run integration tests when a dependency changes, to catch errors
20:52 JeffH On previous projects (using a different cm tool) we had a work area that we allowed compilation errors as people were integrating.
20:52 AndreasLutro other than that, you could consider merging repositories together - monorepo has been gaining traction the last few years
20:53 moritz JeffH: there's another approach: create a renamed copy of the changed module inside the repo, and switch over to the modified copy bit by bit
20:53 JeffH I'll look into that.
20:53 JeffH Thanks
20:54 olalonde joined #git
20:55 t-mart joined #git
20:56 mr_sm1th joined #git
21:01 cagomez joined #git
21:01 cagedwisdom joined #git
21:03 cagomez joined #git
21:03 dreiss joined #git
21:05 bybb joined #git
21:06 wilbert joined #git
21:06 cagomez joined #git
21:07 sammyo joined #git
21:08 navidr joined #git
21:08 cagomez_ joined #git
21:08 fission6 joined #git
21:09 ohm left #git
21:10 phinxy joined #git
21:14 rorro joined #git
21:16 valhall__ joined #git
21:18 nixjdm_ joined #git
21:18 kus joined #git
21:19 guampa joined #git
21:19 high_fiver joined #git
21:21 atomi joined #git
21:26 shgysk8zer0 joined #git
21:28 WhiskerBiscuit joined #git
21:29 valhalla_22 joined #git
21:30 raijin joined #git
21:31 aw1 joined #git
21:32 stoner23 joined #git
21:36 WhiskerBiscuit joined #git
21:41 bronson joined #git
21:41 orbyt_ joined #git
21:41 valhalla_22 joined #git
21:42 jim hmm... I think I'm in a bit of trouble here... when I try git checkout master, I get this output: http://termbin.com/7a7e
21:44 jim also the archive in question is here (well this is the ssh one, one sec): git@github.com:jwlynch/chords.git
21:44 tnecniv joined #git
21:46 jim https://github.com/jwlynch/chords.git
21:47 Murr joined #git
21:49 dreiss joined #git
21:49 SegFaultAX jim: Still having issues?
21:50 SegFaultAX It looks to me like you made commits on a detached head
21:50 _ikke_ jim: Right, you made several commits on a detached head
21:50 SegFaultAX The error you're getting is because when you change branches those commits will be eligible for gc since no ref points at them
21:50 _ikke_ jim: git branch tmp 910f925
21:51 Darren_ joined #git
21:51 SegFaultAX (You should also figure out why you were in a detached head state)
21:51 jim SegFaultAX, can I attach them to master?
21:52 valhalla_22 joined #git
21:52 _ikke_ jim: sure
21:52 SegFaultAX jim: Sure! Just git checkout master && git merge 910f925
21:52 venmx joined #git
21:52 jim I tried git checkout master
21:53 jim you have the output, which you said meant I commited on a detached head
21:53 SegFaultAX You did
21:53 SegFaultAX You should now be on master. git status to confirm
21:53 jim point being, you have the output :)
21:53 SegFaultAX Once you're on master, you can simply merge those commits onto master.
21:54 jim would that look like one commit?
21:54 quarters joined #git
21:54 SegFaultAX If that commit is not fast forward, then it will probably create a merge commit
21:54 _Bin4ry joined #git
21:55 SegFaultAX If that's not what you want, you may want to create an intermediate branch like _ikke_ suggested and fix it up (eg rebase), then do the merge.
21:56 jim yeah, and it's pretty clear I didn't know what the hell I was doing... :/
21:56 SegFaultAX Hah, no worries
21:56 troulouliou_div2 joined #git
21:56 JackFruh joined #git
21:56 Dougie187 left #git
21:56 SegFaultAX One thing I like to do is use a custom PS1 in my shell that indicates which branch I'm on at any given moment
21:56 SegFaultAX And in particular if I'm in a detached head state
21:56 jim do you see where it talks about 7 commits?
21:56 quarters hello. whenever I try to git add, I get this message "fatal: LF would be replaced by CRLF" which according to the links that I found when looking this message up, is simply a warning that I can disregard.  But the thing is, I can't proceed to commit as the file(s) actually seems to be blocked from being staged without resolution.  I was wondering how I can fix this either in a text editor or in git so that it can be an automatic process
21:57 SegFaultAX jim: That's an unrelated message saying that your current branch (master) is behind the remote tracking branch origin/master by some commits
21:57 quarters the option to configure git to stop blocking, but I'm wondering what kind of debt I'm taking out in doing so
21:57 WhiskerBiscuit joined #git
21:57 jim SegFaultAX, meaning, I need to push them at some point?
21:58 SegFaultAX jim: It says you're currently "behind" which means origin/master has more commits than the local branch
21:58 SegFaultAX So you need to do a pull
21:58 jim the thing is, I have two copies of this repo, one says clean and I'm up to date
21:59 tunekey joined #git
22:00 SegFaultAX jim: It's possible that the other one is up to date, or it simply hasn't fetched the "origin" remote recently and so doesn't know it's behind.
22:00 SegFaultAX You could do `git fetch` in the clean repo to see if it's behind.
22:00 jim can I take the local commit diffs to the clean repo?
22:00 SegFaultAX jim: No need. Just work in the repo with the commits directly :)
22:01 SegFaultAX jim: Also side note: I strongly encourage you to read through this: https://git-scm.com/book/en/v2
22:01 Cabanossi joined #git
22:01 jim is that pro git?
22:01 SegFaultAX Yea
22:01 SegFaultAX It's really excellent IMHO
22:01 jim ok, noted
22:02 jim ok, what do I need to do now?
22:02 SegFaultAX jim: It sounds to me like you need to do 2 things. 1. get your commits made on a detached head onto a branch (master or otherwise) and 2. get your master branch up to date with origin/master
22:02 t-mart joined #git
22:03 SegFaultAX jim: I'm not sure which bit you need help with now.
22:03 SegFaultAX Did you merge those changes onto master?
22:04 hahuang65 joined #git
22:05 jim recently I went from one to the other local copy (because the one I went to is actually in the main project dir
22:05 Hunter1 joined #git
22:05 jim that's where I must have screwed up
22:05 SegFaultAX jim: You're not really screwed up. The state you're in right now is totally common
22:05 SegFaultAX It just sounds scary because git words.
22:06 jim ok, how would I get the commits into master?
22:06 fission6 joined #git
22:06 jim actually
22:07 jim how can I get the commits that I'm behind?
22:07 dsdeiz joined #git
22:07 SegFaultAX Did you do the merge suggested earlier already?
22:07 jim (wouldn't I need to be attached to do that?
22:08 SegFaultAX You're probably on master right now. What does git status say?
22:08 jim no, partly because I'm unsure of my state
22:08 SegFaultAX Does it say "On branch master" on the top?
22:08 CalimeroTeknik joined #git
22:09 SegFaultAX If yes, then getting up to date with origin/master is probably as easy as `git pull`
22:09 HoierM joined #git
22:09 cagomez joined #git
22:10 phinxy joined #git
22:10 jim http://termbin.com/a5lm
22:10 cagomez joined #git
22:10 SegFaultAX jim: Cool, you're on master!
22:10 SegFaultAX jim: It looks like you created the file "f" in the current directory. Maybe you want to delete that? Not sure.
22:11 quarters to reword the question, are there any drawback in setting the git config core.safecrlf to 'warn' from 'true'?
22:11 SegFaultAX In any case, try running `git pull`
22:11 jim ok, SegFaultAX, f is just a pastebinned file
22:11 jim I deleted it
22:12 SegFaultAX jim: Awesome, then you're good to run `git pull`
22:12 SegFaultAX jim: This will do 2 things: 1. fetch down the latest tracking branches from remote "origin" and 2. merge (by default, could also be rebase if you've set that config) those changes from the remote tracking branch origin/master into master.
22:12 jim ok, it looks like it fastforwarded 2 files
22:13 SegFaultAX jim: Awesome, you should now be up to date!
22:13 SegFaultAX quarters: I don't think you should ignore that warning. I'm assuming the file(s) in question were created on a *nix machine, and you're updating them on a windows machine. Is that correct?
22:14 jim what about the 3 commits I didn't push yet?
22:15 jim the ones that were co0mmitted against a detached head
22:15 bambs joined #git
22:15 orbyt_ joined #git
22:16 SegFaultAX jim: So you have a few options here. 1. We can merge them directly into master as is, resolving any merge conflicts along the way. 2. We can create a branch for those changes and push up the branch to your remote. 3. We can create a temporary branch to rework the commits, then fast-forward them onto master.
22:17 SegFaultAX jim: Is your intention to open a pull request?
22:17 SegFaultAX Or to push this code directly to master?
22:17 quarters SegFaultAX: kinda sorta.  I think all the modifying has happened on a *nix machine, in the sense that I'd edit through the linux subsystem on windows using xming
22:17 quarters I don't know where that would put my files at
22:17 jim to push them (I'm the original author)
22:17 SegFaultAX jim: You own the repo?
22:17 jim yeah
22:18 SegFaultAX jim: Then you can simply merge them onto master
22:18 SegFaultAX jim: `git merge 910f925`
22:18 SegFaultAX Will merge those changes onto master
22:18 jim ok... how do I find them? the pull seems to have zapped them
22:18 SegFaultAX Nope the commits are still there.
22:18 nixjdm_ joined #git
22:19 jim in the reflog?
22:19 dave0x6d joined #git
22:19 SegFaultAX The commit in question is 910f925
22:19 SegFaultAX At least according to your original message
22:19 SegFaultAX You can look at it via `git show 910f925` if you want
22:20 quarters can't I simply get git to do the conversion for me?
22:20 SegFaultAX quarters: I think you should consider carefully if the newline separator matters
22:21 raijin joined #git
22:21 SegFaultAX If it does you should not change it. If it's possible that the next person to the edit the file is likely to change it back, you should not change it.
22:21 quarters SegFaultAX: I don't think the newline type matters. If nything, I'd like to opt for the one that's more universal
22:21 quarters just whatever will get rid of the error msg
22:22 quarters that's my main objective
22:22 SegFaultAX Ok then, if you're comfortable with a warning go for it
22:22 quarters I'm crlf / lf / cragnostic
22:22 SegFaultAX I'm just trying to encourage you to be thoughtful about that change
22:22 kbs ah, the road to pain - "just remove the error message"
22:22 SegFaultAX Rather than just squelching the message and YOLOing it
22:23 quarters SegFaultAX: I suppose I don't know the significance of choosing one over the other
22:23 khatri joined #git
22:23 quarters they all get lost in interpretation/compilation anyway, no?
22:23 jim take a look at this,,, http://termbin.com/3vhc
22:24 BSaboia joined #git
22:24 quarters at this point, I'm being forced to pick a side b/t the windows master race or linux tribe
22:24 quarters with no actual material difference in the product
22:24 SegFaultAX jim: Looks normal to me
22:24 SegFaultAX Note @{2} is where you were when you initially asked for help
22:24 quarters or am I off in my thinking about the importance of which newline type I use?
22:25 quarters I guess that's teh crux of my question
22:25 SegFaultAX You're now at the latest origin/master and 910f925 is detached.
22:25 SegFaultAX quarters: It may not matter to you, but it may matter to the thing that consumes the file
22:25 SegFaultAX Like if it's a CSV file and the consumer is expecting \n not \r\n, then you could be in for a bad time
22:26 atomi joined #git
22:26 quarters SegFaultAX: gotcha. that's good to know. so does that mean that it's ill-advised for programmers who work on different platforms to collaborate?
22:26 SegFaultAX That's why I'm saying it's not a *meh just ignore it* decision. But it may also really not matter to you.
22:26 SegFaultAX quarters: No, it just means you should standardize on the newline character.
22:26 jim I think I need @{2..4}
22:26 quarters like one of the terms of a contract would be to agree on a single platform to work with
22:26 jim or wait let me see
22:26 SegFaultAX jim: Yea you'll merge the children of 910f too
22:26 SegFaultAX jim: Just try it :)
22:27 kbs quarters: I don't believe "picking a side" is the issue git is highlighting with the core.safecrlf warning.
22:27 jim sorry, try which?
22:27 SegFaultAX jim: The merge.
22:27 dermoth joined #git
22:28 jim sorry, fairly clueless here... how do I do that?
22:28 SegFaultAX jim: No worries. `git merge 910f925`
22:30 jim hmm, maybe it's happy now
22:30 SegFaultAX jim: Check for your changes :)
22:30 LeBlaaanc joined #git
22:31 SegFaultAX jim: If you want to push them up to github, all you have to do now is `git push`
22:32 jim getting there... yes, time to push
22:32 valhalla_22 joined #git
22:33 jim ahead by 3 commits... the ones I just made
22:33 venmx joined #git
22:34 SegFaultAX jim: w00t :)
22:34 jim that did it; thanks so much
22:34 SegFaultAX jim: Cheers.
22:36 theiostream joined #git
22:37 WhiskerBiscuit joined #git
22:42 sondr3 joined #git
22:43 cagomez joined #git
22:43 phinxy joined #git
22:43 Hunter1 joined #git
22:44 cagomez joined #git
22:45 c0ded joined #git
22:48 nathani_ joined #git
22:51 noobstrap joined #git
22:53 cdg joined #git
22:55 jim ok, some leftover cruft: the chords dir, which is inside chord-drill-ng, is showing clean/uptodate, but status on the surrounding dir says chords has new commits
22:55 CheckDavid joined #git
22:56 doppo joined #git
22:58 scoobert1on joined #git
22:59 mikecmpbll joined #git
23:01 Literphor joined #git
23:01 Cabanossi joined #git
23:02 Oatmeal joined #git
23:03 royal_screwup21 joined #git
23:04 royal_screwup21 what does it mean to "change into the git checkout"? https://devcenter.heroku.com/articles/renaming-apps#updating-git-remotes
23:04 cdg_ joined #git
23:05 rewt royal_screwup21: probably `cd /path/to/repo/`
23:05 royal_screwup21 rewt thanks!
23:07 pkmoore joined #git
23:07 wilbert joined #git
23:07 j08nY joined #git
23:12 hotpancakes joined #git
23:12 neunon joined #git
23:13 netj joined #git
23:17 phinxy joined #git
23:18 phinxy joined #git
23:18 nixjdm_ joined #git
23:20 EvilPenguin joined #git
23:20 Doginal joined #git
23:21 Hunter1 joined #git
23:21 meLon joined #git
23:22 venmx joined #git
23:23 meLon joined #git
23:27 infernix joined #git
23:29 cagedwisdom joined #git
23:32 Masber_080 joined #git
23:32 ahr3n joined #git
23:34 justan0theruser joined #git
23:40 Doginal joined #git
23:42 bronson joined #git
23:43 belmoussaoui joined #git
23:45 tnecniv joined #git
23:45 Kaisyu joined #git
23:47 Murr joined #git
23:47 phinxy joined #git
23:49 Rotaerk joined #git
23:50 hotpancakes joined #git
23:51 madewokherd joined #git
23:55 hoeiu joined #git
23:58 belmoussaoui joined #git
23:58 shgysk8zer0 joined #git
23:58 shgysk8zer0 joined #git

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