Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2018-02-23

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

All times shown according to UTC.

Time Nick Message
00:00 weez17 joined #git
00:05 cagomez joined #git
00:10 ResidentBiscuit joined #git
00:13 shinnya joined #git
00:15 texinwien_ joined #git
00:19 weijin joined #git
00:19 texinwien joined #git
00:19 BlessJah joined #git
00:21 mattcen joined #git
00:21 Kaisyu joined #git
00:26 netj joined #git
00:27 nowhere_man joined #git
00:29 goweol joined #git
00:30 adomas joined #git
00:33 tunekey joined #git
00:33 madewokherd joined #git
00:36 ecuanaso joined #git
00:39 rh10 joined #git
00:40 xcm joined #git
00:41 mborgard joined #git
00:42 sleepingdeforest joined #git
00:42 texinwien_ joined #git
00:43 dpyro joined #git
00:44 akushner joined #git
00:47 goatish joined #git
00:48 thiago joined #git
00:53 ldiamond_ joined #git
00:55 lessless joined #git
00:57 weijin joined #git
01:02 xcm joined #git
01:06 Naan joined #git
01:07 nvh^ joined #git
01:07 weijin joined #git
01:18 foul_owl_ joined #git
01:20 kalos joined #git
01:21 hggeek joined #git
01:23 rjsalts joined #git
01:25 cagomez joined #git
01:26 Naan joined #git
01:29 cagomez joined #git
01:31 xcm joined #git
01:34 weijin joined #git
01:34 Kaisyu7 joined #git
01:36 nvh^ joined #git
01:36 cqi joined #git
01:40 Masterphi joined #git
01:41 mborgard joined #git
01:43 SyntaxxxErr0r joined #git
01:45 stutter_ joined #git
01:46 weijin joined #git
01:47 robattil1 joined #git
01:48 mizu_no_oto joined #git
01:48 minionofgozer_ joined #git
01:51 chaosruler joined #git
01:56 cdown joined #git
01:59 xaxxon joined #git
02:01 tombusby joined #git
02:04 sarri joined #git
02:04 sarri joined #git
02:05 weijin joined #git
02:05 Nysar joined #git
02:05 Mattiaslndstrm joined #git
02:08 igemnace joined #git
02:08 qnord` joined #git
02:10 alyptik joined #git
02:12 Arcaelyx joined #git
02:17 wxg joined #git
02:17 khisanth_ joined #git
02:18 orbyt_ joined #git
02:19 ravndal joined #git
02:19 Nysar joined #git
02:20 supernovah joined #git
02:21 supernovah hey quick question, how to I escape the parenthesis in this so I can search for its occurancein code? git grep -P 'if(0 && W1RE_IN' $(git rev-list --all)
02:21 nvh^ joined #git
02:22 supernovah I don't want it to be literal in the regex syntax and be interpreted as a capture group, I want it to be part of the pattern
02:22 supernovah actually just a backslash works... ciao
02:23 finalbeta joined #git
02:23 thiago supernovah: technically speaking, not a Git question
02:23 thiago what's the issue with that?
02:23 supernovah with what
02:23 thiago are you sure you want -P, instead of -F?
02:24 supernovah I don't know, if its actually using the command line tool 'grep' and passing it into that then yes I want P
02:24 thiago what part of the regexp you need Perl-compatible syntax for?
02:25 durham_ joined #git
02:25 nimomo joined #git
02:27 igemnace vim
02:27 igemnace whoops, mistype
02:27 thiago we have a bot in another channel that responds to "ls"
02:29 sentriz joined #git
02:30 cagomez joined #git
02:36 nimomo joined #git
02:37 YuGiOhJCJ joined #git
02:38 ecuanaso joined #git
02:40 uptime joined #git
02:55 hendry joined #git
02:55 bmh joined #git
02:55 hendry when i try create a new branch, from upstream master, I do something like `git checkout -b NEW upstream/master` and then I get a fatal: Not tracking: ambiguous information for ref refs/remotes/upstream/master
02:55 hendry however NEW is created and my workaround is just to `git checkout NEW` ... so why the fugly messages from git version 2.16.2 ?
02:55 YuGiOhJCJ joined #git
02:58 ilbot3 joined #git
02:58 Topic for #git is now Welcome to #git, the place for git help and platonic remotes | First visit? Read: https://gitirc.eu | Current stable version: 2.16.2 | Getting "cannot send to channel"? /msg gitinfo .voice | What is git love? Oh baby don't commit me, no more.
02:59 learning joined #git
02:59 dreiss joined #git
03:02 tmz hendry: I think that message has been around for quite some time.  It was added in 27852b2c53 ("branch: report errors in tracking branch setup", 2016-02-22).
03:02 tmz I'm not sure if there's something newer which is trying to automatically setup a tracking branch and triggering it now.
03:02 cagomez joined #git
03:02 durham joined #git
03:03 tmz It should only come up if you've got another branch which matches upstream/master, perhaps in multiple remotes or a local branch with that name.
03:03 shinnya joined #git
03:05 hendry tmz: there is only one upstream/master though I do see one for fetch and one for push in `git remote -v`
03:06 drodger joined #git
03:08 tmz Hmm.  So just one result for something like: find .git/refs/ -ipath '*/upstream/master' ?
03:09 tmz (Or probably better: git branch -a | grep upstream/master)
03:09 foul_owl joined #git
03:12 cqi joined #git
03:14 tmz Or git show-ref | grep ..., since I should know the plumbing better
03:14 matsaman joined #git
03:18 hendry tmz: yup, one result
03:18 hendry tmz: https://gist.github.com/kaihendry/b5a58c9f67fe4df79501c23a2e6f1494
03:20 piggah joined #git
03:21 lagothrix joined #git
03:23 tmz hendry: Huh.  I've only run into this when I had multiple refs.
03:24 chachasmooth joined #git
03:26 nimomo joined #git
03:26 tmz You can pass --no-track to avoid the auto tracking too, as another way to band-aid the error.  Obviously, it'd be better to find out why that's being triggered.  Sorry I couldn't be very helpful with that.
03:27 xcm joined #git
03:27 netj joined #git
03:30 canvon joined #git
03:32 cpallares joined #git
03:34 mekhami joined #git
03:34 lessless joined #git
03:35 learning joined #git
03:36 hendry tmz: thanks for hearing me out. ;) `git checkout --no-track -b NEW upstream/master` does indeed avoid the error message
03:37 nimomo joined #git
03:38 f1n4ck joined #git
03:40 f1n4ck joined #git
03:40 kyan joined #git
03:40 goweol joined #git
03:41 relipse joined #git
03:46 relipse__ joined #git
03:48 foul_owl joined #git
03:48 matsaman left #git
03:50 yobop joined #git
03:54 w0ng joined #git
03:54 Adoray` joined #git
03:58 cagomez joined #git
03:58 hggeek joined #git
03:59 alezandro joined #git
04:00 ReenignE- joined #git
04:00 ReenignE- joined #git
04:00 f1n4ck joined #git
04:02 mekhami joined #git
04:04 graingert joined #git
04:05 timwis joined #git
04:06 Meow-J_ joined #git
04:06 Kitana|mobile joined #git
04:07 mborgard joined #git
04:08 boulderjams joined #git
04:12 yobop joined #git
04:12 spacesuitdiver joined #git
04:13 shubhank joined #git
04:13 pTrvr joined #git
04:15 spacesuitdiver joined #git
04:18 f1n4ck joined #git
04:23 f1n4ck joined #git
04:26 MuffinMedic joined #git
04:31 kadoban joined #git
04:38 luckman212 joined #git
04:40 nahtnam joined #git
04:44 dreiss joined #git
04:45 xcm joined #git
04:47 mekhami joined #git
04:47 __red__ joined #git
04:47 boulderjams joined #git
04:47 cpallares joined #git
04:48 wloncom joined #git
04:48 tkazi joined #git
04:50 imack joined #git
04:50 CheckDavid joined #git
04:50 Dodgy-Debaser joined #git
04:51 Raed|Laptop joined #git
04:51 JoshL joined #git
04:54 Darcidride_ joined #git
04:54 Cheeky-Celery joined #git
04:55 menip joined #git
04:56 Darcidride joined #git
04:57 Arcaelyx_ joined #git
04:57 Cabanossi joined #git
05:00 nimomo joined #git
05:01 weijin joined #git
05:01 tunasalad joined #git
05:03 nowhere_man joined #git
05:04 tunasalad left #git
05:05 pks joined #git
05:05 boulderjams joined #git
05:18 __red__ joined #git
05:21 Dodgy-Debaser joined #git
05:24 Cheeky-Celery joined #git
05:25 boulderjams joined #git
05:26 JoshL joined #git
05:26 foul_owl joined #git
05:33 govg joined #git
05:33 pTrvr joined #git
05:34 dustinm joined #git
05:35 pTrvr joined #git
05:44 xcm joined #git
05:48 Moistmelon joined #git
05:53 weijin joined #git
05:54 Nudist69-M joined #git
05:54 jiik joined #git
05:55 jiik joined #git
05:56 diogenese joined #git
05:57 xaxxon_ joined #git
05:59 Doginal joined #git
06:00 weijin joined #git
06:00 pTrvr joined #git
06:06 xcm joined #git
06:10 netj joined #git
06:19 re1 joined #git
06:20 cur8or joined #git
06:20 LocaMocha joined #git
06:22 re1 so I'm trying to clone repo on new EC2 instance
06:22 re1 and git clone hangs indefinitely
06:23 thiago can you ping the host?
06:23 re1 this is the output: https://pastebin.com/BZKPq3Uq
06:24 re1 and it hangs after that line
06:24 aidalgol joined #git
06:24 thiago run this: ssh -v git@github.com
06:24 re1 thiago, what host? if you mean EC2, i'm doing this on its console
06:24 thiago can you ping github.com from your EC2 instance?
06:24 re1 yeah hangs at Connecting
06:25 re1 debug1: Connecting to github.com [192.30.253.113] port 22.
06:26 re1 thiago, no
06:26 re1 ping www.github.com returns nothing
06:26 thiago ok, so not a Git problem
06:26 thiago fix your network
06:26 re1 right
06:27 thiago once you can ping github and ssh connects, telling you "You've successfully authenticated, but GitHub does not provide shell access.", you can ask here for help again
06:32 mikedd joined #git
06:35 guideline joined #git
06:39 piggah joined #git
06:41 Raging_Hog joined #git
06:46 ronskisika joined #git
06:48 nikheizen joined #git
06:59 ecuanaso joined #git
06:59 acresearch joined #git
06:59 guideline joined #git
07:00 acresearch people i am trying to write a command that would download a git project (from a spesific website that prompts for a username and password) instructions are here: http://www.pyrosetta.org/dow but their command is not working
07:01 [Kid] joined #git
07:05 weijin_ joined #git
07:06 wandering_vagran joined #git
07:07 abba joined #git
07:08 cdg joined #git
07:10 akushner joined #git
07:11 widp joined #git
07:11 acresearch left #git
07:12 bmh joined #git
07:14 chat_ joined #git
07:15 cdown_ joined #git
07:17 kgrimes joined #git
07:23 Tobbi joined #git
07:25 sentriz joined #git
07:25 re1_ joined #git
07:29 tarkus joined #git
07:30 Kitana|mobile joined #git
07:31 tjbp joined #git
07:31 Nothing4You joined #git
07:31 nielsk joined #git
07:31 daynaskully joined #git
07:32 n-st joined #git
07:32 WebDawg joined #git
07:33 MuffinMedic joined #git
07:33 raynold joined #git
07:33 Cork joined #git
07:33 justanotheruser joined #git
07:33 uptime joined #git
07:34 f2k joined #git
07:35 ghormoon joined #git
07:35 upperdeck joined #git
07:36 Esoterisch joined #git
07:39 CalimeroTeknik joined #git
07:40 jnavila joined #git
07:41 Luyin joined #git
07:43 bwn joined #git
07:44 dreiss joined #git
07:49 re1 joined #git
07:53 amosbird joined #git
07:53 bmh joined #git
07:53 ronskisika joined #git
07:53 netj joined #git
07:53 JoshL joined #git
07:53 Cabanossi joined #git
07:53 luckman212 joined #git
07:53 lupine joined #git
07:53 Guest53542 joined #git
07:53 quarters joined #git
07:53 cstrahan joined #git
07:53 jsrtr joined #git
07:53 sasheto joined #git
07:53 dino82 joined #git
07:53 lightstalker joined #git
07:53 felixsanz joined #git
07:53 serialoverflow joined #git
07:53 k joined #git
07:53 comptroller joined #git
07:53 nixdork joined #git
07:53 \malex\ joined #git
07:53 maxb joined #git
07:53 PasiFist joined #git
07:53 adamf joined #git
07:53 Awesomecase joined #git
07:53 c0ff33[m] joined #git
07:53 Remramm joined #git
07:53 yanbbyan joined #git
07:53 primeos[m] joined #git
07:53 heroux joined #git
07:53 guardian joined #git
07:53 limbo_ joined #git
07:53 jokester joined #git
07:53 _flow_ joined #git
07:53 matthiaskrgr joined #git
07:53 hegge joined #git
07:53 MacGyver joined #git
07:53 nexxus6 joined #git
07:53 bathtub_shark joined #git
07:53 MD87 joined #git
07:53 grumble joined #git
07:53 murr4y joined #git
07:55 sasheto joined #git
07:56 seschwar joined #git
07:56 phinxy joined #git
07:57 BlessJah joined #git
07:57 Rhonda joined #git
07:57 olivetree_ joined #git
07:57 timvisher joined #git
07:57 watabou joined #git
07:57 sha-2 joined #git
07:57 Chaser joined #git
07:57 APic joined #git
07:57 jerome__ joined #git
07:57 olbat__ joined #git
07:57 hvxgr_ joined #git
07:57 sbeyer joined #git
07:57 zeroed joined #git
07:57 wget joined #git
07:57 liefer joined #git
07:57 andecy joined #git
07:57 sangy joined #git
07:57 toydestroyer joined #git
07:57 nixjdm joined #git
07:57 Ring0` joined #git
07:57 quizzi joined #git
07:57 uebera|| joined #git
07:57 Retropikzel[m] joined #git
07:57 ccaione joined #git
07:57 CEnnis91 joined #git
07:57 aviraldg joined #git
07:57 deepika joined #git
07:57 hiq[m] joined #git
07:57 robin1 joined #git
07:57 albel727 joined #git
07:57 abec0 joined #git
07:57 HolodocPrime joined #git
07:57 antfoo joined #git
07:57 jrm joined #git
07:57 musl_ joined #git
07:57 alphor joined #git
07:57 danmackay joined #git
07:57 Grum joined #git
07:57 habbasi joined #git
07:57 dcpc007 joined #git
07:57 Dyonisos joined #git
07:57 JelmerD joined #git
07:57 timewalker joined #git
07:57 bachler joined #git
07:58 Awesomecase joined #git
07:58 NerdyPepper joined #git
07:58 timewalker joined #git
07:58 timvisher joined #git
07:58 liefer joined #git
07:59 Ring0` joined #git
07:59 Awesomecase joined #git
07:59 Chaser joined #git
07:59 Awesomecase joined #git
08:00 Awesomecase joined #git
08:02 whyme joined #git
08:02 oxymoron93 joined #git
08:02 surial joined #git
08:03 APic joined #git
08:04 seschwar joined #git
08:06 dcpc007 joined #git
08:07 antfoo joined #git
08:07 sha-2 joined #git
08:08 _ADN_ joined #git
08:09 goweol joined #git
08:10 TzilTzal joined #git
08:10 TzilTzal Hi
08:10 coumbole joined #git
08:11 TzilTzal I seem to have a strange problem: I made some changes to a subtree and now when I pull, it seems to incorrectly merge some paths...
08:11 TzilTzal I can't seem to figure out how to fix this.
08:12 dege joined #git
08:12 Cabanossi joined #git
08:15 rh10 joined #git
08:15 MACscr joined #git
08:15 sim590 joined #git
08:15 flaviodesousa joined #git
08:15 venmx joined #git
08:16 Metalindustrien joined #git
08:17 gaucheph joined #git
08:17 pfleck1 joined #git
08:17 cdg joined #git
08:19 staafl joined #git
08:20 foul_owl joined #git
08:22 piggah joined #git
08:22 maxb joined #git
08:22 heroux joined #git
08:22 paultreny joined #git
08:22 krok joined #git
08:22 matthiaskrgr joined #git
08:22 MD87 joined #git
08:22 adamf joined #git
08:22 quarters joined #git
08:22 JoshL joined #git
08:22 jsrtr joined #git
08:22 cstrahan joined #git
08:22 murr4y joined #git
08:22 luckman212 joined #git
08:22 limbo_ joined #git
08:22 netj joined #git
08:22 ronskisika joined #git
08:22 MacGyver joined #git
08:22 bathtub_shark joined #git
08:22 \malex\ joined #git
08:22 grumble joined #git
08:22 bmh joined #git
08:22 lupine joined #git
08:22 dino82 joined #git
08:22 dino82 joined #git
08:22 nixdork joined #git
08:22 quarters joined #git
08:22 quarters joined #git
08:22 jokester joined #git
08:23 felixsanz joined #git
08:23 lightstalker joined #git
08:23 Nizumzen joined #git
08:23 serialoverflow joined #git
08:23 jnavila joined #git
08:24 nexxus6 joined #git
08:27 schleppel joined #git
08:28 Andrew_K joined #git
08:28 guardian joined #git
08:29 Metalindustrien joined #git
08:29 star_prone joined #git
08:29 pokmo left #git
08:32 King_Hual joined #git
08:32 King_Hual joined #git
08:32 dmone joined #git
08:32 ExeciN joined #git
08:32 comptroller joined #git
08:33 abec0 joined #git
08:33 Rhonda joined #git
08:33 Grum joined #git
08:33 Dyonisos joined #git
08:33 hvxgr joined #git
08:33 Dyonisos joined #git
08:33 uebera|| joined #git
08:33 uebera|| joined #git
08:33 quizzi joined #git
08:33 BlessJah joined #git
08:33 wget joined #git
08:33 wget joined #git
08:33 toydestroyer joined #git
08:33 olbat joined #git
08:33 olbat joined #git
08:33 holodoc joined #git
08:33 zeroed joined #git
08:33 CEnnis91 joined #git
08:33 ccaione joined #git
08:33 nixjdm joined #git
08:33 Guest36747 joined #git
08:33 Guest36747 joined #git
08:33 jrm joined #git
08:33 watabou joined #git
08:33 sbeyer joined #git
08:33 _ADN_ joined #git
08:33 jerome__ joined #git
08:33 alphor joined #git
08:33 habbasi joined #git
08:33 andecy joined #git
08:33 robin1 joined #git
08:33 musl_ joined #git
08:33 danmackay joined #git
08:34 sangy joined #git
08:34 _flow_ joined #git
08:37 farsider350 joined #git
08:38 om_henners joined #git
08:38 amosbird joined #git
08:38 whyme joined #git
08:39 Guest83 joined #git
08:40 forgon joined #git
08:40 forgon What is a good practice to remove trailing whitespace from a commit?
08:40 forgon I do *not* want to remove Windows linefeeds.
08:43 _ikke_ You mean from the files in a commit?
08:43 fx250 joined #git
08:44 s17 https://git-scm.com/docs/githooks#_pre_commit
08:46 s17 i don't get many, so i just open the file in my editor and remove the whitespace
08:48 rfuentess joined #git
08:52 klow joined #git
08:52 Seveas s17: sed -e 's/ \+$//' -i path/to/file
08:52 manuelschneid3r joined #git
08:53 leeN joined #git
08:54 kgz joined #git
08:54 Guest83 joined #git
08:54 DaGoaty joined #git
08:56 tarkus joined #git
08:58 mosab joined #git
08:59 floppydh joined #git
09:01 phinxy joined #git
09:01 amosbird joined #git
09:03 jcarpenter2 joined #git
09:04 forgon Perhaps I should write a simple whitespace-fixer program. But it probably would never find users :|
09:04 bobdobbs joined #git
09:05 mikecmpbll joined #git
09:07 landau[m] joined #git
09:09 cstratak joined #git
09:09 cstratak joined #git
09:09 rokups joined #git
09:11 t3kkt0r joined #git
09:12 afuentes joined #git
09:13 Map joined #git
09:14 energizer joined #git
09:14 kurkale6ka joined #git
09:15 coumbole joined #git
09:17 energizer joined #git
09:18 pbandark joined #git
09:18 Map_ joined #git
09:18 kurkale6ka joined #git
09:19 Map- joined #git
09:20 _ADN_ joined #git
09:20 kurkale61 joined #git
09:21 Ast_isolt joined #git
09:24 RougeR joined #git
09:25 Gurkenglas joined #git
09:26 mms_ joined #git
09:27 mms_ when creating new repository in gerrit I wanted to avoid using web ui to setup permissions so thought of using project.config but even after push its not reflecting in web ui
09:31 Seveas mms_: gerrit isn't really the forte of this channel, you may have more luck in #gerrit
09:33 tvw joined #git
09:33 xcm joined #git
09:35 Map- joined #git
09:36 Zialus joined #git
09:36 rvgate joined #git
09:38 eldritch joined #git
09:41 lessless joined #git
09:41 threenuc joined #git
09:43 tonyj joined #git
09:47 NerdyPepper joined #git
09:48 jimmyrcom joined #git
09:49 DaGoaty joined #git
09:49 kgrimes joined #git
09:49 jimmyrcom joined #git
09:52 eldritch joined #git
09:53 venmx joined #git
09:53 jnavila joined #git
09:54 olbat[m] joined #git
09:54 equalunique[m] joined #git
09:54 moonrunes[m] joined #git
09:54 anomie[m] joined #git
09:54 flo[m] joined #git
09:54 noether[m] joined #git
09:54 UncleCJ joined #git
09:54 aspiers[m] joined #git
09:54 primeos[m] joined #git
09:54 cverna_m joined #git
09:54 dikiaap joined #git
09:54 reactormonk[m] joined #git
09:54 apurvapavaskar[m joined #git
09:54 greentrophy[m] joined #git
09:54 patrickr[m] joined #git
09:54 hiq[m] joined #git
09:54 dyce[m] joined #git
09:54 deepika joined #git
09:55 unclechu joined #git
09:55 torarne joined #git
09:55 Demos[m] joined #git
09:55 waltervargas[m] joined #git
09:55 Retropikzel[m] joined #git
09:55 Miguelngel[m] joined #git
09:55 marcoied joined #git
09:55 Techie[m] joined #git
09:55 oftc_ftw joined #git
09:55 Remramm joined #git
09:55 jayking[m] joined #git
09:55 pvn[m] joined #git
09:55 aviraldg joined #git
09:55 KevinMGranger joined #git
09:55 c0ff33[m] joined #git
09:55 yanbbyan joined #git
09:55 Guest97710 joined #git
09:55 cicada3307[m] joined #git
09:55 am2on joined #git
09:55 colonelkrud[m] joined #git
09:55 CedaEI[m] joined #git
09:55 nsc[m] joined #git
09:55 widp joined #git
09:59 nimae joined #git
09:59 tombusby joined #git
10:01 fx250_ joined #git
10:01 tonyj joined #git
10:05 zerox2a joined #git
10:05 plos joined #git
10:07 achadwick joined #git
10:07 anderson joined #git
10:08 cdg joined #git
10:14 zerox2a I am using git on windows to connect to a subversion repository. I am using core.autocrlf =  true. when i add a new file locally with LF line endings and push it to the repository will this end up with CRLF? All of my files need to have LF line endings in the remote svn repository
10:15 zerox2a I am asking because this is what git diff tells me for an LF file: https://bpaste.net/show/6a5d72a1c642
10:15 energizer joined #git
10:16 catsup joined #git
10:16 osse I think that message is misleading
10:16 osse I have never seen Git convert *to* CRLF on commit
10:17 zerox2a or asked the other way around. will every file with CRLF line endings be converted by git to LF when I dcommit them into the remote repository?
10:17 osse I think they might mean that it will have CRLF the next time it is checked out
10:17 xcm joined #git
10:17 IanLiu joined #git
10:17 zerox2a osse: ah that sounds reasonable
10:17 catsup joined #git
10:18 osse I know they will be converted on commit, not sure what dcommit does (not an expert on gitsvn)
10:18 Mike11 joined #git
10:18 weijin joined #git
10:21 fcanela joined #git
10:21 f2k- joined #git
10:26 dermoth joined #git
10:33 bolovanos joined #git
10:34 f2k_ joined #git
10:36 xcm joined #git
10:40 kurkale61 joined #git
10:41 dcpc007 _ikke_: i do a screen to illustrate my yesterday's query on long term branch log : https://pasteboard.cp/H8XoflE.jpg
10:41 dcpc007 users will try to have a graph like that
10:41 dcpc007 (no cross lines)
10:42 dcpc007 but they would query all works done for feature A, without commits from feature B for exemple (git co Feature A; git log xxxx)
10:42 _ikke_ dcpc007: link does not work for me
10:43 _ikke_ dcpc007: NXDOMAIN
10:43 dcpc007 arf, i try,
10:43 dcpc007 .co !
10:43 dcpc007 manual copy
10:43 _ikke_ image not found :p
10:43 dcpc007 i redo ...
10:44 dcpc007 https://pasteboard.co/H8XpZEK.png
10:45 _ikke_ Right, so this is no easy thing to get
10:45 _ikke_ You basically have 3 separate branches there, even though they have the same name
10:45 _ikke_ And those branches have been merged
10:46 dcpc007 ha ok, then as soon as you merge, you "loose" following history on the branch
10:47 _ikke_ They both merge the feature in base and base into the feature
10:47 _ikke_ that makes them equal
10:47 dcpc007 then not possible to "follow" on the long term a subject via git only
10:48 dcpc007 before (like in SVN) they were commit like "[TAG] action in the commit"
10:48 _ikke_ If they would not fastforward feature A, than it would be possible
10:48 dcpc007 and filter with git log | grep [tag]
10:48 _ikke_ But their history would not look as nice as this
10:48 dcpc007 they will work on the 2 feature on the very long term like this
10:49 dcpc007 but they need to merge sometimes for releases
10:50 dcpc007 does a tool like gitlab or bitbucket, could answer this ?
10:50 dcpc007 like creating a long term issue with severals MR inside it, and issue never closed ?
10:50 dcpc007 if git himslef can't answer this need
10:50 uebera|| joined #git
10:50 uebera|| joined #git
10:51 dcpc007 (i have the same need for my adminsys multi-script repo
10:51 dcpc007 but me i delete my local branches after merge :)
10:51 dcpc007 then i use false-tags in commit messages to filter
10:53 _ikke_ dcpc007: http://tpaste.us/oQxR
10:53 _ikke_ If they would develop like that
10:53 _ikke_ then you can easily keep track of branch A
10:55 dcpc007 then in this model : http://nvie.com/posts/a-successful-git-branching-model/, there is not really the long term branchs like 'develop',
10:55 manuelschneid3r joined #git
10:56 dcpc007 yes but, where is feature B work ?
10:57 tetsuo-cpp joined #git
10:58 dcpc007 the goal is to get all the commits from "hump" (not sure of the word) below the 2+ merge of Feature A, and another query for all the "hump" of FEature B
10:58 dcpc007 maybe for one year
10:58 _ikke_ ttp://tpaste.us/Derq
10:59 _ikke_ http://tpaste.us/Derq
10:59 dcpc007 pfff complicated for my knowledges :-(
11:00 _ikke_ I have lunch now
11:00 _ikke_ I'm back later
11:00 Sleepy63 joined #git
11:01 dcpc007 yes same here :)
11:01 dcpc007 good lunch
11:07 jtroseme joined #git
11:07 Cavallari joined #git
11:08 tvw joined #git
11:08 wandering_vagran joined #git
11:08 Cavallari joined #git
11:12 cheater joined #git
11:12 cheater hi
11:13 cheater how can i make git not auto-deduct my committer user name from my linux user name if nothing is set? i want it to prevent a commit from happening. git keeps on setting the wrong user name on new clones and i don't want that. i have to use one of several, depending on project, so i can't use a global config either.
11:16 cheater o that seems relevant https://stackoverflow.com/questions/12292582/how-do-i-make-git-block-commits-if-user-email-isnt-set
11:17 selckin if you set them to empty in ~/.gitconfig, it'll complain on commit, and you can set them in .git/config per repo
11:17 czart joined #git
11:17 cheater git config --global user.useConfigOnly true
11:17 cheater that's what you need
11:18 MatthewAllan93_ joined #git
11:19 phinxy joined #git
11:22 piggah joined #git
11:28 Kitana|mobile joined #git
11:31 grumble joined #git
11:33 shoogz joined #git
11:33 shoogz joined #git
11:34 shoogz joined #git
11:34 shoogz joined #git
11:35 shoogz joined #git
11:35 shoogz joined #git
11:36 _ikke_ dcpc007: http://tpaste.us/B6MY
11:36 shoogz joined #git
11:38 _ikke_ dcpc007: better version: http://tpaste.us/bgPM
11:39 shoogz joined #git
11:40 _ikke_ Read it from left to right
11:40 _ikke_ each 'o' is a commit, each 'M' is a merge commit
11:41 shoogz joined #git
11:41 pbandark joined #git
11:41 _ikke_ dcpc007: in the current workflow, you see that the branches become disconnected after they are merged
11:42 shoogz joined #git
11:43 shoogz joined #git
11:43 rh10_ joined #git
11:50 abba joined #git
11:50 forgon joined #git
11:51 m0viefreak joined #git
11:53 bremner joined #git
11:53 bremner joined #git
11:53 SteffanW joined #git
11:56 coumbole joined #git
11:59 learning joined #git
12:00 SteffanW joined #git
12:01 x1b4_ joined #git
12:01 konsolebox joined #git
12:03 xcm joined #git
12:03 x1b4_ joined #git
12:04 Kitana|mobile joined #git
12:06 Kitana|mobile_ joined #git
12:07 skisela joined #git
12:12 x1b4_ joined #git
12:13 DaGoaty joined #git
12:14 x1b4_ joined #git
12:16 chaosruler joined #git
12:17 lessless joined #git
12:21 nlos joined #git
12:22 finalbeta1 joined #git
12:23 jnavila joined #git
12:28 ZyX-I joined #git
12:30 manuelschneid3r joined #git
12:30 jtroseme joined #git
12:30 M6HZ joined #git
12:33 bmh joined #git
12:33 piggah joined #git
12:35 borkr joined #git
12:41 _abs_ joined #git
12:41 goatish joined #git
12:43 stoopkid joined #git
12:45 cheater left #git
12:46 dcpc007 ha ok, and you remerge master to Feat-A
12:46 dcpc007 never think on that, i was rebase Feat-A on master
12:47 dcpc007 then you can filter the lag
12:48 bmh joined #git
12:49 _ikke_ git log --oneline --first-parent Feat-A
12:52 Kitana|mobile joined #git
12:52 VladGh joined #git
12:56 xcm joined #git
12:56 jnavila joined #git
12:56 shinnya joined #git
12:57 Kitana|mobile joined #git
13:04 x1b4_ joined #git
13:05 VladGh joined #git
13:05 synthroid joined #git
13:12 xcm joined #git
13:17 weijin joined #git
13:19 f2k joined #git
13:20 bsanford joined #git
13:22 ghost43 joined #git
13:23 joo joined #git
13:24 wreed joined #git
13:29 cebor joined #git
13:30 CalimeroTeknik joined #git
13:30 mborgard joined #git
13:31 i336 joined #git
13:33 sQVe joined #git
13:34 NerdyPepper joined #git
13:36 CodeSlingerPaul joined #git
13:36 black_13 joined #git
13:37 YuGiOhJCJ joined #git
13:38 coumbole joined #git
13:39 weijin joined #git
13:39 cdown joined #git
13:40 cebor joined #git
13:45 sQVe joined #git
13:48 black_13 what is fast forwarding
13:49 tango_ when you merge another branch and you have no new stuff
13:49 black_13 "stuff"
13:49 tango_ commits
13:49 _ikke_ black_13: It means git just moves branches, instead of creating a separate merge commit
13:49 _ikke_ !ff
13:49 gitinfo A fast-forward merge occurs when you merge a commit which is a descendant of !HEAD. No new commit is created, instead the branch is simply moved forward. See http://sandofsky.com/images/fast_forward.pdf
13:51 llorephie joined #git
13:51 topdownjimmy joined #git
13:51 cdg joined #git
13:54 xcm joined #git
13:56 black_13 is there a way to have git log show a tree but strip off comments and any company proprietary info so that I can post it to a pastebin and ask questions about it here.
13:56 black_13 git log --pretty=format:"%h" --graph
13:57 i336_ joined #git
14:01 Green_Crystal joined #git
14:03 goatish joined #git
14:03 MacGyver joined #git
14:07 abba joined #git
14:08 AndresInSpace joined #git
14:08 RougeR joined #git
14:08 RougeR joined #git
14:09 Green_Crystal joined #git
14:10 tombusby joined #git
14:11 royal_screwup21 joined #git
14:12 royal_screwup21 so I'm being to provide a commit message on a text file which I did, but I'm not sure what to do next. I saved the file, typed enter on the command line but nothing's happening
14:12 royal_screwup21 how do I fix this?
14:13 _ikke_ sorry, what did you do exactly?
14:14 mborgard joined #git
14:14 royal_screwup21 so I did git pull origin master, filled in my credentials, then was asked to provide a commit message on a textfile  explaining why I was merging two branches
14:15 canton7 which text editor?
14:15 _ikke_ vim?
14:15 royal_screwup21 I wrote up the message on the textfile, saved it, but I'm not sure how to proceed
14:15 royal_screwup21 sublime
14:15 _ikke_ ah
14:15 canton7 right, you need to close it after you've saved
14:15 _ikke_ you have to close the file
14:15 royal_screwup21 wow
14:16 royal_screwup21 feel incredibly dense
14:16 royal_screwup21 left #git
14:20 stutter_ joined #git
14:20 anjen joined #git
14:26 weijin joined #git
14:26 bytefire joined #git
14:27 dcpc007 _ikke_: i'll create a fake repo to make test, user has only local data like this.
14:28 dcpc007 and i ask him to get specific exemples he needs
14:28 SSgtSpoon_ joined #git
14:28 mustmodify___ left #git
14:28 aielima joined #git
14:29 dcpc007 the project has many files, some are shared between 2 chapter of dev, and some are specific. The guy would show all the history he has done only for its part of the project ...
14:29 bytefire hi, how does ssh auth in git work? i have put id_rsa.pub public key inside server's /home/git/.ssh/authorized_keys. what happens when i do `git push origin master` from a client? here origin is: git@git-servers-ip:/srv/my-proj
14:29 dcpc007 but i suspect too that creating milestones or release version with explicit content could help them to find back something
14:30 skisela_afk joined #git
14:30 beerdrop joined #git
14:31 _ikke_ bytefire: git offloads everything to ssh
14:31 dcpc007 i understand it could be cool to show the whole work done on a specific domain in the project (like all the database structure work), without all the other commits
14:31 _ikke_ bytefire: So it should work exactly the same as normal ssh
14:31 bytefire _ikke_: ah okay, so for that to work, i should be able to do a passwordless ssh into the git server machine?
14:32 _ikke_ yes
14:32 bytefire thanks!
14:34 royal_screwup21 joined #git
14:35 _ikke_ dcpc007: then you need to add identifiers to the commits
14:35 relipse joined #git
14:35 dcpc007 yes, that's what i use, but, a little ugly and longer lines
14:36 dcpc007 note that currently they don't use anything but git. No issue/tracker/....
14:36 dcpc007 i asked him to get some real examples, and we'll see what is possible then
14:37 dcpc007 maybe not what he was thinking
14:38 rwb joined #git
14:40 theoceaniscool joined #git
14:40 aielima joined #git
14:44 DelTree is there a way to get rid of the star in "git branch --list" without sed-ing it away ?
14:44 freimatz joined #git
14:44 denete joined #git
14:45 EgS joined #git
14:45 dcpc007 _ikke_: git log --oneline --first-parent Feat-A is done after a git checkout Feat-A or from master ?
14:45 kneeki joined #git
14:45 nikivi do I have to resolve spaces in .gitignore?
14:45 canton7 DelTree, use one of the plumbing commands if you're putting it into a script, like man git for-each-ref
14:45 gitinfo DelTree: the git-for-each-ref manpage is available at https://gitirc.eu/git-for-each-ref.html
14:45 nikivi If I have this line: /sublime/Package Control.cache
14:45 _ikke_ nikivi: resolve spaces?
14:45 denete joined #git
14:45 nikivi Will it git ignore it?
14:45 weijin joined #git
14:46 nikivi or I need \sublime/Package\ Control.cache
14:46 _ikke_ gitignore should handle spaces in paths just fine
14:46 bmh joined #git
14:48 DelTree canton7: oh thank you... I had no idea this existed...
14:48 jottr joined #git
14:48 citral joined #git
14:49 TomyWork joined #git
14:50 arooni joined #git
14:51 canton7 DelTree, the stuff listed under 'porcelain commands' in man git generally aren't intended for use in scripts
14:51 gitinfo DelTree: the git manpage is available at https://gitirc.eu/git.html
14:51 rabalMoreno joined #git
14:51 pirocks joined #git
14:51 sz0 joined #git
14:52 DelTree canton7: I didn't really expect commands dedicated to scripting...
14:52 np_complete joined #git
14:52 madewokherd joined #git
14:54 nimomo joined #git
14:55 canton7 DelTree, yeah, a lot of the porcelain commands call (or used to, any any rate) the plumbing commands
14:58 bmh joined #git
14:59 denete joined #git
14:59 weijin joined #git
15:00 Mike11 joined #git
15:00 thiago joined #git
15:00 jwynn6 joined #git
15:02 Luyin so I am trying to merge a UTF-16LE file with git. set up Beyond Compare as the mergetool like this: https://paste.xinu.at/7pW/. diffing two commits works flawlessly, but merging shows really weird symbols on the REMOTE side: https://paste.xinu.at/MAmMF/. So I guess I'm doing something wrong
15:07 Mike11 joined #git
15:07 nimomo joined #git
15:07 moei joined #git
15:09 pfleck joined #git
15:09 crose joined #git
15:09 grawity Luyin: are both files with the BOM?
15:09 grawity looks like Beyond Compare misdetects the other file as UTF-16BE
15:10 Kaj joined #git
15:10 Luyin grawity: I'm not sure I understand. Is the difference between little endian and big endian the absense/presense of the BOM?
15:10 grawity no
15:11 greggerz joined #git
15:11 grawity but the BOM makes it much easier for programs to detect which one it is
15:11 Luyin ah ok
15:11 Luyin let me check what file says
15:11 grawity that's what it is – a byte-order mark
15:11 manuelschneid3r joined #git
15:13 Luyin hmm, is there a way for me to use file on a file of another branch?
15:13 grawity use it on the temporary file that git extracted for you
15:14 Luyin the one in my WD is "Little-endian UTF-16 Unicode text, with very long lines, with CRLF line terminators"
15:14 grawity file G:\[blacked out]MAIN_REMOTE_7440.txt
15:14 pfleck joined #git
15:14 liefer I love sourcetree, amazing git client, but just a PSA: Never ever ever try to use multiple github accounts with it - it will break it forever. Re-installing and manually deleting settings is not enough to repair it. Damn...
15:15 mikecmpb_ joined #git
15:15 liefer unbelievable
15:15 geri joined #git
15:15 geri hi, how to make a git repo a dependency of another git repo?
15:16 liefer geri, maybe you can use submodules?
15:16 grawity Luyin: based on my tests, `file` recognizes *only* UTF-16 with BOM
15:16 geri liefer: are those easy to use?
15:16 geri liefer: like can i tag the version which needs to be checked out?
15:17 grawity Luyin: so if it says "Little-endian UTF-16", that means UTF-16LE with BOM, and if says "data", that can be UTF-16LE without BOM, or UTF-16BE without BOM, or anything else
15:17 grawity geri: yes that happens by default with submodules
15:17 liefer geri, Sorry im not sufficiently experienced to feel comfortable advising you.... Just pointing you in a direction :)
15:17 Luyin https://paste.xinu.at/UsTnGq/ grawity
15:17 geri grawity: more or less like that? git submodule add https://github.com/<user>/rubber-band rubber-band git commit -m "rubber-band submodule"
15:18 grawity Luyin: looks like it's even more mixed up – the remote file is UTF-8, and your mergetool is trying to interpret it as UTF-16
15:18 grawity geri: yes
15:19 weijin joined #git
15:19 grawity though
15:19 topdownjimmy joined #git
15:19 grawity git submodule add <url> <dir>; cd <dir>; git checkout <whatever_version_you_want>; cd ..; git add <dir>; git commit -m "add submodule"
15:20 Luyin grawity: it shouldn't be UTF-8 :-/ I only wanted it to be utf-8 for the purpose of diffing, so I followed the advice from Git Pro: https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes (section "Diffing Binary Files")
15:20 grawity uh, which part of it
15:20 grawity if it's text, what does it have to do with this section entirely?
15:21 grawity maybe the mergetool would have guessed the encoding
15:21 Luyin well since it's utf-16, not utf-8, git normally recognises it as "binary"
15:21 RougeR joined #git
15:21 RougeR joined #git
15:21 Luyin so I had to add the diff sections in my config (see link above) to make the changes visible
15:21 Silenced joined #git
15:21 Luyin but as far as I understood, it also creates temporary copies from the files to be diffed, which are converted. the original file itself remains utf-16
15:22 grawity that section talks about MS Word files
15:22 jimi_ joined #git
15:22 Luyin I know
15:23 grawity hmm I'm not sure if you really need textconv
15:23 grawity "*.txt text encoding=utf-16le" in .gitattributes might have been enough
15:24 Luyin hmm I see
15:24 Luyin I'll give that a try
15:25 Luyin I've been struggling with this file for over a week now :-/
15:25 spacesuitdiver joined #git
15:25 Arguggi joined #git
15:25 rapha joined #git
15:25 rapha hi!
15:25 Luyin hi rapha
15:26 rapha is it possible to tell git-lfs to replace all the actual files with empty versions in just the local clone? (to save some space while still knowing what file names are all in the repo)?
15:27 threenuc joined #git
15:31 Raul joined #git
15:31 borkr joined #git
15:34 crose joined #git
15:36 al-damiri joined #git
15:37 synthroid joined #git
15:37 jready joined #git
15:39 lauthals joined #git
15:43 pfleck1 joined #git
15:44 Sonarpulse joined #git
15:44 Es0teric joined #git
15:49 markzen left #git
15:49 mos3abof joined #git
15:50 _ikke_ Not a lot of lfs users here
15:51 dcpc007 _ikke_: git log --oneline --first-parent Feat-A doen't work (french error message)
15:51 sim590 joined #git
15:51 _ikke_ that command can only fail if Feat-A does not exist
15:51 Raed|Laptop joined #git
15:52 weijin joined #git
15:52 eduardas_m joined #git
15:54 jimi_ joined #git
15:57 Arcaelyx joined #git
15:58 jwmann joined #git
15:59 dendazen joined #git
15:59 dcpc007 fatal: argument 'featA' ambigu : révision et chemin spécifiés.
15:59 dcpc007 Utilisez '--' pour séparer les chemins des révisions, comme ceci :
15:59 dcpc007 'git <commande> [<révision>...] -- [<chemin>...]'
16:00 yn joined #git
16:00 jimi_ joined #git
16:00 dcpc007 revision & paths specified (use -- to separate)
16:00 sonOfRa that seems to imply you used featA, rather than Feat-A?
16:00 dcpc007 i try prepare a paste
16:00 dcpc007 yes
16:02 sonOfRa Also try "LC_ALL=C <complete command>" That should yield an english error message
16:02 GoBear joined #git
16:02 phluks joined #git
16:03 dcpc007 graaaaaaaah failed my merge ..... forget the no-ff option :-(
16:04 kpease joined #git
16:04 Luyin grawity: the idea with text and encoding didn't work so well, no our IDE can't open the files anymore :-/ I'll try again without the text attribute
16:04 weijin joined #git
16:05 dcpc007 ok repaired
16:06 Silenced joined #git
16:06 dcpc007 https://pasteboard.co/H8ZwRbT.png
16:06 dcpc007 the whole tree
16:07 dcpc007 i simulate 3 part : featA -> featB -> featA
16:07 dcpc007 ha ... better now
16:09 dcpc007 i add a -> featB
16:09 dcpc007 but will be complicated for users to do all those merges
16:09 dcpc007 think they really need to evaluate if they need this
16:09 publio joined #git
16:12 dcpc007 outch, a git lg is ugly now :(
16:13 awygle joined #git
16:13 mikecmpbll joined #git
16:13 dcpc007 https://pasteboard.co/H8ZzD7Y.png
16:13 milli joined #git
16:13 adymitruk joined #git
16:14 dcpc007 your commands works
16:14 dcpc007 https://pasteboard.co/H8ZA87c.png
16:15 yaewa joined #git
16:17 dcpc007 on gitkraken client : https://pasteboard.co/H8ZBcyU.png
16:18 akyshnik joined #git
16:18 jottr_ joined #git
16:19 fekir joined #git
16:22 synthroid joined #git
16:23 dcpc007 i sent report to user ... we'll look monday
16:23 lessless joined #git
16:26 timewalk1r joined #git
16:26 nowhereman_ joined #git
16:28 rafasc joined #git
16:29 weijin joined #git
16:30 llorephie joined #git
16:34 iNCoNFuN joined #git
16:38 yobop_ joined #git
16:39 weijin joined #git
16:40 alezandro joined #git
16:41 IchigoBlack joined #git
16:43 minionofgozer_ joined #git
16:44 peepsalot joined #git
16:45 kes joined #git
16:48 orbyt_ joined #git
16:50 nimomo joined #git
16:50 Mattiaslndstrm joined #git
16:51 IanLiu joined #git
16:51 nephyrin joined #git
16:53 guideline joined #git
16:54 Masterphi joined #git
16:55 Some_Person left #git
16:58 wandering_vagran joined #git
16:59 timewalk1r joined #git
17:00 nimomo joined #git
17:00 timewalk1r joined #git
17:02 orbyt_ joined #git
17:02 ferdna joined #git
17:04 weijin joined #git
17:05 applecrumble joined #git
17:05 max3_ joined #git
17:05 dpyro joined #git
17:06 Peetz0r joined #git
17:06 jottr_ joined #git
17:06 nvh^ joined #git
17:07 Luyin and it didn't work...sigh
17:07 Luyin is the git mailing list a good place to ask a question? or is it rather used for development?
17:08 timewalk1r joined #git
17:08 dreiss joined #git
17:09 Masterphi joined #git
17:10 nimomo joined #git
17:10 s17 lurk and find out
17:11 s17 proper netiquette
17:11 Chaosruler joined #git
17:11 \void joined #git
17:11 Kitana joined #git
17:11 Luyin don't have the time to wait long, unfortunately. if I don't get this shit working by monday, we're probably going back to using a thousand copies instead of any version control.
17:11 _ikke_ Luyin: It's perfectly fine to ask questions there
17:12 Luyin thx _ikke_!
17:12 _ikke_ they are very polite over there
17:13 lessless joined #git
17:13 czart_ joined #git
17:15 Luyin I'd actually pay somebody to fix this stuff for me here :D
17:16 spacesui_ joined #git
17:17 _ikke_ utf-16 issues?
17:17 _ikke_ I think enough people help you for free if you ask the right question to the right people
17:18 _ikke_ The git mailing list is full of people that are facing similar issues
17:19 Luyin hehe, I'm trying to figure out the right question
17:20 nimomo joined #git
17:20 Luyin and yes, it seems to be utf16, OR the line ending problem (if you've been around, you'll probably have seen that I've asked several differing questions). It seems like I fix the one problem, and then the other one returns :-/
17:21 _ikke_ right, I've seen the questions, but not all the details
17:22 Luyin yeah I'm even struggling to get the details myself, as I've tried around with so many different options now
17:22 Kitana joined #git
17:22 mos3abof joined #git
17:22 Luyin and I actually want to call it a day and get to my wife and kid now :D
17:22 anjen joined #git
17:22 _ikke_ heh
17:22 _ikke_ Just try to provide as much details and observations as possible
17:23 Luyin yeah I wil. thanks for the advise
17:23 _ikke_ With a bit of luck, they'll know what questions to ask next
17:23 Luyin *will even
17:24 xcm joined #git
17:25 ryanjohnstonyyc joined #git
17:28 Darcidride_ joined #git
17:28 bttf joined #git
17:29 jnavila joined #git
17:32 xcm joined #git
17:33 bmh joined #git
17:34 EvilPenguin joined #git
17:34 KeyJoo joined #git
17:35 nowhere_man joined #git
17:36 weijin joined #git
17:36 thiago joined #git
17:37 forgon joined #git
17:39 SteffanW joined #git
17:40 durham joined #git
17:41 Darcidride_ joined #git
17:49 gpiccoli joined #git
17:50 Cavallari joined #git
17:50 gpiccoli Hi folks, have a quick question that is bugging me. Is there a way to use git describe --contains to return the 1st annotated tag that has the commit instead of lightweight one?
17:50 weijin joined #git
17:53 _ikke_ git describe only describes annotated tags by default
17:53 theoceaniscool joined #git
17:54 dpyro joined #git
17:58 cdown_ joined #git
17:58 kpease joined #git
18:02 zzz joined #git
18:05 raynold joined #git
18:05 ProfMac joined #git
18:05 Praxi joined #git
18:06 Soliton joined #git
18:06 raynold joined #git
18:09 weijin joined #git
18:10 Gurkenglas joined #git
18:10 gpiccoli the contains implies --tags isn't it?
18:10 gpiccoli --tags allows lightweight ones AFAIK
18:10 gpiccoli _ikke_ ^
18:11 AlexCDev joined #git
18:11 pirocks joined #git
18:13 jottr_ joined #git
18:13 Es0teric joined #git
18:16 AlexCDev Does a branch exist on the server if no commits have been made to it?
18:17 Esoterisch joined #git
18:17 BSab joined #git
18:17 AlexCDev If I've just run git branch whatever but not committed anything to that branch
18:18 thiago AlexCDev: a branch points to a commit
18:18 thiago by definition
18:19 thiago corollaries: if it exists, it has commits
18:19 thiago if it has no commits, it doesn't exist
18:19 Masterphi joined #git
18:19 ukleinek joined #git
18:21 ukleinek hello, I have a repository here were (with alternates) some objects got lost. When running $(git fsck --connectivity-only --no-dangling --name-objects) I get lines like:
18:21 ukleinek missing commit a353d85dc365764a6ab7eab3e929518c3a61d627 (~24^2)
18:21 ukleinek either there is something broken or I don't understand the last part of these lines.
18:21 heym0e joined #git
18:22 ukleinek can somebody explain or confirm it's a bug?
18:22 weijin joined #git
18:22 heym0e joined #git
18:23 RougeR joined #git
18:23 kpease_ joined #git
18:23 Es0teric joined #git
18:25 sanscoeur joined #git
18:26 _ikke_ ukleinek: remove existing acknowledgements
18:26 _ikke_ ukleinek: it's not a boolean
18:27 Seveas ukleinek: the most common case is that a gc in the alternate wiped a commit that's no longer needed in that alternate but is still used in the refering repo.
18:27 Seveas ukleinek: and ~24^2 is described in man gitrevisions. It means "follow the leftmost parent 24 commits back and then take the second parent of the merge commit
18:27 gitinfo ukleinek: the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html
18:27 olivetree_ joined #git
18:28 llorephie joined #git
18:28 Seveas AlexCDev: !soviet_git
18:28 gitinfo AlexCDev: In Soviet Git, commits are not on branches, branches point to a commit.
18:28 jready joined #git
18:28 Seveas In git, a branch is no more than a pointer to a commit.
18:29 Kaj joined #git
18:29 jtroseme joined #git
18:30 MACscr joined #git
18:31 Seveas gpiccoli: /win 20
18:31 Seveas err. whoops
18:31 jtroseme joined #git
18:31 _ikke_ Seveas: use alt+j 20 :P
18:31 Seveas gpiccoli: I would have guessed that --contains --no-tags would do the right thing. Sadly, it does not.
18:31 mborgard joined #git
18:32 mostlybadfly joined #git
18:32 Seveas _ikke_: that don't work in irssi :)
18:32 gpiccoli oh, nice Seveas
18:32 gpiccoli so, it's an issue or expected?
18:32 mostlybadfly joined #git
18:33 Seveas gpiccoli: I'd call it an issue, but would have to look in more detail to see if this is intentional :)
18:33 mostlybadfly joined #git
18:33 theskillwithin joined #git
18:33 mostlybadfly joined #git
18:34 _ikke_ Seveas: Time to switch to weechat then :D
18:34 gpiccoli hehe cool, tnx Seveas
18:34 gpiccoli So, I might take a look too
18:34 mostlybadfly joined #git
18:35 BrAsS_mOnKeY joined #git
18:35 mostlybadfly joined #git
18:35 ludovicchabant joined #git
18:36 SweatyMalone joined #git
18:36 mostlybadfly joined #git
18:36 tchan1 joined #git
18:36 philipp64_ joined #git
18:37 atrus joined #git
18:37 mostlybadfly joined #git
18:37 JJonah_ joined #git
18:37 KnownSyntax_ joined #git
18:37 fxrs_ joined #git
18:37 fury__ joined #git
18:37 Lowell_ joined #git
18:38 Puffball joined #git
18:38 mostlybadfly joined #git
18:38 andres_f joined #git
18:38 Bigcheese_ joined #git
18:38 tchan1 left #git
18:38 wget_ joined #git
18:38 mostlybadfly joined #git
18:39 cdg joined #git
18:39 digisho joined #git
18:39 mostlybadfly joined #git
18:39 hvxgr_ joined #git
18:39 pmcnabb_ joined #git
18:39 linus1 joined #git
18:40 mostlybadfly joined #git
18:40 BlessJah_ joined #git
18:40 robogoat_ joined #git
18:40 Ring0`` joined #git
18:40 mostlybadfly joined #git
18:40 jrm2 joined #git
18:41 mostlybadfly joined #git
18:41 mostlybadfly joined #git
18:42 tchan joined #git
18:42 philipp64_ joined #git
18:42 petemoore_ joined #git
18:42 mostlybadfly joined #git
18:43 mostlybadfly joined #git
18:43 zapb__ joined #git
18:43 m1r4g3_ joined #git
18:43 stnutt_ joined #git
18:43 malt3_ joined #git
18:43 meZee- joined #git
18:43 Cthalupa- joined #git
18:43 zeroed- joined #git
18:43 olbat__ joined #git
18:43 d^sh_ joined #git
18:43 HolodocPrime joined #git
18:43 njbair_ joined #git
18:43 BlackPan- joined #git
18:43 jimInDevNull_ joined #git
18:43 pagios_ joined #git
18:43 ^MillerBoss- joined #git
18:44 BucciaratiVEVO joined #git
18:44 whyme_ joined #git
18:44 Trieste_ joined #git
18:44 sha-2_ joined #git
18:46 SCHAPiE joined #git
18:46 philipp64_ left #git
18:46 mostlybadfly joined #git
18:46 matsaman joined #git
18:47 mostlybadfly joined #git
18:47 weijin joined #git
18:47 dege joined #git
18:47 mostlybadfly joined #git
18:48 philipp64 joined #git
18:48 mostlybadfly joined #git
18:49 mostlybadfly joined #git
18:49 ^MillerBoss joined #git
18:49 cdown_ joined #git
18:49 nvh^ joined #git
18:49 pks joined #git
18:49 Mindi joined #git
18:49 xz left #git
18:50 mostlybadfly joined #git
18:50 nvh^ joined #git
18:50 mlopezviedma joined #git
18:50 ScioMin joined #git
18:51 mostlybadfly joined #git
18:51 nixjdm joined #git
18:51 ChrisADR joined #git
18:51 deltam joined #git
18:51 Guest21 joined #git
18:51 AfroThundr joined #git
18:51 Mighty_Warthog joined #git
18:51 Random832 joined #git
18:51 ScioMin hi all. I've set a different username/email for a specific git repo. But when I git push it still tries to use global username. Ubuntu here.
18:51 Myk267 joined #git
18:52 WakiMiko joined #git
18:52 mostlybadfly joined #git
18:52 Arguggi joined #git
18:52 watabou joined #git
18:52 Fissure joined #git
18:52 _ikke_ ScioMin: git's configured user.name config is not a username
18:52 primeos[m] joined #git
18:52 nuc joined #git
18:53 teej joined #git
18:53 mostlybadfly joined #git
18:53 CedaEI[m] joined #git
18:53 antismap joined #git
18:53 yanbbyan joined #git
18:53 ScioMin _ikke_, humm interesting. it's just an alias to show on commit?
18:53 hexa- joined #git
18:54 matsaman left #git
18:54 kgz joined #git
18:54 deltam joined #git
18:55 weijin joined #git
18:55 Seveas ScioMin: user.name/user.email only go into commit author/commiter fields in commits. If you want to use a non-default username for pushing, put it in the remote url (or the ssh config if pushing over ssh)
18:56 ScioMin Seveas, ty i'll read about ssh since i'm not using HTTPs
18:56 jwest joined #git
18:56 mostlybadfly joined #git
18:56 mostlybadfly joined #git
18:56 Seveas ScioMin: for ssh you can stick it in the url too: ssh://user@host/path/to/repo
18:57 Seveas or user@host:path/to/repo
18:57 ScioMin i did. remove -v shows the correct username but it still uses global
18:57 ScioMin Seveas, seems like this might do: https://gist.github.com/jexchan/2351996
18:57 ScioMin i'm reading
18:57 forgon joined #git
18:57 mostlybadfly joined #git
18:57 ScioMin remote*
18:57 Seveas if you're using github, the username is *always* git
18:57 kneeki joined #git
18:58 Seveas users are identified by their public key
18:58 mostlybadfly joined #git
18:58 ScioMin humm perhaps I have the wrong key uploaded. ty i'll try reuploading it
18:58 cdown_ joined #git
18:59 mostlybadfly joined #git
19:00 mostlybadfly joined #git
19:00 mostlybadfly joined #git
19:00 varesa- joined #git
19:00 SleePy joined #git
19:01 mostlybadfly joined #git
19:02 mostlybadfly joined #git
19:02 mostlybadfly joined #git
19:03 mostlybadfly joined #git
19:04 mostlybadfly joined #git
19:05 ScioMin Nope. The key was correct. What worked for my is deleting all keys from ssh-agent using `ssh-add -D` then adding only the one I'm using currently. Not perfect but I'm in a hurry.
19:05 mostlybadfly joined #git
19:05 ScioMin me*
19:05 msm joined #git
19:06 ldiamond joined #git
19:06 mostlybadfly joined #git
19:08 mostlybadfly joined #git
19:08 Eugene joined #git
19:08 rominronin joined #git
19:08 SleePy joined #git
19:09 ScioMin I appreciate the attention Seveas and _ikke_. Enjoy your Friday
19:09 mostlybadfly joined #git
19:10 Doginal_ joined #git
19:10 jnavila joined #git
19:13 retromode joined #git
19:14 mostlybadfly joined #git
19:14 retromode if i have a branch master with 8 commits that i havent pushed yet (i.e. 'your branch is ahead of master by 8 commits, use 'git push' to push local commits'), how can i instead take those commits and apply them to a different branch?
19:14 Seveas retromode: an existing branch or a new one?
19:14 retromode Seveas a new one
19:15 Seveas retromode: git checkout -b new-branch-name
19:15 retromode but i dont want the previous x amount of changes that were put on master
19:15 Seveas if you also want to return master to the state that remote has it, do this after the previous command: git checkout master; git reset --hard @{u}
19:15 Seveas but only *after* creating the new branch :)
19:16 nimomo joined #git
19:17 retromode wouldnt git checkout -b new-branch take all of my previous commits to master? say i have a release branch that is behind master by 48 commits (40 already pushed to master, 8 on my local). i want to take those 8 local changes, make a new branch off of my release branch, and then apply those 8 changes to the new-branch-off-release
19:17 Mike11 joined #git
19:18 Seveas retromode: no, that's not how git
19:18 Seveas retromode: no, that's not how git's branches work :)
19:18 retromode oh ok...cool :D
19:18 Seveas a branch is only a label that points to a commit.
19:18 Sasazuka joined #git
19:18 Seveas git checkout -b foo creates a new label, pointing to the current commit
19:19 Seveas if you want to transplant those 8 commits onto a completely different branch, you need to do something else
19:19 Seveas git chekcout release-branch
19:19 Seveas git checkout 0b new-branch-off-release
19:19 linus1 left #git
19:19 Seveas err, that's -b, not 0b
19:19 Seveas git cherry-pick master~8..master
19:20 retromode ahhh ok
19:20 mostlybadfly joined #git
19:20 Seveas cherry-pick would do the transplanting as you described, the 2 checkout commands are to create the branch
19:20 retromode and would cherry-pick remove those commits from master? or just apply them to new-branch-off-release?
19:20 Seveas no, after the transplant (which is really a copy, not a transplant), you would still need to checkout and reset master
19:20 YuGiOhJCJ joined #git
19:21 Es0teric joined #git
19:21 retromode ah ok. cool! gonna try that out
19:22 GoBear joined #git
19:22 ukleinek Seveas: I understand ~24^2, but from which rev to start from?
19:23 ukleinek _ikke_: I didn't get what you want to tell me
19:23 Seveas ukleinek: I'd assume HEAD
19:23 ukleinek Seveas: this was my first guess, too, but nope
19:23 _ikke_ me neither
19:23 _ikke_ ah
19:23 _ikke_ that was the wrong channel
19:23 Seveas _ikke_: what have you been smoking? :)
19:24 Es0teric joined #git
19:25 mostlybadfly joined #git
19:25 fstd_ joined #git
19:25 mostlybadfly joined #git
19:25 ukleinek Seveas: and how the object got pruned is clear, I'm already a step further and try to reconstruct the missing objects
19:26 mostlybadfly joined #git
19:26 TechieMae joined #git
19:26 nimomo joined #git
19:26 mostlybadfly joined #git
19:27 mostlybadfly joined #git
19:27 mostlybadfly joined #git
19:28 ioc_ joined #git
19:29 venmx joined #git
19:30 theoceaniscool joined #git
19:30 ukleinek Seveas: even when iterating over all refs, no $ref~24^2 evaluates to a353d85dc365764a6ab7eab3e929518c3a61d627
19:30 weijin joined #git
19:30 mikemcowie joined #git
19:33 _ikke_ Seveas: no clue
19:35 mizu_no__ joined #git
19:35 Seveas ukleinek: including remote refs and odd refs like FETCH_HEAD or bisect refs?
19:36 nimomo joined #git
19:39 Seveas ukleinek: or maybe it's HEAD~24^2 that *refers* to the object. try git show --format-raw HEAD~24^2
19:39 murph joined #git
19:40 lafleurdubien joined #git
19:40 jamiejackson joined #git
19:43 ukleinek Seveas: git for-each-ref | while read h t n; do echo -n $n; git rev-parse $h~24^2; done 2>/dev/null | grep a353d85dc365764a6ab7eab3e929518c3a61d627
19:44 nvh^ joined #git
19:46 kadoban joined #git
19:46 LiftLeft joined #git
19:47 Seveas try s/rev-parse/show --format=raw/ to test the hypothesis above :)
19:48 ivan_on_trac joined #git
19:49 jl2 joined #git
19:49 lhx joined #git
19:50 weijin joined #git
19:51 YuGiOhJCJ joined #git
19:54 stutter_ joined #git
19:55 forgon joined #git
19:55 venmx joined #git
19:57 stutter_ joined #git
19:59 jwtest joined #git
20:00 stutter_ joined #git
20:02 mikedd joined #git
20:03 jwtest joined #git
20:03 jimmyrcom joined #git
20:03 jwtest joined #git
20:04 jwtest joined #git
20:04 Esoterisch joined #git
20:04 weijin joined #git
20:10 dostoyevsky ~.
20:10 dostoyevsky sorry
20:11 gpiccoli left #git
20:12 venmx joined #git
20:14 stutter_ joined #git
20:15 King_Hual joined #git
20:15 King_Hual joined #git
20:16 Nudist69-M joined #git
20:16 pypyguy joined #git
20:18 pirocks joined #git
20:20 Klumben joined #git
20:21 jimi_ joined #git
20:22 dfas joined #git
20:23 jnavila joined #git
20:26 heftig what is the order produced when neither --date-order nor --topo-order is given?

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