Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-16

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

All times shown according to UTC.

Time Nick Message
00:01 inflames joined #git
00:02 ninjaaron left #git
00:03 armyriad joined #git
00:03 mentazoom joined #git
00:06 tnecniv joined #git
00:11 juvenal joined #git
00:11 SpeakerToMeat Hello all.
00:13 SpeakerToMeat Question, I got the source code of a program (somebody else's) that used to be hosted on google code in subversion. The subversion server is not anymore, but I could download the source which includes the .svn directory in it. Is there any way with only the directory still to so svn2git so I can push it into my github account, but keeping the old commit list?
00:13 t0by joined #git
00:13 svm_invictvs joined #git
00:13 jimmyrcom joined #git
00:16 Starky joined #git
00:16 monq joined #git
00:16 snowkidind joined #git
00:20 MacGyver SpeakerToMeat: You could try using file:// to specify the svn repo.
00:20 SpeakerToMeat Hmmm yeah...
00:21 bremner I bet there's not enough there,
00:21 MacGyver SpeakerToMeat: Maybe not using svn2git but git-svn --nometadata
00:21 SpeakerToMeat Let me try that but we'll see
00:21 SpeakerToMeat MacGyver: Will that pull the commit history though?
00:22 MacGyver SpeakerToMeat: Not unless what you've got is actually the full repo as it was on the server.
00:22 SpeakerToMeat Yeah I don't think so, I could check the svn tree
00:22 SpeakerToMeat but Yeah probably not
00:22 SpeakerToMeat Oh well I can always delete the .sv dir and just import it as a new project
00:23 SwiftMatt joined #git
00:26 SpeakerToMeat Yeah the data is not there, I'll do away and import as new project, thanks
00:31 Cabanossi joined #git
00:34 ResidentBiscuit joined #git
00:45 ToxicFrog left #git
00:52 monq_ joined #git
00:54 MattMaker joined #git
00:58 fstd_ joined #git
00:59 safe joined #git
01:06 peterbecich joined #git
01:07 Rodya_ joined #git
01:09 canoon joined #git
01:14 grayhatter joined #git
01:14 monq__ joined #git
01:15 jameser joined #git
01:15 grayhatter so, I was half done with a 6h merge, and did "git reset" I still have all my work, but I'd very much like to get back into the merge
01:17 planigan joined #git
01:18 zulutango joined #git
01:21 drodger joined #git
01:22 linuxmodder that is never a cool spot to be in
01:22 bremner well. at least I feel better that my life does not involve 6h merges, so thanks for that.
01:25 portal_ joined #git
01:26 grayhatter cd ..
01:26 grayhatter cp -a repo repo_other
01:26 grayhatter here, this is better as a one liner
01:28 preyalone joined #git
01:29 grayhatter cd .. ; cp -a repo repo_tmp ; cd repo_tmp ; git reset --hard ; git merge branch ; cd .. ; cp repo_tmp/.git/MERGE_* repo/.git ; cp repo/.git/index repo/.git/index.backup ; cp repo_tmp/.git/index repo/.git/index ; rm repo_tmp
01:29 grayhatter that got me back to what I expected git reset to
01:30 grayhatter any day where you find you need a better understanding of git internals, is likely not to be a great day
01:31 Cabanossi joined #git
01:31 metachr0n joined #git
01:35 shgysk8zer0_ joined #git
01:36 steven joined #git
01:36 theiostream joined #git
01:36 scoobertron joined #git
01:46 sunri5e joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Git pages at jk.gs offline due to domain glitch, hopefully to be fixed on Monday | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:56 TbobbyZ joined #git
01:57 systemovich joined #git
01:57 jab416171 joined #git
01:59 marlinc_ joined #git
02:08 mvensky joined #git
02:09 nwmcsween_ joined #git
02:15 rmbeer joined #git
02:15 rmbeer hello
02:15 rmbeer how to view all changes (diff) in a file?
02:16 MattMaker joined #git
02:16 nwmcsween_ how much work would it take to make the the git signing tool plugable, e.g. gpg -> signify?
02:17 Emperor_Earth joined #git
02:17 nwmcsween_ I'm assuming it would be a breaking change
02:18 rmbeer found it! thak
02:18 rmbeer left #git
02:20 jab416171 joined #git
02:26 ojdo joined #git
02:36 jab416171 joined #git
02:36 chipotle joined #git
02:38 SwiftMatt joined #git
02:41 drodger joined #git
02:43 Atm0spher1c joined #git
02:44 lb1c joined #git
02:45 mizu_no_oto joined #git
02:46 Cabanossi joined #git
02:47 Vortex35 joined #git
02:51 ProLoser joined #git
02:51 ProLoser how can i make it so that `git push` automatically pushes to a branch of the same name without me setting up tracking?
02:51 ProLoser like in my global default git config
02:55 grayhatter ProLoser:
02:55 grayhatter https://git-scm.com/docs/git-push#_description
02:56 grayhatter and https://git-scm.com/docs/git-config#git-config-pushdefault
02:57 grayhatter thanks for asking, I'm going to reset mine too
02:58 lagothrix joined #git
03:01 causasui joined #git
03:02 pks joined #git
03:03 xall_ joined #git
03:03 chachasmooth joined #git
03:04 hexagoxel joined #git
03:07 jab416171 joined #git
03:08 Vivekananda joined #git
03:08 basiclaser joined #git
03:09 ispn joined #git
03:11 govg joined #git
03:22 menip joined #git
03:22 Murii joined #git
03:23 MCMXI joined #git
03:23 pwnz0r joined #git
03:24 systemovich joined #git
03:30 drodger joined #git
03:30 Rodya_ joined #git
03:31 MrWoohoo joined #git
03:32 jab416171 joined #git
03:34 ResidentBiscuit joined #git
03:35 axh joined #git
03:37 nivag joined #git
03:40 juvenal joined #git
03:43 TikityTik joined #git
03:45 TbobbyZ joined #git
03:49 ayjay_t joined #git
03:49 justanotheruser joined #git
03:49 cagedwisdom joined #git
03:51 jost_ joined #git
03:52 Cabanossi joined #git
03:57 garyserj joined #git
04:01 jab416171 joined #git
04:07 uidzer0 joined #git
04:10 pks joined #git
04:13 Nilesh_ joined #git
04:13 TikityTik is it possible to squish commits without rebasing?
04:19 xall_ joined #git
04:19 juvenal joined #git
04:25 inflames joined #git
04:28 grayhatter yes
04:28 grayhatter git rebase --interactive
04:28 grayhatter or
04:29 grayhatter git commit --amend
04:35 obesechicken13 joined #git
04:35 TbobbyZ joined #git
04:36 drodger joined #git
04:37 Cabanossi joined #git
04:40 zumba_addict joined #git
04:41 Anja joined #git
04:43 jameser joined #git
04:47 jimklo joined #git
04:49 Mobutils joined #git
04:52 shinnya joined #git
04:55 kbeflo joined #git
04:58 Sasazuka joined #git
05:00 elsevero joined #git
05:02 finalbeta joined #git
05:07 Cabanossi joined #git
05:08 Rodya_ joined #git
05:11 kyan joined #git
05:14 freimatz joined #git
05:17 jameser joined #git
05:18 BW^- joined #git
05:18 BW^- joined #git
05:18 BW^- for a given committed repo file A.TXT, how do I show its change log using the git CLI?
05:19 preaction git log A.TXT
05:20 a3Dman joined #git
05:24 shgysk8zer0_ joined #git
05:24 nevodka joined #git
05:25 nevodka joined #git
05:37 Cabanossi joined #git
05:38 jameser joined #git
05:46 TbobbyZ joined #git
05:48 BW^- preaction: weeird mine doesn't show anything
05:48 preaction then it's never been committed
05:51 leah2 joined #git
05:55 schleppel joined #git
05:58 ayogi joined #git
05:59 ayogi joined #git
06:00 jameser joined #git
06:01 ayogi_ joined #git
06:03 bjoris joined #git
06:05 murii_ joined #git
06:08 jameser joined #git
06:10 jameser_ joined #git
06:14 kristofferR joined #git
06:17 xall_ joined #git
06:26 TikityTik joined #git
06:27 ter0 joined #git
06:29 TbobbyZ joined #git
06:32 hussam joined #git
06:36 darkbit joined #git
06:38 navidr joined #git
06:41 chardan joined #git
06:41 peterbecich joined #git
06:42 Oatmeal joined #git
06:43 govg joined #git
06:45 ayjay_t joined #git
06:46 chardan The train has wifi!
06:46 theoceaniscool joined #git
06:48 peterbec` joined #git
06:52 rokups joined #git
06:53 dreiss joined #git
06:56 SwoleGymBro joined #git
06:58 SwoleGymBro joined #git
07:03 flavius joined #git
07:04 jameser joined #git
07:05 TomyLobo2 joined #git
07:07 YuGiOhJCJ joined #git
07:10 ayogi_ joined #git
07:10 Rodya_ joined #git
07:15 Vortex35 joined #git
07:18 jagob joined #git
07:25 dermoth joined #git
07:26 alexandre9099_ joined #git
07:31 TbobbyZ joined #git
07:34 Introoter joined #git
07:37 Cabanossi joined #git
07:47 xingxing joined #git
07:47 marbn joined #git
07:48 slappymcfry joined #git
08:01 _main_ joined #git
08:02 _main_ joined #git
08:02 VladGh_ joined #git
08:04 __main__ joined #git
08:05 nivag joined #git
08:05 areyoureddy joined #git
08:11 Oebele joined #git
08:17 theoceaniscool joined #git
08:20 afuentes joined #git
08:22 inflames joined #git
08:24 aielima joined #git
08:26 nexemacs joined #git
08:27 oghamb joined #git
08:29 jameser joined #git
08:31 t0by joined #git
08:32 bannakaf_ joined #git
08:38 r0ry joined #git
08:39 jameser joined #git
08:40 areyoureddy_ joined #git
08:40 overlord_tm joined #git
08:42 dave0x6d joined #git
08:43 TbobbyZ joined #git
08:52 henriknj joined #git
08:53 chardan joined #git
08:58 lmatteis joined #git
09:04 chipotle joined #git
09:08 chipotle joined #git
09:08 zxd joined #git
09:08 zxd hi
09:08 zxd according to this https://src.fedoraproject.org/cgit/rpms/boost.git/   there is a branch called f20  I tried cloning https://src.fedoraproject.org/git/rpms/boost.git  then git fetch --all   but still don't see the branch only master
09:11 zxd git branch --remote
09:12 Rodya_ joined #git
09:12 zxd where is the information for these remote branches stored locally once I did fetch --all
09:13 zxd FETCH_HEAD ?
09:17 jozwior joined #git
09:22 areyoureddy__ joined #git
09:22 areyoureddy__ joined #git
09:23 areyoureddy__ joined #git
09:27 areyoureddy_ joined #git
09:34 catsup joined #git
09:34 EDAKIRI joined #git
09:35 peacememories joined #git
09:35 catsup joined #git
09:36 SwoleGymBro zxd, git checkout f20
09:37 Cabanossi joined #git
09:39 manuelschneid3r joined #git
09:40 darkbit joined #git
09:48 diogenese joined #git
09:49 SwoleGymBro joined #git
09:53 mentazoom joined #git
09:53 jozwior joined #git
09:53 myhau joined #git
09:59 MineCoins joined #git
10:00 leah2 joined #git
10:04 leeN joined #git
10:05 freimatz joined #git
10:09 myhau joined #git
10:12 miczac joined #git
10:12 Rodya_ joined #git
10:15 phase2 joined #git
10:15 ZyX-I joined #git
10:15 thinkpad joined #git
10:19 miczac_ joined #git
10:25 pbrewczynski_ joined #git
10:28 drodger joined #git
10:31 alexandre9099 joined #git
10:40 Tobbi joined #git
10:41 miczac joined #git
10:42 gunnaro joined #git
10:42 MineCoins joined #git
10:42 ter0 joined #git
10:52 satifant joined #git
10:56 mar77i_ joined #git
11:00 leah2 joined #git
11:02 fakenerd joined #git
11:04 borkr joined #git
11:07 courrier joined #git
11:09 earnestly joined #git
11:10 bomb-on joined #git
11:11 Taikibansei joined #git
11:13 Rodya_ joined #git
11:15 robattila256 joined #git
11:18 fakenerd joined #git
11:24 Starky joined #git
11:25 kexmex joined #git
11:29 drodger joined #git
11:29 darkbit joined #git
11:37 Cabanossi joined #git
11:39 TbobbyZ joined #git
11:46 marbn joined #git
11:47 MattMaker joined #git
11:48 myhau joined #git
11:52 davimore joined #git
11:52 _ikke_ zxd: git branch -r
11:58 _ikke_ ali1234: so apparently you need to use ':(glob)**/*' to get that full pathspec matching
12:02 bjoris joined #git
12:07 bjoris left #git
12:07 bjoris joined #git
12:13 sarri joined #git
12:13 sarri joined #git
12:14 Rodya_ joined #git
12:14 leah2 joined #git
12:18 p4trix joined #git
12:21 MattMaker joined #git
12:22 trip joined #git
12:26 nivag joined #git
12:27 Tobbi joined #git
12:29 theiostream joined #git
12:36 bjoris joined #git
12:40 theoceaniscool joined #git
12:42 doener joined #git
12:43 PioneerAxon joined #git
12:51 govg joined #git
12:52 Cabanossi joined #git
12:53 chipotle joined #git
12:57 mikecmpbll joined #git
12:58 portal_ joined #git
13:01 ispn joined #git
13:03 areyoureddy joined #git
13:03 PioneerAxon joined #git
13:04 Rodya_ joined #git
13:04 bouncy joined #git
13:04 griff joined #git
13:14 snufft joined #git
13:14 snufft hi guys!
13:15 Starky joined #git
13:15 snufft is there a way that i can see which directories from the current directory, have changes underneath them? e.g if I had 5 folders and folders 3 and 4 both have changes, but 1,2,3 don't, is there a way i can *only* see "folder 3" and "folder 4" in output?
13:16 _ikke_ snufft: git tracks changes per file, not per folder
13:16 _ikke_ git show --name-only would you show what files changed since last commit
13:22 snufft _ikke_, thanks for your reply :) i'll give it a shot, thanks :D
13:24 rosek joined #git
13:31 phase2 joined #git
13:31 rosek joined #git
13:32 unbalancedparen joined #git
13:37 kbeflo_ joined #git
13:37 Cabanossi joined #git
13:38 ok91 joined #git
13:38 kbeflo__ joined #git
13:40 TbobbyZ joined #git
13:43 myhau joined #git
13:45 lambada355 joined #git
13:45 MaxSan joined #git
13:45 MaxSan hey folk
13:45 gitinfo MaxSan: 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.
13:45 MaxSan s
13:46 MaxSan I get fatal: Unable to find remote helper for 'https'
13:46 MaxSan since upgrading git
13:47 MaxSan Ive tried a whole bunch of fixes and no idea how to get this remote helper back
13:47 MaxSan anyone else had this issue? running linux
13:47 MaxSan ubuntu /16.04
13:53 snowkidind joined #git
13:55 _ikke_ what does ls $(git --exec-path) return?
13:55 _ikke_ MaxSan: ^
13:56 MaxSan lot of git- scripts it looks like
13:57 MaxSan git-credential                git-fmt-merge-msg      git-ls-files
13:57 MaxSan for example ^^
13:59 areyoureddy_ joined #git
14:01 _ikke_ MaxSan: also git-remote-https?
14:02 inflames joined #git
14:07 mykespb joined #git
14:08 jeffreylevesque joined #git
14:11 MaxSan nope its not here _ikke_
14:11 MaxSan git-remote
14:11 MaxSan but not https
14:11 _ikke_ MaxSan: and which git-remote-https?
14:12 _ikke_ `which git-remote-https`
14:12 MaxSan returns nothing
14:12 _ikke_ ok
14:13 pietv joined #git
14:13 _ikke_ MaxSan: dpkg-query -L git | grep remote-https
14:13 leah2 joined #git
14:14 MaxSan /usr/lib/git-core/git-remote-https
14:15 _ikke_ MaxSan: dpkg -V git
14:15 marbn joined #git
14:15 enrichedpanda joined #git
14:17 MaxSan returns no result
14:17 _ikke_ odd
14:17 _ikke_ try removing and reinstalling git
14:17 MaxSan Yeah I have
14:18 MaxSan it works if i replace https: with git:
14:18 _ikke_ Right, that makes sense, you are using a different protocol
14:18 MaxSan but ive no idea how to change that on like internal requests
14:18 _ikke_ It's odd that that binary is missing
14:18 MaxSan any way to force this on a request wide process
14:18 _ikke_ how are you installing git?
14:18 MaxSan ehh i cant rememebr now
14:18 _ikke_ MaxSan: Not all hosts offer git://
14:19 _ikke_ so it's not a permanent solution
14:19 Darren_ joined #git
14:19 _ikke_ apt-cache policy git
14:19 MaxSan Installed: 1:2.7.4-0ubuntu1
14:19 MaxSan Candidate: 1:2.7.4-0ubuntu1
14:19 MaxSan Version table:
14:19 MaxSan *** 1:2.7.4-0ubuntu1 500
14:19 MaxSan 500 http://archive.ubuntu.csg.uzh.ch/ubuntu xenial/main amd64 Packages
14:19 MaxSan 100 /var/lib/dpkg/status
14:21 _ikke_ and what if you do apt-get remove git && apt-get install -y git
14:24 anuxivm joined #git
14:25 MattMaker joined #git
14:26 MaxSan still same helper issue _ikke_
14:27 _ikke_ what does git --exec-path return?
14:29 TikityTik joined #git
14:30 MaxSan /usr/local/libexec/git-core
14:31 _ikke_ ok, that is weird
14:31 _ikke_ I think you have a manually compiled version installed
14:31 _ikke_ ls /usr/local/bin/git
14:34 hashpuppy joined #git
14:35 rosek joined #git
14:36 MaxSan /usr/local/bin/git
14:36 MaxSan yeah I may do
14:36 _ikke_ Then you need to get rid of it
14:37 MaxSan aptitude was out of date compared to what was available
14:37 MaxSan and I had a different issue with the older version
14:37 MaxSan there was avery good reason for upgrading it
14:37 _ikke_ right
14:37 _ikke_ best way is to find a PPA
14:37 _ikke_ that has the latest version
14:38 MaxSan il have a look for one and try this
14:38 MaxSan thanks for your help. This has been such a difficulty recently
14:40 rosek joined #git
14:42 juvenal joined #git
14:46 TbobbyZ joined #git
14:48 myhau joined #git
14:49 Tobbi joined #git
14:51 xall_ joined #git
14:55 Guest55 joined #git
14:56 monq joined #git
14:57 atomi joined #git
14:59 iamthad joined #git
14:59 zeroed joined #git
14:59 zeroed joined #git
15:02 kbeflo joined #git
15:05 tnecniv joined #git
15:05 juvenal joined #git
15:06 magenta joined #git
15:06 livingstn joined #git
15:15 rokups joined #git
15:16 zeroed joined #git
15:19 TikityTik joined #git
15:19 thiago joined #git
15:23 madewokherd joined #git
15:24 __builtin joined #git
15:26 tnecniv joined #git
15:26 ncthom91 joined #git
15:31 Gustavo6046 joined #git
15:31 lambada355 joined #git
15:32 kaan_ joined #git
15:33 dreiss joined #git
15:34 lambada355 joined #git
15:36 SwiftMatt joined #git
15:37 rosek joined #git
15:38 GT4066 joined #git
15:41 franl joined #git
15:42 theiostream joined #git
15:43 cdown_ joined #git
15:45 JimDungo joined #git
15:47 g0d355__ joined #git
15:51 miczac joined #git
15:51 xall_ joined #git
15:52 TbobbyZ joined #git
15:52 kbs joined #git
15:54 dirtyroshi_ joined #git
15:54 Rodya_ joined #git
16:00 bronson joined #git
16:04 shinnya joined #git
16:05 rosek joined #git
16:05 cdown_ joined #git
16:09 cagmz joined #git
16:11 fuchstronaut joined #git
16:11 alexandre9099 joined #git
16:11 rosek joined #git
16:11 TikityTik joined #git
16:15 a3Dman joined #git
16:16 robotroll joined #git
16:18 routingsparks joined #git
16:22 ali1234 _ikke_: wow, so you're telling me that even ls-files '*/*' doesn't work right?
16:23 prg3 joined #git
16:23 dreiss joined #git
16:24 ShapeShifter499 joined #git
16:26 alexandre9099 joined #git
16:31 marbn joined #git
16:31 _ikke_ That does work
16:32 _ikke_ diff -u <(git ls-files ':(glob)**/*') <(git ls-files)
16:32 TSS_ joined #git
16:32 circ-user-8ns7x joined #git
16:33 zeroed joined #git
16:33 zeroed joined #git
16:34 ali1234 yes, basically everything works as expected if you specify :(glob)
16:34 ali1234 without it, nothing works as expected
16:35 ali1234 diff <(ls -1 */.gitignore | sort) <(git ls-files '*/.gitignore' | sort)
16:35 ali1234 vs
16:36 ali1234 diff <(ls -1 */.gitignore | sort) <(git ls-files ':(glob)*/.gitignore' | sort)
16:36 portal_ joined #git
16:37 _ikke_ so git ls-files does not enable the extended pathspec options unless you specify :(glob)
16:37 ali1234 right
16:38 ali1234 without :(glob) it just does its own thing that doesn't match up to the expected behaviour of anything else
16:38 bronson joined #git
16:40 dave0x6d joined #git
16:40 marbin joined #git
16:41 kfoonamalik joined #git
16:43 Discovery joined #git
16:43 _ikke_ ali1234: https://github.com/git/git/commit/bd30c2e48432c692f9e77d3529c9cf25117066bb
16:43 _ikke_ I think it's more a historical thing
16:44 ToBeCloud joined #git
16:45 ali1234 i don't really understand that
16:45 ali1234 is it just saying what i just said, except in a really confusing way?
16:46 sunri5e joined #git
16:46 ali1234 :(literal) is the default?
16:47 _ikke_ no, that's disabling everything
16:47 _ikke_ so everything is taken literally
16:47 ali1234 what does the first paragraph mean?
16:48 ali1234 ":(glob) uses WM_PATHNAME while the other" - what is other?
16:48 _ikke_ It introduces a new pathspec magic that differs from the already exisitng behaviour
16:48 _ikke_ "fnmatch without FNM_PATHNAME"
16:48 _ikke_ man fnmatch
16:48 ali1234 so when you don't say :(glob) or :(literal) you are supposed to get "fnmatch without FNM_PATHNAME"
16:48 ali1234 ?
16:49 _ikke_ That's how I understand it, yes
16:49 ali1234 "If this flag is set, match a slash in string only with a slash in pattern and not by an asterisk (*) or a question mark (?) metacharacter, nor by a bracket expression ([]) containing a slash."
16:50 circ-user-8ns7x How do I know which commit introduced specific code?
16:50 ali1234 circ-user-8ns7x: git blame
16:50 MineCoins joined #git
16:52 _ikke_ circ-user-8ns7x: or git log -S "line of code"
16:53 ali1234 okay so as far as i can tell, this works the way you'd expect it to work if you read the manual front to back and the log of every git commit
16:53 ali1234 however for everyone else it is just really confusing and weird
16:54 ali1234 especially since there is no way to get the default behaviour of common shells like bash
16:56 TbobbyZ joined #git
16:57 SteffanW joined #git
16:59 sunri5e joined #git
16:59 circ-user-8ns7x git blame refers a commit that has nothing to do with the file
16:59 nd joined #git
17:00 _ikke_ ali1234: Well, git never claims to work like bash does
17:01 alexandre9099 joined #git
17:01 _ikke_ But I agree that's kind of confusing (never documented that :(glob) is required for ls-files
17:01 cdown joined #git
17:02 ali1234 so there is fnmatch and wildmatch... where does glob fit into this?
17:02 ali1234 "man 3 glob" that is
17:03 grawity in libc, fnmatch() is the wildcard matching tool, and glob() is fnmatch applied to actual files and directories
17:03 circ-user-8ns7x git log -S "line of code" yields nothing
17:03 grawity also... `git ls-files '*.c'` seems to work rather well here
17:03 ali1234 what rules does glob use tho?
17:03 _ikke_ ali1234: (there is also --glob-pathspecs, to enable it
17:03 grawity circ-user-8ns7x: if `git blame <file>` shows commits which are unrelated to that file... you must be doing something wrong
17:04 ali1234 grawity: this all started because i wanted to find all the .gitignore files in the repo
17:05 _ikke_ ali1234: man gitglossary (pathspec) explains the rules
17:05 gitinfo ali1234: the gitglossary manpage is available at http://jk.gs/gitglossary.html
17:05 _ikke_ ugh, link is dead
17:05 a3Dman joined #git
17:05 ali1234 git ls-files '.gitignore' does not work for that, and neither does '*/.gitignore'. only ':(glob)**/.gitignore' can do it
17:05 _ikke_ https://www.kernel.org/pub/software/scm/git/docs/gitglossary.html
17:06 ali1234 '*.gitignore' isn't correct either (it will over-match)
17:06 circ-user-8ns7x I also see that git blame yields the same commit several times
17:07 ali1234 it reports the commit that introduced every line in the file
17:08 grawity `tig blame <file>` is clearer to look at
17:08 ali1234 ikkeagain, i can't understand that
17:08 ali1234 _ikke_: ^
17:08 _ikke_ what part can't you understand?
17:09 ali1234 what happens if you don't specify any magic words
17:09 ali1234 wait wait
17:10 ali1234 glob: "Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME"
17:10 _ikke_ "the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, * and ? can match directory separators."
17:10 ali1234 i thought it used "wildmatch with WM_PATHNAME"
17:12 ali1234 this documentation is so confusing that i suspect it would be easier to understand by looking at the source code
17:12 juvenal joined #git
17:12 circ-user-8ns7x git blames that there was specific commit at one date but gitk shows that there is another commit at that date.
17:13 _ikke_ authordate vs comitterdat?
17:15 masuberu joined #git
17:15 sunri5e joined #git
17:18 ResidentBiscuit joined #git
17:18 cagmz_ joined #git
17:18 cdown joined #git
17:19 drodger joined #git
17:19 cagomez joined #git
17:22 circ-user-8ns7x Can I command gitk to jump to commit given its hash?
17:25 Goplat joined #git
17:27 AbleBacon_ joined #git
17:30 a3Dman joined #git
17:37 Cabanossi joined #git
17:39 a3Dman joined #git
17:40 Rodya_ joined #git
17:42 paul424 joined #git
17:45 rewt circ-user-8ns7x, yes, just paste/type into the hash field, and press enter or click 'go'
17:46 circ-user-8ns7x thanks
17:46 rewt 'goto' rather
17:46 rewt btw, you don't need the full hash there, just the first few characters is enough (as long as it's unique in the repo)
17:48 masuberu joined #git
17:50 theiostream joined #git
17:51 vkareh joined #git
17:57 orbyt_ joined #git
18:01 TbobbyZ joined #git
18:02 MineCoins joined #git
18:04 Shakeel_ joined #git
18:04 ali1234 oh lovely... python reimplements fnmatch
18:06 ali1234 is wildmatch() a function only in git?
18:07 Impaloo joined #git
18:07 sunri5e joined #git
18:07 juvenal joined #git
18:07 cagomez joined #git
18:09 _ikke_ I think so, yes
18:12 astrofog joined #git
18:12 ali1234 the more times i read the pathspec doc, the less sense it makes
18:13 ali1234 > For example, "**/foo" matches file or directory    "foo" anywhere, the same as pattern "foo".
18:13 ertesx joined #git
18:14 ali1234 this is just wrong, ":(glob)**/.gitignore" is totally different to ":(glob).gitignore"
18:17 nickel_dime_look joined #git
18:21 rewt that description doesn't say "**/" is the same as ""
18:22 ali1234 it says "**/foo" is the same as "foo"
18:22 ali1234 but it clearly isn't, in any context
18:22 chipotle joined #git
18:23 ali1234 oh wai
18:23 ali1234 it is refering to .gitignore syntax
18:23 ali1234 if you put "foo" in .gitignore, then it *is* ignored anywhere in the repo
18:24 Gustavo6046 joined #git
18:24 ali1234 i wonder what happens if you put "**/" in .gitignore then
18:25 ali1234 answer: nothing, it is not accepted. but "**/*" in .gitignore ignores everything
18:26 ali1234 but ":(glob)" syntax does not work in .gitignore so i don't see how it is relevent to say that inside the section about glob...
18:26 juvenal joined #git
18:28 lambada355 joined #git
18:28 cagomez joined #git
18:29 ali1234 wait a minute i see what has happened
18:30 ali1234 the section about ** is supposed to be separate bt somehow it has been nested under glob
18:31 ruxu joined #git
18:31 portal_ joined #git
18:32 lambada355 joined #git
18:33 lambada355 joined #git
18:33 davimore_ joined #git
18:35 TikityTik joined #git
18:35 mentor joined #git
18:35 mentor joined #git
18:35 trewe joined #git
18:36 lambada355 joined #git
18:36 lambada355 joined #git
18:39 TbobbyZ joined #git
18:39 bronson joined #git
18:40 Lyqyd joined #git
18:42 cdown_ joined #git
18:43 jesst joined #git
18:44 watabou joined #git
18:45 circ-user-8ns7x joined #git
18:45 m0viefreak joined #git
18:47 drodger joined #git
18:48 a3Dman joined #git
18:50 SteffanW joined #git
18:52 YuGiOhJCJ joined #git
18:54 durham joined #git
18:55 Tobbi joined #git
18:58 watabou joined #git
18:58 menip joined #git
18:59 Rodya_ joined #git
19:00 stevenbenner joined #git
19:00 Vortex34 joined #git
19:01 re1 joined #git
19:03 kfoonamalik joined #git
19:14 qqx joined #git
19:14 TikityTik joined #git
19:16 lyxus joined #git
19:16 drodger joined #git
19:20 elsevero joined #git
19:21 lyxus joined #git
19:22 Cabanossi joined #git
19:23 SwoleGymBro joined #git
19:32 Atm0spher1c joined #git
19:33 tvw joined #git
19:35 durham joined #git
19:38 dreaddymck joined #git
19:39 lyxus joined #git
19:40 Forlorn joined #git
19:42 shadow-x joined #git
19:43 keeyou joined #git
19:46 TikityTik joined #git
19:47 pks joined #git
19:50 circ-user-8ns7x joined #git
19:51 dvaske joined #git
19:53 cagomez joined #git
19:55 miczac joined #git
19:57 durham joined #git
20:01 Forlorn joined #git
20:01 Rodya_ joined #git
20:01 dsdeiz joined #git
20:03 Starky joined #git
20:04 durham joined #git
20:08 Xenophon1 joined #git
20:14 durham joined #git
20:15 griff joined #git
20:21 a3Dman joined #git
20:22 kjsaihs joined #git
20:22 Cabanossi joined #git
20:26 ali1234 joined #git
20:27 rosek joined #git
20:28 cagomez joined #git
20:30 acs____ joined #git
20:35 MaxSan joined #git
20:38 axh joined #git
20:39 TbobbyZ joined #git
20:39 axh joined #git
20:41 axh left #git
20:41 TbobbyZ joined #git
20:45 heinrich5991 joined #git
20:48 circ-user-8ns7x joined #git
20:50 SwiftMatt joined #git
20:51 rastos2 joined #git
20:52 ExeciN joined #git
20:52 boombatower joined #git
20:54 miczac_ joined #git
20:57 rastos2 Hi, I'm new to git. I did "git clone --recursive myurl" and I got the project, including the file .gitmodules, but the submodules themselves are not there. What's wrong?
20:57 BK- joined #git
20:59 Seveas rastos2: do you still have the output of the clone command?
20:59 rastos2 yes
20:59 Seveas can you pastebin the full command you used and that output please
21:00 rastos2 https://pastebin.com/ZerPe3AF
21:01 Seveas the full command as well please
21:01 raijin joined #git
21:01 rastos2 git clone --recursive rastos@git.rastos.org:src/myproject.git
21:01 rastos2 it's not a public repository
21:03 Seveas but that command is correct. Can you share the content of the .gitmodules file?
21:03 Seveas And is that file at the root of the repository?
21:04 nixdork joined #git
21:04 rastos2 https://pastebin.com/xX6NbLag
21:05 a3Dman joined #git
21:05 rastos2 yes, the files is in the root of the myproject directory created by the clone command
21:06 Seveas looks good too. What's the output of git submodule --update --init?
21:07 rastos2 you mean "git submodule update --init", right? No output. the command just returns to the shell prompt.
21:07 marbn joined #git
21:08 Rodya_ joined #git
21:08 Seveas yes, I meant that. That output is odd though.
21:08 tnecniv joined #git
21:08 Seveas how about: git submodule status
21:08 Starky joined #git
21:09 jml1017 joined #git
21:09 rastos2 I tried the same clone on another system. it behaves the same. the "git submodule status" also returns without any output :-/.
21:11 rastos2 I thought that I'm doing something wrong, but I guess I must have messed up somewhere. In such case the easiest seems to be to start from scratch.
21:11 Seveas ok, so it's not finding your submodules. can you share the output of 'git ls-tree HEAD' (feel free to omit/redact filenames that are sensitive)
21:12 Taikibansei joined #git
21:13 rastos2 https://pastebin.com/ggHfL0qh
21:13 Seveas you didn't actually commit the submodules
21:13 rastos2 I committed the .gitmodules files. isn't that enough?
21:13 Seveas I expect a line like 160000 commit 3640fa177816aee932aaeb402a28c063c11f52da DRC
21:14 Seveas no, you'll neet to commit the submodules themselves as well, that records on which commit the submodule needs to be checked out
21:15 rastos2 I see. thanks for your help Seveas!
21:17 rastos2 \o/, yay, it works! ;-D
21:19 ivanfon joined #git
21:19 jagob joined #git
21:22 porfiriopaiz joined #git
21:24 raijin joined #git
21:25 rominronin joined #git
21:26 juvenal joined #git
21:28 kyan joined #git
21:31 mkoskar joined #git
21:32 griff joined #git
21:36 alexandre9099 joined #git
21:36 anuxivm joined #git
21:37 Cabanossi joined #git
21:37 b0nn left #git
21:38 jnewt_ joined #git
21:42 Cabanossi joined #git
21:43 jnewt__ joined #git
21:49 cagomez joined #git
21:54 SwiftMatt joined #git
21:54 circ-user-8ns7x joined #git
21:57 askb joined #git
22:03 ajeremias joined #git
22:04 grayhatter how do I checkout a cached file?
22:04 grayhatter I rm'd the wrong file, but it's in the working cache
22:06 WayToDoor joined #git
22:11 ajeremias any cool git gui for linux?
22:15 Peuc joined #git
22:16 TbobbyZ joined #git
22:21 akasha_ joined #git
22:22 Cabanossi joined #git
22:25 hotpancakes joined #git
22:25 peterbec` joined #git
22:26 chipotle joined #git
22:30 Noldorin joined #git
22:30 rudi_s grayhatter: git status tell you; git checkout -- file
22:30 grayhatter git checkout-index
22:30 rudi_s ajeremias: There's git gui and gitk, but I'd stick to the terminal and tig.
22:30 grayhatter git checkout file would give you the file from HEAD
22:30 grayhatter rudi_s: ^
22:31 grayhatter I don't want HEAD, I wanted index
22:31 grayhatter well.. I want head, but different topics
22:31 * grayhatter returns to code
22:31 rudi_s grayhatter: No, git checkout -- file will give you the version from the index.
22:32 rudi_s I wasn't sure how to do that and tested it locally and just followed git status' instructions.
22:33 grayhatter oh cool
22:33 grayhatter I didn't know about that one, thanks mate
22:33 rudi_s np, was news for me as well.
22:34 hotpancakes joined #git
22:36 a3Dman joined #git
22:38 cagomez joined #git
22:38 miczac joined #git
22:41 elsevero_ joined #git
22:42 MattMaker joined #git
22:45 TheSimonator joined #git
22:45 mesco joined #git
22:46 theiostream joined #git
22:49 rominronin joined #git
22:49 kbeflo joined #git
22:50 pks joined #git
22:50 pietv joined #git
22:51 johnlage joined #git
22:51 circ-user-8ns7x joined #git
22:52 Cabanossi joined #git
22:56 akasha_ joined #git
22:57 VladGh joined #git
22:58 TbobbyZ joined #git
23:02 pks joined #git
23:06 Emperor_Earth joined #git
23:08 inflames joined #git
23:12 tnecniv joined #git
23:13 unplayednamer joined #git
23:13 theiostream joined #git
23:14 TheSimonator joined #git
23:17 fakenerd_ joined #git
23:19 kbeflo_ joined #git
23:22 JanC_ joined #git
23:26 akasha_ joined #git
23:27 peterbec` joined #git
23:28 meLon joined #git
23:29 unp1ayednamer joined #git
23:29 TheSimonator joined #git
23:31 danimal2 joined #git
23:36 unplayednamer joined #git
23:37 MaxSan joined #git
23:37 unplayednamer joined #git
23:39 nexemacs joined #git
23:41 a3Dman joined #git
23:44 akasha_ left #git
23:46 elsevero joined #git
23:46 watabou joined #git
23:50 circ-user-8ns7x joined #git
23:51 a3Dman joined #git
23:51 justanotheruser joined #git
23:52 Cabanossi joined #git
23:53 mizu_no_oto joined #git
23:55 portal_ joined #git

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