Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-22

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

All times shown according to UTC.

Time Nick Message
00:03 tacoshellmcgee left #git
00:04 zacts joined #git
00:05 dweelie joined #git
00:05 Rodya_ joined #git
00:10 mda1 joined #git
00:11 snowkidind joined #git
00:14 armyriad joined #git
00:15 netj joined #git
00:16 ikelso joined #git
00:17 Rodya_ joined #git
00:18 energizer joined #git
00:19 nickabbey joined #git
00:19 energizer I think this workflow question and Ryan Stewart's answer are interesting. Could anybody explain why doing this with repos is better than doing it with branches? https://stackoverflow.com/questions/705268​6/prevent-direct-commits-on-master-branch-​in-git-repository-and-accept-merges-only
00:21 bgerber joined #git
00:22 nckpz joined #git
00:24 rudi_s energizer: Because they used too mach mercurial? - Personally I don't see the point in always using multiple repositories. When I do some experiments, I switch to a new test branch and work on that. And if it conflicts with my current working tree, I'll use a separate repository. But I don't think it's necessary to always use separate ones.
00:25 _geoff joined #git
00:28 nuck So one of our developers on a working branch managed to commit something he shouldn't have, and I'm trying to figure out how to remove a file's changes from a commit during interactive rebase
00:28 nuck Anyone got any idea?
00:29 nuck I've rebased a million times but frankly I have no clue how to just remove a single file's changes without trying to create a negative patch
00:29 phroa use 'edit' mode, delete/checkout/reset the file
00:29 timvisher joined #git
00:29 osse nuck: mark the commit 'edit', save and close. git checkout HEAD~1 -- file; git commit --amend: git rebase --continue
00:30 nuck Ah, thanks!
00:30 parsnip can you run a `git log` command without being in a .git directory/subdirectory?
00:31 nuck I wasn't thinking about the possibility of checking out `HEAD~1`
00:32 umpc joined #git
00:33 osse https://www.youtube.com/watch?v=wsP526n-qLE
00:33 osse oiops
00:33 osse wrong chan haha
00:33 osse parsnip: you can do git -C path/to/repo log
00:34 osse nuck: yup, except you don't want to checkout HEAD~1, just one file from it
00:35 nuck yeah
00:35 nuck I had the basic idea of what needed to be done, but I didn't think about checking out the file into the state of the previous commit :P
00:37 parsnip ah thanks, that saves me complicating with a `cd`, but i guess i can't use an https url
00:37 PaulCape_ joined #git
00:37 osse parsnip: the only thing you can do without cloning is to use git ls-remote, and that's not much
00:38 osse maybe there's some web API thing
00:40 wagle joined #git
00:43 _hramrach joined #git
00:46 grantwu joined #git
00:46 Derperperd joined #git
00:46 grantwu How do I get git log and git diff to not print a page of output after I quit the pager?
00:47 grantwu Never mind, I think I found the answer
00:49 osse grantwu: what was it?
00:49 grantwu https://www.reddit.com/r/zsh/comments/2n2ik​k/in_bash_when_i_run_git_log_the_output_is/
00:49 grantwu it had to do with the fact that I recently uninstalled oh-my-zsh
00:49 grantwu Which made me lose this behavior which I liked
00:49 osse ah
00:50 osse you can also set the flags in .gitconfig
00:51 cqi joined #git
00:52 jameser joined #git
00:54 suttonwilliamd joined #git
00:54 wagle joined #git
00:54 a_thakur joined #git
00:59 chachasmooth joined #git
01:01 timvisher joined #git
01:01 Nilesh_ joined #git
01:04 raspado joined #git
01:04 mquin joined #git
01:04 arnas joined #git
01:05 grantwu left #git
01:05 pity joined #git
01:07 linuxmodder joined #git
01:08 linuxmodder- joined #git
01:09 linuxmodder- joined #git
01:10 fabio_ joined #git
01:11 einnjo joined #git
01:12 lvh joined #git
01:14 MrLawrence joined #git
01:14 dreiss joined #git
01:15 kadoban joined #git
01:17 HcsOmot joined #git
01:17 HcsOmot greetings all around
01:18 lilli joined #git
01:18 HcsOmot just wanted to share this little thing I found online, seems quite helpful to get a grasp of some basic principles of git for newcomers like myself. http://learngitbranching.js.org/
01:18 HcsOmot beats anything i've seen so far.
01:18 lilli left #git
01:23 jameser joined #git
01:24 voldz1tic3n joined #git
01:24 masuberu joined #git
01:25 lvh joined #git
01:26 Limes_ joined #git
01:30 mostlybadfly joined #git
01:36 z3t0 joined #git
01:37 Noodlewitt joined #git
01:40 __hramrach joined #git
01:41 kyan Hi :) I've got a directory with a whole bunch of git repositories in two subdirectories.
01:42 kyan I'd like turn the parent directory into a git repository, and the enclosed repositories into submodules of that repository..
01:42 kyan I don't want to have to re-clone all the repos that are to become submodules, since they are quite large.
01:42 kyan How could I go about doing this? Thanks! :)
01:43 z3t0 joined #git
01:46 wagle joined #git
01:48 Derperperd joined #git
01:49 thierryp joined #git
01:50 arescorpio joined #git
01:50 timvisher joined #git
01:57 jameser joined #git
01:57 dhollinger joined #git
01:59 dsdeiz joined #git
01:59 dsdeiz joined #git
02:02 bmahe joined #git
02:02 __hramrach joined #git
02:03 pity joined #git
02:06 louipc joined #git
02:06 louipc ooh hello
02:12 andrew710 joined #git
02:18 ikelso joined #git
02:18 a_thakur joined #git
02:23 NeverTired joined #git
02:24 wagle joined #git
02:26 jagob joined #git
02:26 finalbeta joined #git
02:30 cqi joined #git
02:32 d^sh joined #git
02:32 pks joined #git
02:34 TheCynicalPanda joined #git
02:34 dsdeiz joined #git
02:34 dsdeiz joined #git
02:36 YourTheBombNow23 joined #git
02:37 mehola joined #git
02:39 timvisher joined #git
02:39 mizu_no_oto joined #git
02:41 jameser joined #git
02:46 ispn joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and a fresh start on a new branch | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This channel may contain users known to the state of California to cause cancer.
02:50 ridiuclous joined #git
02:52 ash_workz joined #git
02:53 YourTheBombNow23 joined #git
02:55 tmsmith joined #git
02:55 NeverDie joined #git
02:55 Vampire0_ joined #git
02:57 boombatower joined #git
02:59 gugah joined #git
03:03 hramrach_ joined #git
03:10 sunri5e joined #git
03:11 jameser joined #git
03:12 hexagoxel joined #git
03:12 safe joined #git
03:17 variable joined #git
03:17 variable or put another way, can I cherry-pick A onto B without switching to B in my WC ?
03:17 variable Is there a way I could create a branch from a cherry-pick without switching branches? or put another way, can I cherry-pick A onto B without switching to B in my WC ?
03:17 Vortex34 joined #git
03:20 ikelso joined #git
03:20 kyan Found the answer to my problem!
03:20 kyan http://stackoverflow.com/questions/283067​81/how-to-convert-a-git-repo-to-a-submodu​le-which-is-nested-in-another-parent-gi
03:21 louipc variable: what's a wc?
03:22 louipc a cherry-pick is just like a loose patch
03:26 bl0w3d_0ut joined #git
03:26 louipc joined #git
03:26 kyan louipc: I'd hazard a guess at "working copy"
03:26 louipc kyan: good one
03:26 hramrach_ joined #git
03:32 fstd_ joined #git
03:36 nickabbey joined #git
03:38 tmsmith joined #git
03:40 ome joined #git
03:41 pur3eval joined #git
03:43 timvisher joined #git
03:44 Nilesh_ joined #git
03:44 Peuc joined #git
03:45 hramrach__ joined #git
03:47 variable joined #git
03:48 chachasmooth joined #git
03:49 Derperperd joined #git
03:49 z3t0 joined #git
03:50 variable joined #git
03:50 mizu_no_oto joined #git
03:51 energizer Does git status check against the remote?
03:51 thierryp joined #git
03:51 energizer like does it go online and look there
03:54 Hink Jesus joining the git mailing list was a mistake. I've received so much spam E-Mail since subscribing.
03:55 memfrob energizer i dont think so as i believe it still functions without network connectivity.
03:55 memfrob you can always just ifconfig <iface> down and try it :P
03:57 memfrob or run tcpdump while running git status
03:58 memfrob (on windows rn can't test)
03:58 pity joined #git
03:59 ryouma joined #git
03:59 louipc Hink: what kind
03:59 ryouma this returns nothing: git diff $(git log --since=midnight --reverse --format="%H" | head -1)
03:59 Hink Hello my name is Ms. Thandi Robert, from Ivory Coast. My parents were brutally mulled by the former president Laurent Gbagbo because of political crisis as the only survival of my family. I got your email while searching for a reliable personality in my private study on the internet. I am in need of your help and stand as my guardian in the management of my family inherited sum of $22.5M USD.  Please get back to me with your private telephone number with sincerity.
03:59 ryouma (git version 2.1.4)
04:00 louipc cool
04:00 Hink I know.
04:00 Hink It's awesome.
04:09 Lyqyd joined #git
04:10 milki o.O
04:12 jmpp joined #git
04:12 jmpp joined #git
04:18 menip joined #git
04:20 ertes joined #git
04:24 JamesBaxter joined #git
04:27 timvisher joined #git
04:28 kyan So I have a submodule in my .gitmodules, added via git submodule add https://github.com/ethus3h/"$repo".git "$repo"
04:28 kyan it looks normal in the .gitmodules
04:28 kyan but when I do git add -A ., it adds all the files that are in the submodule into the current repo
04:28 kyan What am i doing wrong? thx!
04:29 jaafar joined #git
04:31 kyan Oh, never mind. D'oh. Was missing the directory in ../.git/modules
04:31 kyan sorry
04:32 louipc nice
04:32 nickabbey joined #git
04:37 msonntag joined #git
04:37 pks joined #git
04:39 lindenle joined #git
04:44 jameser joined #git
04:50 Derperperd joined #git
04:58 pur3eval joined #git
04:59 pur3eval joined #git
05:00 SwiftMatt joined #git
05:01 dermoth joined #git
05:02 Raed joined #git
05:07 Silenced joined #git
05:09 Silenced joined #git
05:10 Puffball joined #git
05:14 timvisher joined #git
05:14 mohabaks joined #git
05:16 suttonwilliamd joined #git
05:16 bl0w3d_0ut joined #git
05:19 bl0w3d_0ut joined #git
05:21 TrentonDAdams_ joined #git
05:22 TrentonDAdams__ joined #git
05:25 TrentonDAdams joined #git
05:25 TrentonDAdams joined #git
05:26 chachasmooth joined #git
05:27 TrentonDAdams_ joined #git
05:27 rajat joined #git
05:29 jmpp joined #git
05:30 TrentonDAdams__ joined #git
05:32 Cabanossi joined #git
05:33 TrentonDAdams joined #git
05:33 TrentonDAdams joined #git
05:34 TrentonDAdams_ joined #git
05:35 darbaga joined #git
05:36 darbaga Hi. I want to put a directory under version control, but it's also going to have a directory which is a repository. Will this cause conflicts?
05:38 TomTomTo1 joined #git
05:39 kyan darbaga: Sounds like you want a submodule
05:40 darbaga Oh nod, thanks. I'll read about them.
05:40 kyan np :)
05:46 rivarun joined #git
05:47 kesslerfrost joined #git
05:49 DolphinDream left #git
05:51 Derperperd joined #git
05:52 krillr joined #git
05:52 bl0w3d_0ut joined #git
05:52 thierryp joined #git
06:00 dodoup joined #git
06:00 rivarun joined #git
06:00 jameser joined #git
06:01 masuberu joined #git
06:02 Peuc joined #git
06:03 variable joined #git
06:04 mentazoom joined #git
06:04 timvisher joined #git
06:05 darbaga joined #git
06:11 pks joined #git
06:13 kesslerfrost joined #git
06:19 alhariel joined #git
06:22 ikelso joined #git
06:23 navidr joined #git
06:23 stickperson joined #git
06:26 kesslerfrost joined #git
06:27 YuGiOhJCJ joined #git
06:29 jameser joined #git
06:30 stickperson left #git
06:33 dreiss joined #git
06:33 pur3eval joined #git
06:34 kesslerfrost joined #git
06:36 tanuki joined #git
06:37 Silenced joined #git
06:38 Silenced joined #git
06:42 ash_workz joined #git
06:44 pity joined #git
06:47 jeffspeff joined #git
06:47 dsdeiz joined #git
06:48 kesslerf_ joined #git
06:52 Derperperd joined #git
06:52 govg joined #git
06:53 tmsmith joined #git
06:55 Nick-chx joined #git
06:57 zefferno joined #git
06:57 xissburg joined #git
07:03 Nick-hxc joined #git
07:03 Nick-hxc left #git
07:06 kesslerfrost joined #git
07:08 pks joined #git
07:10 z3t0 joined #git
07:11 timvisher joined #git
07:12 iamtakingiteasy joined #git
07:16 hhee joined #git
07:17 nevodka joined #git
07:17 TomyLobo joined #git
07:17 svm_invictvs joined #git
07:18 phanimahesh joined #git
07:22 Derperperd joined #git
07:22 ikelso joined #git
07:27 BigChief joined #git
07:34 Abbott So if the .git folder has info for all past commits, won't it get very large? Even if it just stores changes?
07:38 pity joined #git
07:39 Anja joined #git
07:40 tvw joined #git
07:41 MaekSo joined #git
07:42 diogenese joined #git
07:42 lindenle joined #git
07:42 chachasmooth joined #git
07:44 BigChief joined #git
07:44 BigChief joined #git
07:49 pity joined #git
07:52 msonntag joined #git
07:52 jameser joined #git
07:54 thierryp joined #git
08:00 nostrora joined #git
08:00 chachasmooth joined #git
08:01 memfrob Abbott, not really.
08:02 PioneerAxon joined #git
08:02 jmpp joined #git
08:02 jmpp joined #git
08:02 memfrob Well.. "large" is an opinion. But you can clone the kernel git tree with the full history and it's not _THAT_ big, .git of course.
08:02 miczac joined #git
08:02 _ikke_ Abbott: In experience, the .git dir is even smaller than you working tree
08:02 memfrob Yeah unless your working tree is itty bitty XD
08:02 _ikke_ (of course depending in the type of data stored)
08:02 _ikke_ right
08:03 memfrob It'd have to be a text file that consists of only a few atoms for it to be smaller.
08:03 PioneerAxon joined #git
08:03 memfrob Generally the size of your hands are larger than .git
08:04 _ikke_ for git.git: .git dir 246M, working tree: 404M
08:04 rewt`` joined #git
08:04 _ikke_ hmm, after make clean: working tree: 86M
08:04 pur3eval joined #git
08:04 memfrob Are you using size or ls to determine that?
08:04 _ikke_ du
08:05 memfrob ah. Which is essentially ls --block-size=1 yes?
08:05 _ikke_ I use -sh
08:06 rt joined #git
08:06 _ikke_ so it is made human readable
08:06 memfrob -sh is incredibly broad though, you can't determine byte size with -h.
08:07 _ikke_ 251740 vs 420392 with git compiled
08:07 memfrob is that KiB or KB?
08:09 memfrob I understand the concept of KiB but prefer KB.
08:09 _ikke_ "Otherwise, units default to 1024 bytes"
08:09 _ikke_ so KiB
08:09 Mikerhinos joined #git
08:09 memfrob Ah.
08:09 saedelaere joined #git
08:09 chachasmooth joined #git
08:10 _ikke_ 257782 vs 430482 in KB
08:10 memfrob Lol I could have converted that myself but thanks XD
08:10 saedelaere joined #git
08:12 memfrob So what's everyone up to?
08:13 memfrob I just busted a racer in The Crew, he didn't like that very much XD
08:15 ankit01ojha joined #git
08:15 jmpp joined #git
08:15 jmpp joined #git
08:16 aw1 joined #git
08:23 sdothum joined #git
08:23 texinwien_ joined #git
08:23 ThomasLocke joined #git
08:23 ikelso joined #git
08:24 timvisher joined #git
08:26 sea-gull joined #git
08:26 jameser joined #git
08:26 darbaga joined #git
08:28 nkouevda joined #git
08:28 vuoto joined #git
08:29 Guest37296 joined #git
08:36 robotroll joined #git
08:38 cyan__ joined #git
08:40 nostrora joined #git
08:42 govg joined #git
08:43 shinnya joined #git
08:43 dave0x6d joined #git
08:43 davimore joined #git
08:44 chachasmooth joined #git
08:47 jameser joined #git
08:49 byte512 joined #git
08:53 afuentes joined #git
09:01 _main_ joined #git
09:01 johnny56_ joined #git
09:01 nostrora joined #git
09:02 _main_ joined #git
09:02 Groscheri joined #git
09:04 __main__ joined #git
09:05 sea-gull joined #git
09:07 rivarun joined #git
09:10 WhiskerBiscuit joined #git
09:19 mohabaks joined #git
09:22 zlhgo joined #git
09:23 zlhgo what word can mean branch,tag ?
09:23 nostrora joined #git
09:25 ThomasLocke joined #git
09:25 ThomasLocke joined #git
09:28 memfrob zlhgo, hmm?
09:29 memfrob what word can be used interchangeably with it's meaning both branch and tag?
09:29 kent\n ref
09:29 thierryp joined #git
09:30 kent\n as both branches and tags are "symbolic references" to commits.
09:30 memfrob I was just trying to understand his question but yes that's right
09:30 memfrob I don't spew things anymore unless I'm sure what the person means. XD
09:31 memfrob kent\n, did you understand ok?
09:31 [0xAA] joined #git
09:31 zlhgo memfrob,  yes
09:32 kent\n not sure. Saw it in my stalker bar and figured I knew the answer :)
09:32 memfrob XDDD
09:32 WayToDoor joined #git
09:32 memfrob well the answer is "ref" as he said it :)
09:32 zlhgo thanks, you two.
09:32 memfrob What'd I do??
09:33 bannakaffalatta joined #git
09:33 memfrob I at most rephrased the question :P
09:33 inflames joined #git
09:34 vdv joined #git
09:37 shtrb joined #git
09:38 suttonwilliamd joined #git
09:38 mar77i_ joined #git
09:42 elementalest joined #git
09:47 osse memfrob: ref is more general than branch,tag
09:47 osse But it's probably the word you're looking for anyway
09:47 shtrb left #git
09:48 memfrob Ok why is everyone responding to me but not the guy who asked the question XD
09:48 [0xAA] joined #git
09:48 memfrob I'm dyin rn, this situation is hilarious.
09:51 osse oops
09:51 cdown joined #git
09:51 osse i mean zlhgo
09:51 memfrob XDDDDD
09:54 timvisher joined #git
09:56 ertesx joined #git
09:58 minikN joined #git
09:58 netj joined #git
10:03 pity joined #git
10:05 a-l-e joined #git
10:05 coco joined #git
10:06 WayToDoor joined #git
10:06 TSS_ joined #git
10:08 jnavila joined #git
10:09 mar77i joined #git
10:10 cebor joined #git
10:12 Endarked joined #git
10:14 overlord_tm joined #git
10:14 Zoxc joined #git
10:15 satifant joined #git
10:16 m4sk1n joined #git
10:17 jmpp joined #git
10:20 skered joined #git
10:20 jozwior joined #git
10:22 skered Can I update a repo that was cloned with --depth=1 to include all the metadata/objects?
10:24 catsup joined #git
10:24 Panacea joined #git
10:25 ikelso joined #git
10:25 catsup joined #git
10:26 TSS_ joined #git
10:27 darbaga joined #git
10:29 ash_workz joined #git
10:29 jozwior joined #git
10:29 moei joined #git
10:30 vuoto joined #git
10:31 jameser joined #git
10:37 memfrob skered, --depth=1 doesn't include objects from before the metadata from before the first commit i dont think
10:38 memfrob sorry tired, let me re-write
10:38 memfrob --depth=1 doesn't include metadata from before the first commit i dont think, that's what --depth=1 does
10:38 crose joined #git
10:39 memfrob if you want git to track all the objects from before HEAD, you don't want --depth=1
10:40 memfrob git pull (update repo) functions the same however.
10:41 memfrob jeeze its almost 5am. crud. night all!
10:42 Jackneill joined #git
10:42 mablae joined #git
10:42 cdesai joined #git
10:44 ParticleGolem joined #git
10:44 donught joined #git
10:45 donught joined #git
10:50 NwS joined #git
10:51 Limes_ joined #git
10:51 cebor joined #git
10:52 navidr joined #git
10:53 jozwior joined #git
10:53 cr34ton joined #git
11:04 ShalokShalom_ joined #git
11:06 forrestv joined #git
11:08 osse skered: git fetch --unshallow
11:09 mar77i joined #git
11:12 theoceaniscool joined #git
11:14 timvisher joined #git
11:14 forrestv joined #git
11:15 denisMone joined #git
11:16 MineCoins joined #git
11:18 rahtgaz joined #git
11:18 _H2G joined #git
11:18 codemann joined #git
11:19 TyrfingMjolnir How can I make a local centralized repo?
11:19 TyrfingMjolnir On a random linux server with sshd
11:20 sim590 joined #git
11:21 kaldoran joined #git
11:22 mikecmpbll joined #git
11:22 spacelord_ joined #git
11:23 khfeng joined #git
11:23 osse TyrfingMjolnir: ssh random@random 'cd random.git; git init --bare'; git clone random@random:/random.git
11:27 psyb0t_ joined #git
11:29 cbreak joined #git
11:30 cyan__ joined #git
11:30 Anja joined #git
11:31 ZenWalker joined #git
11:39 mar77i joined #git
11:39 _H2G joined #git
11:40 ssitani joined #git
11:46 lindenle joined #git
11:46 pbrewczynski joined #git
11:47 bernardio joined #git
11:49 Rodya_ joined #git
11:52 ertesx joined #git
11:54 LordRyan joined #git
11:57 rivarun joined #git
12:00 mehola joined #git
12:03 duderonomy joined #git
12:07 dersand joined #git
12:07 SteffanW joined #git
12:09 mar77i joined #git
12:10 jameser joined #git
12:11 timvisher joined #git
12:11 masuberu joined #git
12:12 ThomasLocke joined #git
12:12 ThomasLocke joined #git
12:15 manuelschneid3r joined #git
12:15 pity joined #git
12:16 darbaga joined #git
12:16 Discovery joined #git
12:18 GavinMagnus joined #git
12:19 iLembus joined #git
12:20 jmpp joined #git
12:23 Ardethian\work joined #git
12:23 Ardethian\work joined #git
12:27 ikelso joined #git
12:27 pur3eval joined #git
12:28 MineCoins joined #git
12:29 aard_ joined #git
12:30 kyan joined #git
12:32 _H2G joined #git
12:35 JeanCarloMachado joined #git
12:36 gajus joined #git
12:39 mar77i joined #git
12:39 King_Hual joined #git
12:44 jozwior joined #git
12:50 ToxicFrog If you want some kind of access control kind of thing look into gitolite, but in general if you can ssh to it you can use it as a git remote.
12:51 jameser joined #git
12:54 sea-gull joined #git
12:56 cdown_ joined #git
12:58 Phreya joined #git
12:59 timvisher joined #git
12:59 JeanCarloMachado joined #git
13:02 treia joined #git
13:04 ome joined #git
13:04 Emperor_Earth joined #git
13:04 cdown_ joined #git
13:06 govg joined #git
13:08 JeanCarloMachado joined #git
13:08 SilverBe joined #git
13:09 mar77i joined #git
13:11 yqt joined #git
13:11 louipc left #git
13:21 jaafar joined #git
13:23 kyan Hi! When I clone a repository, the smudge filter does not seem to be run for the files for which it is configured in .gitattributes. I don't see any error messages on cloning with --verbose. How can I fix it? Thanks! (I also tried swapping the clean and smudge filters, still with no luck.)
13:25 kyan (Here's the repository, in case it helps: https://github.com/ethus3h/wreathe)
13:25 ayogi joined #git
13:27 hecliunyx joined #git
13:31 mikecmpbll joined #git
13:36 luxPerpetua joined #git
13:36 Derperperd joined #git
13:37 MrLawrence joined #git
13:39 mar77i joined #git
13:44 _joes_ joined #git
13:45 timvisher joined #git
13:47 Tobbi joined #git
13:48 psyb0t joined #git
13:54 Darcidride joined #git
13:55 WayToDoor joined #git
13:57 _H2G joined #git
13:57 Impaloo joined #git
14:00 mehola joined #git
14:06 Unode joined #git
14:06 Unode hi all
14:06 sdothum joined #git
14:07 Unode when using git-diff I often find myself squinting at the line diff to figure out what has actually changed. On the other hand I find the --word-diff option useful but a little hard to read. Do you know of any alternatives?
14:07 MineCoins joined #git
14:07 CheckDavid joined #git
14:08 mohabaks joined #git
14:10 isbotnetcool joined #git
14:10 netj joined #git
14:11 _ikke_ Unode: there is a highlight diff or what is it called in contrib
14:11 Unode what I'm looking for is something that ideally does the red/green highlighting on lines removed/added/changed but also uses some other color (or background) to highlight the bytes that actually changed. A Hybrid between --word-diff and the default one.
14:11 _ikke_ diff-highlight
14:11 Unode _ikke_: thanks I'll have a look. never used anything from contrib.
14:12 mentazoom joined #git
14:15 koneko joined #git
14:16 thierryp joined #git
14:18 ThomasLocke joined #git
14:18 _H2G joined #git
14:20 Unode _ikke_: while search for diff-highlight found https://github.com/so-fancy/diff-so-fancy seems to be exactly what I want. Thanks for the pointers.
14:20 anuxivm joined #git
14:20 _ikke_ Unode: yw
14:21 Unode I remember using diff-highlight some years ago but dropped it. If I remember correctly the performance hit was quite significant. Wondering about this diff-so-fancy one too...
14:22 Unode (performance hit -> to the point of being annoying with large diffs)
14:22 timvisher joined #git
14:23 linuxmodder- joined #git
14:23 jmpp joined #git
14:23 jmpp joined #git
14:26 luxPerpetua joined #git
14:28 ikelso joined #git
14:30 Unode seems diff-highlight is indeed all I need. Thanks again
14:30 rivarun joined #git
14:30 _ikke_ yw
14:32 pity joined #git
14:32 todd_dsm joined #git
14:34 Flaghacker joined #git
14:35 Flaghacker I accidentally added a file to a previous commit, how can I remove it? My history looks like this: A->Bad->B->C, and I want to remove a file "test.txt" from commit Bad. How can I do this?
14:36 _ikke_ Flaghacker: interactive rebase
14:36 _ikke_ did you Bad already?
14:36 _ikke_ did you push*
14:36 Flaghacker Nope, I haven' pushed anything yet.
14:36 _ikke_ ok
14:36 _ikke_ git rebase -i A then
14:36 _ikke_ assuming you have a branch pointing to C check out
14:36 _ikke_ checked out*
14:37 Flaghacker Yes master is pointing to C.
14:37 Derperperd joined #git
14:38 _ikke_ ok
14:38 _ikke_ Then run that command, and change pick to edit on the line that shows Bad
14:38 luxPerpetua joined #git
14:39 Flaghacker Ah I can't rebase because I have unstaged changes. What should I do about them?
14:39 _ikke_ stash them
14:39 _ikke_ (git rebase --autostash
14:40 _H2G joined #git
14:40 Guest36461 joined #git
14:42 thejoecarroll joined #git
14:42 Flaghacker _ikke_, Hmm that's taking a long time, it's CPU-bottlenecked. I'll reply when it is done.
14:43 _ikke_ Huh\
14:43 _ikke_ How many commits are there?
14:44 Flaghacker We before Bad about 30, after Bad really only 2.
14:44 Flaghacker So that was strange, but it's done now.
14:44 _ikke_ Should return insntantly than
14:44 _ikke_ How many commits are listed in there?
14:44 _ikke_ then*
14:45 Flaghacker Two, B and C.
14:45 dreiss joined #git
14:45 _ikke_ Really odd then\
14:46 _ikke_ Did you specify A as commit?
14:46 _ikke_ Bad should be listed too
14:46 Flaghacker Nope I made a mistake, I'll do that now.
14:46 geoid joined #git
14:46 bl0w3d_0ut joined #git
14:46 Flaghacker Is there a way to refer to commit by their name? Copying hashes gets tedious quickly...
14:46 _ikke_ HEAD~3 for example
14:47 _ikke_ HEAD is the last commit, HEAD~1 the commit before that
14:47 _ikke_ (last respective to the currently checked out branch)
14:47 Flaghacker Oh cool, thanks.
14:47 _ikke_ man gitrevisions
14:47 gitinfo the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
14:48 Flaghacker I'll look trough that when this rebase is done, thanks.
14:49 Flaghacker It says that I'm in the middle of another rebase (because I terminated the previous one) but running "git rebase --abort" should be fine, right?
14:49 aw1 joined #git
14:49 Tobbi joined #git
14:50 Flaghacker _ikke,_
14:50 Flaghacker *_ikke_?
14:51 _ikke_ if you did --abort it should not mention you are in the middle of a rebase anymore
14:52 Montesquieu joined #git
14:52 Flaghacker No I'm asking whether --abort would delete any data I had originally.
14:53 _ikke_ AH sorry
14:53 _ikke_ yeah
14:53 _ikke_ It should return you to the state you were before the rebase
14:54 syg__ joined #git
14:57 ikelso joined #git
14:57 mda1 joined #git
15:00 diogenese joined #git
15:01 _H2G joined #git
15:01 psyb0t_ joined #git
15:01 sbulage joined #git
15:04 Flaghacker Okay that's finally done, I'm now in vim. I'll change pick to edit on the line with Bad on it.
15:04 ZenWalker left #git
15:06 roentgen joined #git
15:07 _ikke_ right
15:09 Flaghacker Okay so that's done too, now I can ammend the commit? How would that work?
15:09 Flaghacker And what did rebase actually do?
15:09 _ikke_ Yes, you can ammend that commit now
15:09 _ikke_ Rebase reapplies commits and after eachother
15:10 _ikke_ It makes sure the rest of the history uses the new commit you create with ammend
15:10 kazantip joined #git
15:11 Flaghacker And what would it do if it encounters a conflict?
15:11 Hello71 stop.
15:12 Flaghacker That's nice.
15:12 Flaghacker How would I remove a file from the last commit?
15:13 Hello71 !fix
15:13 gitinfo [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
15:16 Flaghacker Hello71, Thanks!
15:16 mjuszczak joined #git
15:16 timvisher joined #git
15:17 finalbeta joined #git
15:17 ShalokShalom joined #git
15:21 miczac joined #git
15:22 Gsham joined #git
15:24 leeN joined #git
15:27 Murii joined #git
15:31 nckpz joined #git
15:37 blackwind_123 joined #git
15:38 Derperperd joined #git
15:38 JanC_ joined #git
15:40 finalbeta joined #git
15:45 Flaghacker Okay guys I really can't figure it out. I'm in the rebase and the last commit is Bad, how do I remove a file from it?
15:47 Flaghacker I always find this (http://stackoverflow.com/questions/12​481639/remove-files-from-git-commit) but git reset --soft HEAD^ doesn't do anything and I still want to keep the file on disk so "git rm" won't work too.
15:47 _ikke_ git rm --cached <file>
15:49 _main_ joined #git
15:49 cr34ton joined #git
15:49 lindenle joined #git
15:50 _main_ joined #git
15:51 ayogi joined #git
15:52 aard_ joined #git
15:52 _main_ joined #git
15:52 Goplat joined #git
15:56 axsu joined #git
15:56 Limes_ joined #git
15:58 mentazoom joined #git
16:02 diogenese joined #git
16:03 lindenle joined #git
16:05 cr34ton joined #git
16:07 Flaghacker _ikke_, That worked, thanks! Why was the --cached necessary?
16:08 _ikke_ to keep it on disk
16:09 VladGh joined #git
16:11 sunny256 I'm reviewing some Git patches with NeoMutt and try to apply many patches by tagging the patches, and apply them to the local repository with ";|git am". It only applies the first patch. Is this expected, or do I have to perform some git-am magic? Using the newest NeoMutt in git (20170113-14-7f1397) and the newest Git from master in git.git.
16:11 sunny256 Have tried to concatenate them into a single file with ";|cat >patch" and execute "git am patch" in the shell, but only the first patch is applied. Any tips on how to review and apply many patches from NeoMutt?
16:13 _ikke_ sunny256: is neomutt something new?
16:13 _ikke_ a fork of mutt I mean
16:13 theoceaniscool joined #git
16:14 bremner sortof a semi-fork; they're still sending things back upstream
16:15 _ikke_ ah ok
16:15 _ikke_ sunny256: I have a macro for this
16:16 nickabbey joined #git
16:16 timvisher joined #git
16:16 sunny256 _ikke_: Yes, it's a friendly semifork where they've collected lots of patches. Works great, and nice to see that things are happening with Mutt again. And they use Git, yay. :)
16:17 _H2G joined #git
16:17 sunny256 _ikke_: That macro sounds interesting.
16:17 _ikke_ sunny256: https://flavioleitner.blogspot.nl/2011/0​3/patch-workflow-with-mutt-and-git.html
16:17 sunny256 _ikke_: Cool, thanks. Checking it out now.
16:21 TyrfingMjolnir osse: That will give me a bare repo
16:21 TyrfingMjolnir I would like the files to be synced as well
16:23 mentazoom joined #git
16:24 _ikke_ TyrfingMjolnir: Do it in two steps
16:24 _ikke_ push to a bare repo from one place, and then fetch / pull from the other place
16:26 jmpp joined #git
16:27 Kaisyu joined #git
16:30 Impaloo71 joined #git
16:31 lvh joined #git
16:33 WayToDoor joined #git
16:34 sunny256 _ikke_: Really nice and useful blog post, thanks. This will work.
16:38 flavius joined #git
16:38 shubhnik joined #git
16:38 hasc joined #git
16:38 Derperperd joined #git
16:39 sunny256 The fine folks in #neomutt also suggested "set pipe_split". I added it to .muttrc, and now sending tagged messages to git-am works. It starts a separate git-am for every message.
16:41 _ikke_ sunny256: pipe_split was also mentioned in that post
16:42 _ikke_ sunny256: btw, any reason to use neomutt over mutt?
16:43 pity joined #git
16:43 damjan joined #git
16:43 sunny256 _ikke_: Mostly because they're using Git. :) Mercurial is probably ok, but I only know the basic commands there.
16:44 _ikke_ Ok
16:44 _ikke_ Are you building it from source?
16:44 damjan left #git
16:44 sunny256 Yes, I have a collection of Makefiles that compile, install and upgrade important software I use often.
16:44 jnavila joined #git
16:45 _ikke_ ah ok
16:45 _ikke_ I use my package manager for that
16:45 sunny256 So it's just a "make fullclean upgrade" and everything is nice and modern.
16:45 _ikke_ I have a rolling release distro, so I'm getting up-to-date packages really quick
16:45 sunny256 Yes, the correct way would probably be to create .debs and stuff, but this system works on the *BSDs to.
16:45 pbrewczynski joined #git
16:46 sunny256 Should probably put it on GitLab or something, it works well.
16:47 ikelso joined #git
16:49 _ikke_ I use arch + pacman
16:49 _ikke_ I really like how it works
16:52 sunny256 Arch is awesome, I've messed around with it a bit. Very flexible any Unixy distro. But old habits and lazyness keeps me on the Debian platform. :)
16:52 kloeri joined #git
16:53 osse TyrfingMjolnir: the repo on the server is bare. the clone is not
16:53 osse TyrfingMjolnir: files will be "synced"
16:53 ozcy joined #git
16:54 _H2G joined #git
16:55 xall_ joined #git
16:56 _ikke_ Note that git is not really good for just file syncing
16:57 yqt joined #git
16:58 metachr0n joined #git
16:59 texinwien_ joined #git
17:01 Yxrc joined #git
17:02 finalbeta joined #git
17:02 timvisher joined #git
17:03 ash_workz joined #git
17:07 cbreak as far as I've seen, Ubuntu is the best distro at the moment
17:07 cbreak and I've tried both Ubuntu and Fedora :)
17:07 xall_ joined #git
17:08 _ikke_ lol
17:08 bremner rcs is definitely better than sccs
17:09 ShalokShalom joined #git
17:10 nckpz joined #git
17:11 ElGrandeAmigo joined #git
17:13 geoid joined #git
17:15 albel727 joined #git
17:19 madewokherd joined #git
17:22 Groscheri joined #git
17:26 Nicmavr joined #git
17:26 vdv joined #git
17:29 Guest68376 joined #git
17:29 albel727 joined #git
17:30 kyan joined #git
17:36 Noldorin joined #git
17:38 tristanp joined #git
17:38 jmpp joined #git
17:39 ayogi joined #git
17:39 rajat joined #git
17:40 Derperperd joined #git
17:41 Kestrel-029 joined #git
17:41 Kestrel-029 joined #git
17:42 dreiss joined #git
17:43 xall joined #git
17:47 BSaboia joined #git
17:48 Tobbi joined #git
17:50 Ranmaru joined #git
17:50 grep_aar_kash joined #git
17:51 menip joined #git
17:53 albel727 joined #git
17:54 TyrfingMjolnir osse: So if I push to my local ssh server I will not see any files, however if I clone to a different laptop the files will be there?
17:55 TyrfingMjolnir cbreak: Why would anyone ever try Fedora? It's a hat, not a distro; are you an Indiana Jones fan?
17:55 dsdeiz joined #git
17:55 timvisher joined #git
17:55 dsdeiz joined #git
17:56 Panacea joined #git
17:57 YuGiOhJCJ joined #git
17:57 coco joined #git
17:57 _ikke_ TyrfingMjolnir: Correct
17:57 _ikke_ TyrfingMjolnir: The repo has the files, just not visible on the filesystem
18:01 lvh joined #git
18:01 metachr0n joined #git
18:01 afuentes joined #git
18:02 mehola joined #git
18:06 [0xAA] joined #git
18:08 energizer joined #git
18:09 ElGrandeAmigo left #git
18:10 SpeakerToMeat joined #git
18:12 cdown_ joined #git
18:13 Naan joined #git
18:13 ssitani joined #git
18:15 cbreak TyrfingMjolnir: I am
18:15 cbreak coolest "archeologer" that has ever fought nazis in movies.
18:19 acetakwas joined #git
18:22 gugah joined #git
18:22 finalbeta joined #git
18:26 Gsham joined #git
18:29 jaafar joined #git
18:31 mjuszczak joined #git
18:32 Tobbi joined #git
18:33 Murii joined #git
18:35 Mikerhinos joined #git
18:36 bocaneri joined #git
18:37 texinwien_ joined #git
18:39 timvisher joined #git
18:41 Derperperd joined #git
18:44 Ryanar joined #git
18:47 koneko joined #git
18:49 rajat joined #git
18:50 mostlybadfly joined #git
18:51 cr34ton joined #git
18:51 armyriad joined #git
18:52 Unode left #git
18:53 bocaneri joined #git
18:58 ShalokShalom_ joined #git
19:00 umpc joined #git
19:00 voldz1tic3n joined #git
19:00 synthroid joined #git
19:02 Glooomy joined #git
19:03 mar77i joined #git
19:05 robotroll joined #git
19:05 ShalokShalom joined #git
19:05 gugah joined #git
19:06 Goplat joined #git
19:07 pity joined #git
19:07 mizu_no_oto joined #git
19:08 mikecmpbll joined #git
19:09 sarri joined #git
19:09 sarri joined #git
19:11 LeBlaaanc joined #git
19:17 MineCoins joined #git
19:18 dreiss joined #git
19:18 nivag joined #git
19:19 jccn joined #git
19:19 lvh joined #git
19:21 Hudu joined #git
19:22 jccn joined #git
19:24 timvisher joined #git
19:28 aw1 joined #git
19:30 cdg joined #git
19:30 WayToDoor joined #git
19:32 fatalhalt joined #git
19:33 zacts joined #git
19:35 pulec joined #git
19:35 pulec hi, I could not find the information if collaborators have permission to create new branches
19:36 pulec oh me fool! wrong password
19:36 pulec but I had my ssh-agent running, git should not prompt me for pass on this ocassion
19:36 dreiss joined #git
19:36 svm_invictvs joined #git
19:37 denisMone joined #git
19:38 _ikke_ password or passphrase?
19:38 _ikke_ password means no key is used
19:42 Derperperd joined #git
19:42 davimore_ joined #git
19:45 finalbeta joined #git
19:47 kulelu88 joined #git
19:47 peeps[lappy] joined #git
19:48 miczac joined #git
19:49 thiago pulec: what URL were you pushing to?
19:49 brent__ joined #git
19:50 pulec thiago, I used:
19:50 pulec git checkout -b 'get_metadata' remotes/origin/develop
19:50 pulec to create get_metadata branch from develop
19:50 pulec not sure why using from local develop branch didn't work
19:51 idlemind joined #git
19:51 bremner git checkout should never ask you for a password/passphrase
19:54 chachasmooth joined #git
19:56 timvisher joined #git
19:58 multi_io joined #git
19:58 thiago pulec: and yet you did not answer my question
19:58 thiago pulec: there's no password involved with git branch, since it's an entirely local operation
19:58 pulec thiago, I am git lame, no idea where I pushed
19:58 thiago only fetch & push can ask for passwords
19:58 thiago (and ls-remote, but you wouldn't have used that)
19:59 thiago what command did you run that asked for a password?
19:59 phree joined #git
19:59 pulec git push
20:00 thiago git remote -v
20:00 thiago that will tell you the URLs of all your remotes
20:00 thiago ssh-agent does not apply to https
20:00 pulec yup, got one for fetch and for push
20:01 thiago there you go, that's why ssh-agent didn't help you
20:01 nettoweb joined #git
20:01 pulec mkay :D
20:02 pulec does not work with https, noted
20:03 texinwien joined #git
20:04 pulec thx
20:06 roelmonnens joined #git
20:09 nivag joined #git
20:15 dreiss joined #git
20:16 anuxivm joined #git
20:21 publio joined #git
20:26 roelmonnens joined #git
20:28 timvisher joined #git
20:29 shgysk8zer0 joined #git
20:31 mjuszczak joined #git
20:32 roelmonnens joined #git
20:34 variable joined #git
20:34 rubyonrailed joined #git
20:37 kkbi joined #git
20:42 Montesquieu left #git
20:43 Derperperd joined #git
20:45 TFrag joined #git
20:51 pypypypypy joined #git
20:52 overlord_tm joined #git
20:52 idlemind joined #git
20:54 nettoweb joined #git
20:55 aidalgol joined #git
20:56 mentazoom joined #git
20:58 timvisher joined #git
20:58 _H2G joined #git
21:01 mar77i joined #git
21:01 davimore joined #git
21:01 orzo git should allow fall-back urls.  For example, github supports both ssh and https.  I'd like to fall-back to https when i happen to be behind a firewall that doesn't allow ssh
21:02 idlemind joined #git
21:03 mmattice orzo: just create a second remote with the other URI?
21:03 sargentmki joined #git
21:05 Orphis joined #git
21:06 manuelschneid3r joined #git
21:06 cdg joined #git
21:07 jeffspeff joined #git
21:08 cdown_ joined #git
21:08 WhiskerBiscuit joined #git
21:09 Ryanar joined #git
21:09 brent__ joined #git
21:09 dreiss joined #git
21:10 T-J-M joined #git
21:11 T-J-M Hi there, is it possible to import the content of a symbolic link in git-annex?
21:12 T-J-M For example, I have the same file both on PC and Laptop. However, they have different names.
21:12 jstein_ joined #git
21:12 T-J-M FileA is the name used on PC, and FileB is the name used on Laptop
21:12 jeffreylevesque how do you rebase a commit message, while retaining that it start with the git issue number like `#23: blah: my message`
21:14 moritz jeffreylevesque: git config --global core.commentChar auto
21:14 jeffreylevesque what does that do?
21:14 T-J-M And after I add FileA in to git root archive and sync. I want the laptop know that the same content exsits on the disk and can be synchronized without downloading
21:14 moritz jeffreylevesque: man git config :-)
21:14 gitinfo jeffreylevesque: the git-config manpage is available at http://jk.gs/git-config.html
21:16 T-J-M So, is it possible to use git-annex like the command transmission --data which can first check whether the content is on the disk and then synchronize it with out network traffic.
21:18 Derperperd joined #git
21:22 vuoto joined #git
21:22 _28_ria joined #git
21:24 _28_ria joined #git
21:24 jeffreylevesque that didn't work
21:25 jeffreylevesque it still wouldn't let me rebase my commits
21:25 jeffreylevesque because i wanted my commit message to start with a #
21:25 WhiskerBiscuit joined #git
21:26 timvisher joined #git
21:26 Flaghacker joined #git
21:28 APNG left #git
21:28 Flaghacker I'm having some issues: there is a specific file that git seems to ignore. It's not in .gitignore nor in .git/info/exclude. It is tracked, there are some commits that added it. I've tried to debug by executing "git check-ignore file" but that doesn't print anything. Is there anything else that could cause this?
21:29 bremner git status --ignored
21:29 bremner oh, tracked and ignored? suspect.
21:29 Flaghacker Well I'm certain it was tracked in the past.
21:30 bremner ok, what does git status --ignored report?
21:31 Flaghacker A bunch of ignored files but not the one I'm looking for. I've tried replacing the entire file with "Hello World", I've tried deleting it, but none of that changes anything.
21:32 bremner git diff and git diff --cached don't see the changes?
21:34 matsaman joined #git
21:34 Flaghacker Nope. They see the other changes offcourse, but again not in the problematic file.
21:35 askb joined #git
21:35 GavinMagnus joined #git
21:36 synthroid joined #git
21:36 DrSlony joined #git
21:36 GavinMagnus joined #git
21:36 vuoto joined #git
21:37 DrSlony Hello, we are in a unique and temporary position where we have two branches: master is GTK2 and gtk3 is GTK3. Now we're about to tag a new release. The idea is to tag master "5.0-gtk2" and gtk3 "5.0-gtk3". Are there any issues with having a non-number as part of the tag?
21:38 pity joined #git
21:39 Flaghacker bremner, To check that there's nothing wrong with the file itself, I deleted it and made a new blanc one, it still doesn't work;
21:39 gugah joined #git
21:39 dreiss joined #git
21:39 _ikke_ DrSlony: From git's part there aren't any
21:39 matsaman DrSlony: I would imagine there are only potentially aesthetic problems, not actual problems, that could potentially but won't necessarily happen
21:39 DrSlony thanks _ikke_
21:40 matsaman like, who knows how github might aesthetically present tags, etc.
21:40 _ikke_ DrSlony: (it even has support for it sorting wise)
21:40 texinwien joined #git
21:40 bremner Flaghacker: I'm pretty much out of ideas. Is it an unusual file system?
21:40 DrSlony the only alternative is tagging master "5.0" and asking gtk3 people to checkout 5.0 and manually switch branches to gtk3. That seams dirty.
21:40 Flaghacker Standard Windows 10
21:41 jaafar joined #git
21:41 Flaghacker I've never had a problem with it until now.
21:41 bremner maybe case insensitive file names?
21:41 bremner dunno, I'm not a windows user.
21:41 DrSlony Flaghacker whats the problem?
21:41 bremner Usually people on windows have extra changes from line endings.
21:42 dfas joined #git
21:42 rivarun joined #git
21:42 acetakwas joined #git
21:43 mentazoom joined #git
21:43 vuoto joined #git
21:43 Flaghacker DrSlony, git is ignoring a file but it's not in .gitignore nor in .git/info/exclude. git check-ignore doesn't print anything, neither does git diff --cached. I've tried replacing the file with a new empty one, same problem.
21:43 dhollinger joined #git
21:43 Flaghacker Also git status --ignored doesn't show changes to that file.
21:43 DrSlony Flaghacker binary file?
21:44 Flaghacker A normal .java UTF-8 file.
21:45 isbotnetcool joined #git
21:45 matsaman what makes you think it's ignoring it?
21:46 ihradek joined #git
21:46 rumble joined #git
21:46 Flaghacker matsaman, When I do anything to it (change the content, delete) git status doesn't show it and even git add -f doesn't do anything.
21:48 Darcidride joined #git
21:48 vuoto joined #git
21:48 NvpkD1y7Ez joined #git
21:49 anon_ joined #git
21:50 nettoweb joined #git
21:50 matsaman sounds like it's ignored =)
21:50 DrSlony left #git
21:51 Flaghacker matsaman, Yea I figured out that one :D
21:52 matsaman Flaghacker: git check-ignore ?
21:52 Flaghacker Yup tried that one, and it prints nothing.
21:52 timvisher joined #git
21:53 matsaman hrmmm
21:53 matsaman do you have a ~/.config/git/ignore ?
21:55 Flaghacker What's ~ one Windows?
21:56 matsaman Flaghacker: ugh, good question
21:56 matsaman probably somewhere in %APPDATA%
21:56 Flaghacker It looks like it's C:/Users/{username}/
21:57 l33ch joined #git
21:57 matsaman that would be an odd place, for Windows
21:57 matsaman even though it would make sense
21:57 matsaman but, um
21:57 matsaman if you don't even know where it is, the chances it exists are slim
21:58 matsaman this isn't a Windows install you inherited from someone else, right?
21:58 Flaghacker Nope.
21:58 matsaman k, think we can ignore that possibility
21:58 matsaman you say it's foo.java?
21:59 Tobbi joined #git
21:59 Flaghacker Yes it's in a bunch of subdirs but that's doesn't really matter.
22:00 Flaghacker Now that I think about it I am using a plugin that adds a command "git ignore" because someone recommended it to me, so it could have something to do with that. I'll look in the docs.
22:00 mda1 joined #git
22:01 matsaman Flaghacker: hrmmm
22:01 matsaman Flaghacker: yeah also, are you using some IDE?
22:01 matsaman 'cause some IDE's will have doubled up ignoring before it even gets to a VCS
22:02 Flaghacker Well normally I'm using Idea but for debugging purposes I'm using notepad and cmd.
22:02 mizu_no_oto joined #git
22:03 matsaman mmm
22:03 mehola joined #git
22:03 Flaghacker Nope the plugin doesn't know about it either, it only lists some global ignore (with a bunch of Visual Studio crap in it) and the local .gitignore .
22:03 matsaman you might make a separate git repo real quick and put a file of the same name in there and see if it's ignored
22:03 matsaman that'd tell you if it's a global system problem anyway
22:04 Zialus joined #git
22:04 Flaghacker I'll do that.
22:07 Khisanth joined #git
22:08 Flaghacker matsaman, I copied over everything excluding the .git folder and I even copied the exclude file, and it simply works. Really strange.
22:08 infinite_ joined #git
22:09 matsaman Flaghacker: hrmmm
22:10 matsaman I don't know what kind of ignore would only be present in .git's metadata
22:10 matsaman but someone else probably is
22:10 matsaman well actually
22:10 matsaman if you had a global ignore, the path could matter
22:10 matsaman so for a full test you'd want to mv your original from where it is to elsewhere, then more your new test to where the original was, then check again =P
22:10 mar77i_ joined #git
22:10 Flaghacker But wouldn't git check-ignore report it then? I'll try anyway...
22:11 matsaman well I feel like check-ignore should already be reporting it
22:11 roelmonnens joined #git
22:11 matsaman so we can't rely on that anyway, unfortunately
22:12 _28_ria joined #git
22:13 freekevin joined #git
22:13 Flaghacker matsaman, So now I copied the entire project and I deleted the .git folder in the original one. It works correctly, git add adds the file -_-
22:13 matsaman yeah, that's weird =P
22:13 Flaghacker Unfortunately I need my local history :)
22:13 matsaman anyway, now when someone who knows git's internals really well is around, you can say 'something in .git is keeping this file ignored'
22:13 _28_ria joined #git
22:14 matsaman I wonder if it'd work if you cloned that repo
22:15 Flaghacker matsaman, I'll keep that in mind :) How would I go about cloning a local repository?
22:15 thiago is the file in a subdir?
22:16 matsaman Flaghacker: think you'd want to pull into a fresh one
22:17 Flaghacker thiago, Yes
22:17 thiago is the subdir a submodule?
22:17 Flaghacker thiago, It's in an Idea module yes.
22:18 Flaghacker matsaman, It's just that I've never done this before, I usually clone from github.
22:18 thiago that's not what I asked
22:18 thiago is it a Git submodule
22:18 thiago answer "I don't know" if you don't know how to check
22:18 jbitdrop joined #git
22:19 digidog joined #git
22:19 matsaman Flaghacker: yeah nor I
22:19 Flaghacker thiago, I didn't know something like a "git submodule" existed, I'm sorry. I don't know how to check.
22:19 thiago Flaghacker: ok
22:19 matsaman Flaghacker: git clone foo bar seems to work
22:20 freekevin joined #git
22:20 thiago Flaghacker: git ls-tree -r -t HEAD | grep subdir. Does it say "tree"?
22:21 digidog joined #git
22:21 Hudu joined #git
22:22 austin987 joined #git
22:22 mehola joined #git
22:23 Flaghacker thiago, I'm running windows, so grep doesn't exist. I don't see any mention of subdir in the output of the first part though, so I guess it wouldn't print "tree".
22:23 Atm0spher1c joined #git
22:23 thiago Flaghacker: is the subdir a direct subdir of the top dir, or is it inside another subdir?
22:23 austin987 fyi, there's 'findstr' on windows
22:23 thiago try finding the closest path
22:24 thiago also please note that you must run git ls-tree from the top of your Git repository
22:24 thiago I didn't mean a literal "subdir". I meant the name of the subdir where the file in question is located.
22:24 Flaghacker Well the file I'm talking about in in src/main/java/bot/BotStarter.java, so it's a couple of dirs down. Yes I ran it from the root of my project.
22:25 Flaghacker Ah okay, I'll look again
22:25 Flaghacker Yes it says treee.
22:25 thiago ok, search for src/main/java/bot. If that isn't there, search src/main/java, and so forth
22:25 Flaghacker *tree
22:25 thiago for which one?
22:25 Flaghacker There is this line "040000 tree 5d3976643fc8b3acfd99606ba4f0727f67bf1fc1    src/main/java/bot", so for the full dir path.
22:25 thiago ok, so it's not a subdir
22:26 thiago sorry, I mean, it's not a submodule
22:26 Flaghacker And that's ... good?
22:26 thiago describe your problem again. What's wrong with src/main/java/bot/BotStarter.java ?
22:26 thiago yes, it's good
22:27 Rodya_ joined #git
22:28 Flaghacker thiago, Not a single git command seems to "see" it. That's diff (--cached), add (-f) and check-ignored. It's not in .gitignore nor in .git/info/exclude.
22:28 thiago does git log "see" it?
22:29 Flaghacker thiago, Yes.
22:29 thiago ok, so my theory: there's nothing wrong with Git or the file
22:29 thiago it has no changes
22:30 chachasmooth joined #git
22:30 shgysk8zer0 joined #git
22:30 kulelu88 joined #git
22:31 Flaghacker thiago, I replaced the whole content with "test", still nothing from "git status". I delete the file, still nothing.
22:31 Flaghacker I just tried it again to be sure.
22:32 thiago ok, so delete the file from the command-line and do a git status. Then copy & paste the entire terminal so I can see it.
22:32 kulelu88 Hello all. I have an org on github. I have merged code from my fork into the org repo, but the travis-build is breaking. how do I go back to a previous version of the code via github in the org repo ?
22:32 thiago kulelu88: git checkout workingversion .  (including the dot)
22:32 kulelu88 I don't care about conflicts, etc. as I am the only 1 who made the last few commits
22:32 thiago kulelu88: then commit and push again.
22:33 thiago kulelu88: note that you will not be able to merge again
22:33 kulelu88 thiago: so I need to clone the org repo and do it locally?
22:33 thiago kulelu88: yes
22:33 kulelu88 and my fork will not be able to merge anymore?
22:33 kulelu88 and I need to fork again?
22:33 thiago kulelu88: you can merge other commits. Just not that one, which is broken.
22:34 thiago or any commits leading up to it
22:34 thiago suggestion: test the merge result before you push it to the main repository
22:34 kulelu88 thiago: I pushed code into the same branch. how do I undo changes in the branch?
22:35 thiago kulelu88: the command I've just given you will undo all changes and set it back to the commit that was last working
22:35 Flaghacker thiago, Done: https://gist.github.com/flaghacker​/166e7ccec07ba59663d193d7e3ab4b98
22:36 thiago Flaghacker: ok, that is definitely weird.
22:36 brent__ joined #git
22:36 Flaghacker thiago, Yea I know :)
22:36 thiago Flaghacker: there goes my theory
22:36 thiago Flaghacker: my next investigation would require running a tool like strace. Since you're on Windows, that's out.
22:36 Jellyg00se joined #git
22:37 thiago Flaghacker: so last theory: how did you obtain this repository? Was it via a clone? Or did copy it from elsewhere?
22:38 Flaghacker I created an empty repository on Github, and I cloned that one. I have been working on it ever since and this is the first issue I'm having.
22:38 thiago Flaghacker: ok
22:38 thiago Flaghacker: then it isn't a copy problem
22:38 thiago Flaghacker: one more idea: Git on Windows has a service that watches files for you because Windows FS I/O is so slow compared to other OSes. Check if you have it on and, if so, disable it.
22:39 codemann joined #git
22:39 thiago Flaghacker: it should be a setting on your global config: git config --global --list
22:40 danimal2 joined #git
22:40 Flaghacker I don't see anything that seems related in the config I'm afraid.
22:42 Flaghacker I'll try matsaman's suggestion about cloning now, I _really_ hope this works.
22:43 gugah_ joined #git
22:43 mizu_no_oto joined #git
22:45 cyan__ joined #git
22:48 justanotheruser joined #git
22:48 GavinMagnus left #git
22:50 aw1 joined #git
22:51 Flaghacker thiago, matsaman, That actually worked! Thanks both of you for helping me.
22:51 radens joined #git
22:51 Flaghacker It's not cloning all of the branches yet and origin is still wrong, but that's something for another day. See you guys!
22:52 radens Hello I'm using git-lfs and github and getting this error when I push a multi-gb file locking: http: http: Not Found
22:52 radens locking: http: http: Not Found
22:52 Murii joined #git
22:54 mentazoom joined #git
22:54 Goplat joined #git
22:54 nettoweb joined #git
22:55 vrlx joined #git
22:56 chachasmooth joined #git
22:59 ij joined #git
23:00 ij Is it possible to download only commit objects, not trees or blobs, since I care about updates and commit msgs only.
23:00 ij s/.$/?
23:01 fmeerkoetter joined #git
23:03 cbreak no
23:03 ij That's too bad.
23:04 ij Would it be hard to write one? Or is it impossible to ask for only specific objects from git server?
23:06 matsaman nothing is impossible in software
23:07 gugah_ joined #git
23:08 ij I mean the pragmatical, "it's impossible for PHP companies to switch to Haskell" kind of sense.
23:08 _28_ria joined #git
23:09 nevodka joined #git
23:10 _28_ria joined #git
23:11 DonVitoCorleone joined #git
23:14 Qmumd joined #git
23:15 rubyonrailed joined #git
23:16 dhollinger joined #git
23:16 a_thakur joined #git
23:20 mizu_no_oto joined #git
23:20 BSAlb joined #git
23:22 boombatower joined #git
23:22 Hudu joined #git
23:22 chachasmooth joined #git
23:22 gugah_ joined #git
23:23 _28_ria joined #git
23:24 treia joined #git
23:25 ash_workz joined #git
23:27 _28_ria joined #git
23:27 Kaisyu joined #git
23:28 radens Is anyone here familar with git lfs?
23:28 matsaman radens: not a useful question =)
23:30 nettoweb joined #git
23:30 radens matsaman: Well I'm getting a vague error: locking: http: http: Not Found
23:31 chachasmooth joined #git
23:31 Naan joined #git
23:33 WifiBrain joined #git
23:33 Gsham joined #git
23:33 Atemu joined #git
23:36 DonVitoCorleone joined #git
23:38 timvisher joined #git
23:39 chachasmooth joined #git
23:44 PaulCapestany joined #git
23:48 dsantiago joined #git
23:49 chardan joined #git
23:49 Rodya_ joined #git
23:50 chachasmooth joined #git
23:51 Rodya_ joined #git
23:53 matsaman radens: say it to the channel and more people will think it's for anyone to consider
23:53 matsaman Sundays are so quiet
23:54 radens yeah
23:55 bremner ij: afaik it's baked into the protocol
23:55 bremner you can fetch refs.
23:55 ij So it fetches all dependent objects and sends you a pack?
23:56 texinwien_ joined #git
23:56 texinwien_ joined #git
23:58 bremner something like that.

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