Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-05-16

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

All times shown according to UTC.

Time Nick Message
00:00 prg3 joined #git
00:02 rominronin joined #git
00:02 Cabanossi joined #git
00:02 TheFuzzball joined #git
00:02 plos joined #git
00:11 rchavik joined #git
00:13 TbobbyZ joined #git
00:15 GT4066 joined #git
00:18 mizu_no_oto joined #git
00:27 b1tchcakes joined #git
00:31 wxg joined #git
00:36 Gsham joined #git
00:37 gnixev_ joined #git
00:39 ogny joined #git
00:40 RalphJr45 joined #git
00:41 walsingham joined #git
00:46 Stumbler joined #git
00:47 opnut joined #git
00:47 Cabanossi joined #git
00:47 rorro joined #git
00:49 bremner I have a corrupted pack http://paste.debian.net/932651/ ; I have the object in another repo, how can fix things up
00:50 bremner hmm. git unpack-objects is doing things...
00:51 bremner no, no it isn't.
00:51 dviola joined #git
00:51 theiostream joined #git
00:53 dsdeiz joined #git
00:53 pifon joined #git
00:56 NeverDie joined #git
00:56 fstd_ joined #git
00:56 cqi joined #git
00:58 eehackr joined #git
01:00 raspado joined #git
01:04 Wxya joined #git
01:04 Stumbler joined #git
01:05 netj joined #git
01:06 snits joined #git
01:06 Vampire0 bremner, I try simply copying over the object from the other repo to your repo, this could already be enough to make Git heappy
01:06 Vampire0 s/heappy/happy/
01:06 Vampire0 bremner, but better make a !backup now before you destroy even more while trying to fix it
01:06 gitinfo bremner: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
01:06 dsdeiz joined #git
01:07 bremner Vampire0: I have two backups, that are one commit behind.
01:10 netj joined #git
01:11 Vampire0 bremner, fine. :-)
01:11 Vampire0 bremner, so did copying over the object help?
01:13 bremner well. Now I have to find the object in inside one of 10 pack files
01:13 bremner so, lazy way, running git repack -a
01:13 LeBlaaanc joined #git
01:14 bitmod joined #git
01:15 moei joined #git
01:16 raijin joined #git
01:17 Hello71 wait, hold on, so I did "git fetch origin devel", but now "git checkout origin/devel --" says fatal: invalid reference: origin/devel
01:17 SwiftMatt joined #git
01:17 Hello71 even though git fetch said  * branch            devel      -> FETCH_HEAD
01:17 bailon joined #git
01:17 Hello71 "grafted" oh.
01:18 dreiss joined #git
01:19 tunekey joined #git
01:19 b0nn I have an environment where I have several branches. I want to combine all the branches into a new branch
01:20 b0nn WITHOUT affecting the original branches
01:20 finalbeta joined #git
01:20 LBV_User joined #git
01:20 Vampire0 Hello71, what version of git is this? !fetch4
01:20 gitinfo Hello71: [!fetchfour] [pre 1.8.4 only] We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).
01:20 Hello71 oh. hm.
01:20 b0nn that is, I want to copy all the branches into a single branch, is that possible, and if so, can someone point me toa  resource that explains how to?
01:20 Gsham joined #git
01:20 Hello71 1.8.4?
01:21 Vampire0 from 1.8.4 on the remote tracking branch should get updated, yes
01:21 Hello71 1.9.0 was released 4 years ago though
01:21 Hello71 2.13.0
01:21 Hello71 which is why I remember it working properly.
01:21 jon-mac joined #git
01:22 Vampire0 b0nn, if you merge one branch into another, the merge source never is affected. Just merge all your branches in, either one-by-one, or all at once with one octopus merge
01:23 b0nn Vampire0: oh, cool; So, to be clear, if I have branches A, B, and C, I can merge them all into branch D without affecting A, b, C, in any way?
01:23 Vampire0 Hello71, so? There are still people using older versions on old systems that do not have something newer in the package manager and do not want to compile from source or use 3rd party PPAs
01:23 Vampire0 Hello71, seldomly, but happens
01:23 Hello71 insecure systems?
01:23 Vampire0 Hello71, maybe, not my cup of tea ;-)
01:24 Vampire0 Hello71, so then it should probably work. But your "even though" is wrong. "even though" would be appropriate if it would have said "devel -> origin/devel", not if it said "devel -> FETCH_HEAD"
01:24 Hello71 hm, centos 6 has 1.7.1
01:25 Hello71 Vampire0: right.
01:25 Vampire0 oh, does it, interesting
01:25 Hello71 I'm trying to get devel from https://git.savannah.gnu.org/git/bash.git
01:26 Vampire0 and 6.9 was released a month ago
01:26 Hello71 probably because I did --depth=1
01:27 Vampire0 where?
01:27 Hello71 when cloning
01:28 Hello71 hm, no, git fetch origin devel --unshallow didn't help
01:28 MattMaker joined #git
01:28 Vampire0 Hello71, yes it is I think
01:29 sunri5e_ joined #git
01:29 Vampire0 Hello71, `git init && git remote add origin https://git.savannah.gnu.org/git/bash.git && git fetch origin devel` works fine
01:29 Vampire0 * branch              devel      -> FETCH_HEAD
01:29 Vampire0 * [neuer Branch]      devel      -> origin/devel
01:30 Vampire0 Hello71, `git clone https://git.savannah.gnu.org/git/bash.git --depth=1 . && git fetch origin devel` does not
01:30 Vampire0 * branch              devel      -> FETCH_HEAD
01:31 Hello71 Mmhmm.
01:33 rominronin joined #git
01:34 Nilesh_ joined #git
01:34 Hello71 hm, seems that --unshallow with an explicit ref doesn't work right?
01:34 Peuc joined #git
01:34 Vampire0 Hello71, no, unshallow works fine. try it again and it will tell you that you have a complete repo
01:35 Hello71 try git branch -a
01:35 Vampire0 I know, I even know the reason
01:35 Hello71 oh, wait, no, unshallow doesn't make the remote refs... what's up with that
01:36 Vampire0 You can fetch the branch into the shallow clone fine, even with only the tip commit again when giving --depth=1 on the fetch command too
01:36 Vampire0 The problem is the fetch refspedc
01:36 Vampire0 s/refspedc/refspec/
01:37 Vampire0 Hello71, do `git config --get-regexp remote` and you see that the fetch refspec only contains master
01:37 Vampire0 Hello71, either change it to + or add a line for devel
01:37 Vampire0 Hello71, or update the ref manually after fetching to FETCH_HEAD
01:38 Hello71 hm. I deleted the remote then re-added it.
01:38 Hello71 which I guess works too.
01:38 Hello71 seems like a pretty opaque failure mode though
01:38 hhee joined #git
01:39 Stumbler 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. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.13.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:54 TheSimonator joined #git
01:56 d^sh joined #git
01:57 njbair joined #git
02:01 Vampire0 Hello71, what do you mean? The docs of clone --depth say if not --no-single-branch is given --single-branch is implied. --single-branch doc says that Git will behave exactly like you observed
02:01 Vampire0 Hello71, fetching always only update the refs in your fetch refspec
02:02 Vampire0 Hello71, if you add a refspec for pull requests for a GitHub repo or merge requests for a GitLab repo, those are fetched and stored into refs too
02:02 Gsham joined #git
02:02 Vampire0 Hello71, but not by default
02:02 hahuang65 joined #git
02:03 mizu_no_oto joined #git
02:06 di0_ joined #git
02:08 lagothri1 joined #git
02:08 stepho joined #git
02:09 watabou joined #git
02:09 b0nn Vampire0: thank you for your help, it's turned out to be exactly what I wanted
02:15 gry Eugene said, "gry - `git fetch` will grab new changes from a remote. Various commands can be used to examine these, most interesting are probably `git log`, `git show`, `git diff`, and `git checkout`". This is not what I would like to use. I would like to review the new fetched commits one by one and merge or reject them. I do not remember the command.
02:15 Eugene log is kinda "the command" that lists commands one by one
02:15 Eugene sorry, lists commits*
02:15 Eugene I need alcohol
02:15 gry There was an interactive one which lists them in 'less' and prompts to approve or reject.
02:16 Eugene I am not familiar with a core git command that does that.
02:18 Vortex35 joined #git
02:19 prg318 joined #git
02:21 jameser joined #git
02:22 dreiss joined #git
02:23 menip joined #git
02:25 ojdo joined #git
02:25 raspado joined #git
02:26 Guest55 joined #git
02:30 hexagoxel joined #git
02:30 lucasem joined #git
02:31 prg318 joined #git
02:32 SpeakerToMeat joined #git
02:33 Cabanossi joined #git
02:33 cqi joined #git
02:33 Pwye joined #git
02:34 dsdeiz joined #git
02:34 dsdeiz joined #git
02:35 TheSimonator joined #git
02:37 prg318 joined #git
02:37 meLon joined #git
02:38 atrigent joined #git
02:38 thebope_ joined #git
02:40 atrigent how do I configure things so that a submodule is cloned from another local clone of that repo?
02:40 atrigent I did git submodule init and then changed the URL in .git/config to a local path, but that doesn't seem to have worked
02:42 star_prone joined #git
02:43 prg318 joined #git
02:44 hahuang65 joined #git
02:45 prg318 joined #git
02:48 di0_ joined #git
02:48 xall joined #git
02:50 duderonomy joined #git
02:51 sentriz joined #git
02:52 prg318 joined #git
02:53 mohan joined #git
02:53 drfstghdrfsgesd joined #git
02:54 Motoko joined #git
02:54 Introoter joined #git
02:54 chachasmooth joined #git
02:54 prg318 joined #git
02:55 atrigent in gitmodules(5) it says this:        submodule.<name>.url
02:55 atrigent Defines a URL from which the submodule repository can be cloned. This may be either an absolute URL ready to be passed to git-clone(1) or (if it begins with ./ or ../) a location relative to the superproject's origin repository.
02:56 atrigent so it looks like I'm supposed to be able to use a local path... but it just does the same thing as if I hadn't changed the URL
02:57 atrigent I did initially do git submodule update without changing the URL... could there be some stale junk left over somewhere...?
02:57 atrigent I do see some stuff in .git/modules in the superproject...
02:57 dmc joined #git
02:58 LeBlaaanc joined #git
02:59 aavrug joined #git
03:00 atrigent ahh, there we go... I had to delete .git/modules/<name>
03:00 atrigent seems like deinit should do that?
03:01 peterbecich joined #git
03:02 Lyqyd joined #git
03:04 a_thakur joined #git
03:05 rominronin joined #git
03:10 nutron joined #git
03:12 valhala_22 joined #git
03:13 prg318 joined #git
03:14 Goplat joined #git
03:15 lafleurdubien joined #git
03:16 LeBlaaanc joined #git
03:19 Andrew_K joined #git
03:22 valhala_22 joined #git
03:24 valhala__ joined #git
03:25 Aljone joined #git
03:25 di0_ joined #git
03:26 valhal___ joined #git
03:31 Cabanossi joined #git
03:32 valhala_22 joined #git
03:32 durham joined #git
03:35 valhala_22 joined #git
03:35 thebope joined #git
03:38 valhala_22 joined #git
03:40 brent__ joined #git
03:40 valhala_22 joined #git
03:40 z8z joined #git
03:42 valhala_22 joined #git
03:42 sweatsuit joined #git
03:44 sea-gull joined #git
03:46 Lyqyd joined #git
03:46 fatalhalt joined #git
03:48 mand0 joined #git
03:48 ahrs joined #git
03:51 mel00010 joined #git
03:54 TzilTzal joined #git
03:55 durham joined #git
03:56 valhala_22 joined #git
03:56 Lunatrius` joined #git
03:58 atrigent joined #git
03:58 dreiss joined #git
04:01 di0_ joined #git
04:09 valhala__ joined #git
04:12 valhala_22 joined #git
04:14 valhala_22 joined #git
04:18 ycon_ joined #git
04:18 ycon_ I'm an idoit, and just did git stash when I shouldn't have
04:18 ycon_ Is there a way to undo git stash?
04:18 hahuang65 joined #git
04:19 guardianx joined #git
04:19 gry what is a good way to do git rebase with prompt for each commit that is ahead of a current branch to reject or approve it?
04:20 ycon_ git apply -R just hangs. Really need help I stupidly thought I had committed
04:21 ycon_ That just tells me `error: patch failed:`
04:21 netj joined #git
04:26 roelmonnens joined #git
04:26 thiago yena: git stash pop
04:26 yena yut
04:27 yena that user already quit
04:27 ycon_ joined #git
04:27 thiago oh, sorry
04:28 ycon_ This is the error I get when I try to reverse my stash- please advise https://dpaste.de/sKvX
04:28 brent__ joined #git
04:28 thiago ycon_: using git stash pop?
04:29 ycon_ no, I haven't tried that. Should I?
04:29 ycon_ I applied my stash by only typing 'git stash' thiago
04:30 thebope joined #git
04:30 thiago and the reverse of that is "git stash pop"
04:30 ycon_ it wants me to commit changes before i merge
04:30 ycon_ thiago: https://dpaste.de/Rt7T
04:30 ycon_ sorry I want to be SO careful not to wipe them again
04:30 auzty joined #git
04:30 thiago then do it
04:31 ycon_ typing git stash again won't remove the previous git stash?
04:31 thiago no
04:31 thiago I meant *commit*
04:31 ycon_ ok I"ll commit
04:32 ycon_ Oh pheww
04:32 ycon_ thiago: you are a genius
04:33 ycon_ it's done this gross auto-merging- can i remove that?
04:33 thiago yes, resolve the conflicts
04:34 ycon_ But it just did it automatically? EG Auto-merging api/services.py CONFLICT (content): Merge conflict in api/services.py
04:36 rominronin joined #git
04:38 cyphase joined #git
04:41 valhala_22 joined #git
04:42 thiago yena: if it says there's a conflict, you have to fix it manually
04:43 PEMapModder joined #git
04:43 cbreak joined #git
04:44 freddy_ joined #git
04:46 ayogi joined #git
04:55 ploop joined #git
04:56 ycon_ joined #git
04:57 freimatz joined #git
04:58 rscata joined #git
04:59 sea-gull joined #git
05:08 clickjack joined #git
05:09 overlord_tm joined #git
05:10 fatalhalt joined #git
05:11 dec0n joined #git
05:13 nckpz joined #git
05:15 a_thakur_ joined #git
05:17 pitastrudl joined #git
05:17 Cabanossi joined #git
05:18 hahuang65 joined #git
05:24 thebope joined #git
05:24 Raging_Hog joined #git
05:26 r00t66 joined #git
05:29 joshszep joined #git
05:30 freddy_ joined #git
05:42 qt-x joined #git
05:44 zefferno joined #git
05:47 valhala_22 joined #git
05:51 acetakwas joined #git
05:51 PtxDK joined #git
05:52 dege joined #git
05:52 manuelschneid3r joined #git
05:52 ThomasLocke joined #git
05:53 Mr_Muh joined #git
05:57 ddavidd joined #git
05:57 Bock joined #git
05:58 druonysus joined #git
05:58 Bock joined #git
06:00 dreiss joined #git
06:01 Cabanossi joined #git
06:06 navidr joined #git
06:06 valhala_22 joined #git
06:09 rominronin joined #git
06:09 PaulCape_ joined #git
06:10 King_Hual joined #git
06:11 miklcct joined #git
06:12 Brski joined #git
06:13 chele joined #git
06:15 valhala_22 joined #git
06:18 thebope joined #git
06:18 matoro joined #git
06:18 lindenle joined #git
06:19 TheWild joined #git
06:19 TheWild hello
06:19 TheWild I want to change remotes in my repository, but not the usual way. I want to go deep into git internals.
06:20 TheWild Which file(s) in .git contain addresses to remote repositories.
06:20 Motoko .git/config
06:21 Motoko Be careful editing things directly.
06:22 TheWild yeah, I know messing with .git directory should be done with "qualified service personnel"
06:22 TheWild well, my repo actually has no remotes. I'll take a look into another to see how it is done.
06:22 MineCoins joined #git
06:23 TheWild got it. Thank you Motoko
06:26 roelmonnens joined #git
06:26 raspado joined #git
06:29 Gurkenglas joined #git
06:30 miczac joined #git
06:30 Vampire0 TheWild, why don't you want to use git commands but edit the file?
06:31 TheWild curiosity and urge to experiment
06:31 Vampire0 ok
06:32 Mr_Muh TheWild: then just create a test repo somewhere and use the git commands and see the changes made to .git/config
06:34 JeroenT joined #git
06:36 a_thakur joined #git
06:37 Bigcheese joined #git
06:39 scoobertron joined #git
06:39 JeroenT joined #git
06:40 JeroenT joined #git
06:40 thiago TheWild: you can also edit that file with git config
06:42 sbulage joined #git
06:42 rominronin joined #git
06:44 vuoto joined #git
06:44 Hunter1 joined #git
06:44 joshszep joined #git
06:45 theoceaniscool joined #git
06:45 vuoto joined #git
06:46 vuoto joined #git
06:46 Cabanossi joined #git
06:47 ogny joined #git
06:49 mentazoom joined #git
06:50 maxime_ joined #git
06:50 dreiss joined #git
06:52 concerti joined #git
06:56 JeroenT joined #git
06:58 stana joined #git
06:59 star_prone joined #git
06:59 robattila256 joined #git
06:59 freimatz joined #git
06:59 roelmonn_ joined #git
07:00 Tobbi joined #git
07:04 _ng joined #git
07:05 tkore joined #git
07:05 jagob joined #git
07:06 chardan joined #git
07:09 Joost joined #git
07:10 darkbit joined #git
07:13 TheWild wow, I didn't know it's doable via git config
07:14 rominronin joined #git
07:16 a_thakur joined #git
07:17 njbair joined #git
07:19 elect joined #git
07:20 wandering_vagran joined #git
07:20 m4sk1n joined #git
07:21 chardan joined #git
07:22 djb-irc joined #git
07:22 PHPanos joined #git
07:23 rominronin joined #git
07:26 dersand joined #git
07:27 neunon joined #git
07:27 TomyWork joined #git
07:28 j08nY joined #git
07:28 xall joined #git
07:30 overlord_tm joined #git
07:31 ogny joined #git
07:31 MACscr joined #git
07:32 a_thakur joined #git
07:32 zermous joined #git
07:33 zermous my git is pushing MBs and all im doing is setting 20 tags or so. is this normal?
07:34 schleppel joined #git
07:36 apotry joined #git
07:36 rchavik joined #git
07:37 _plcp joined #git
07:38 zermous i tested it locally and .git is now 22MB larger
07:39 grawity if you `git push` a tag, then you also push all commits in the history
07:39 grawity exactly as with branches
07:40 zermous ok, it makes sense that a commit has to be pushed in order to push the tag along with it. i didnt think i touched any commits which weren't already in my origin, but its possible i have a bunch of junk and maybe i touched a commit on accident
07:42 grawity maybe you're tagging the wrong commit IDs
07:42 star_prone joined #git
07:42 grawity or you're simply tagging stuff that you had forgotten to push to the repo previously
07:43 zermous it would be stuff that came into my local repository by an amazingly convoluted series of steps. but its possible.
07:43 lindenle joined #git
07:43 grawity have you done any history rewrites recently
07:44 zermous no
07:45 zermous i just did `git gc --aggressive` on a fresh pull from github, and the 22MB inflated copy of that which i had just pushed the tags (and what else?) to and it's only 1MB larger now. but uhhh that's 0.99MB larger than i expected
07:45 zermous i believe i will try re-applying my commits on a clone fresh from github and if i cant even find the commits to tag, that will be quite a clue
07:50 kelvah joined #git
07:54 kbeflo joined #git
07:54 _ng joined #git
07:54 rorro joined #git
07:54 zermous hey, i found it. someone may have rewritten history back in 2014 and i had commits from before then somehow and found them while scrounging through things
07:54 zermous thanks for the idea
07:55 Murii joined #git
07:56 Gloomy joined #git
07:57 quite joined #git
07:57 quite joined #git
08:01 roelmonnens joined #git
08:03 salamanderrake joined #git
08:03 mikecmpbll joined #git
08:04 kurkale61 joined #git
08:05 Keverw joined #git
08:06 User458764 joined #git
08:07 ki0 joined #git
08:07 MuffinMedic joined #git
08:10 JeroenT joined #git
08:10 zermous seems like a useful release branch with no tags in it got deleted (and replaced with another release branch) at some point and only some fork i had laying around had the old release branch in it.
08:10 zermous i would believe it's 1MB compressed worth of merges and clutter
08:11 a_thakur joined #git
08:11 flaviodesousa joined #git
08:12 _ADN_ joined #git
08:16 pbandark joined #git
08:17 tvw joined #git
08:23 rorro joined #git
08:26 marcogmonteiro joined #git
08:27 sarri joined #git
08:27 sarri joined #git
08:27 grift joined #git
08:29 _ADN_ joined #git
08:30 Levex joined #git
08:31 stepho joined #git
08:31 freddy_ joined #git
08:31 Cabanossi joined #git
08:33 YuGiOhJCJ joined #git
08:33 D630 joined #git
08:34 m0nk3h joined #git
08:37 DBag joined #git
08:38 stepho_ joined #git
08:39 DBag hi. I have a config file in .gitignore. this config file is in my repo. as I know, .gitignore only applies when adding files to commit
08:40 _plcp left #git
08:40 grawity right
08:40 plcp_ joined #git
08:40 DBag now, I've modifed that ignored config file and when I write git status I see it as modified
08:40 DBag shouldn't it not be tracked
08:40 theoceaniscool joined #git
08:40 grawity no
08:40 grawity because as you said, .gitignore only applies when adding files
08:40 grawity once you've *somehow* added it, it's no longer ignored
08:40 grawity the usual recommendation for !configs is to track a .example / .dist / .template instead
08:40 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
08:41 grawity and have the user copy thing.conf.example to thing.conf before editing
08:41 leeN joined #git
08:41 DBag well if I write git add . it is added to commit anyway
08:42 a_thakur joined #git
08:43 solars joined #git
08:43 User458764 joined #git
08:43 xall joined #git
08:43 solars quick question: if I mistakenly merged master into dev and now have 200 outgoing changes, how can I undo this? just checkout head?
08:44 grawity DBag: because it's *already tracked* by git
08:44 grawity solars: `git reset --hard` to the last good commit, which is probably HEAD~1
08:45 solars grawity: thanks a lot :)
08:45 a_thakur joined #git
08:47 cstratak joined #git
08:48 skunkz joined #git
08:48 DBag grawity, allright. thanks. so basically I lied to repo collaborators :(
08:48 cqi joined #git
08:48 fatalhalt joined #git
08:49 sz0 joined #git
08:52 maxime_ joined #git
08:53 markzen joined #git
08:55 xall joined #git
08:55 mentazoom joined #git
08:56 mindfart joined #git
08:56 romank joined #git
09:00 thebope joined #git
09:01 tymczenko joined #git
09:01 markzen left #git
09:02 marcogmonteiro joined #git
09:03 Xethron_ left #git
09:04 notebox joined #git
09:04 Xethron joined #git
09:05 ams__ joined #git
09:05 dsdeiz joined #git
09:05 diogenese joined #git
09:10 JimDungo joined #git
09:11 Gloomy joined #git
09:12 valhala_22 joined #git
09:15 achadwick joined #git
09:16 ZyX-I joined #git
09:18 tokkee joined #git
09:19 irqq joined #git
09:19 ferr joined #git
09:22 ertes-w joined #git
09:23 alpha_ joined #git
09:23 metalraiden34 joined #git
09:24 gunnaro joined #git
09:24 alpha_ Hello @all,is there anyway to execute "git init" in such a way that if there's git initialized already, leave it....if not, initialize it...
09:24 alpha_ Does it needs custom script or there's any additional tag?
09:26 slidercrank joined #git
09:26 pewpew joined #git
09:27 dsdeiz_ joined #git
09:27 lukasdboer_ left #git
09:28 lukasdboer_ joined #git
09:28 lukasdboer joined #git
09:28 lukasdboer is it possible to push to a remote without adding it first?
09:30 xall joined #git
09:30 kelvah joined #git
09:31 nowhere_man joined #git
09:32 Cabanossi joined #git
09:33 tobiasvl lukasdboer: yes, you can push to a URL
09:33 mkoskar joined #git
09:36 valhala__ joined #git
09:36 a_thakur joined #git
09:38 SaschaVoid joined #git
09:39 a_thakur joined #git
09:42 dsdeiz joined #git
09:44 grawity alpha_: that's what `git init` already does
09:44 tymczenko joined #git
09:44 Vampire0 grawity, I was about to write that, but it is not true, not anymore
09:44 diogenese joined #git
09:45 grawity still true in my 2.13.0
09:45 Vampire0 grawity, now it says "Reinitialized existing Git repository in ..."
09:45 grawity yes, that's what it used to do
09:45 Vampire0 2.9.3.windows.1
09:45 grawity doesn't really affect the repo much
09:45 lukasdboer tobiasvl: thanks a lot :)
09:46 alpha_ grawity: nevermind, just found that was different error. how to supress "nothing to commit, working directory clean" error?
09:46 Vampire0 grawity, same on 2.12.1 on *nix
09:47 Vampire0 alpha_, what is the expected result? You say commit, but there is nothing to commit, what should happen?
09:47 borkr joined #git
09:47 alpha_ it should give no error message. just leave if nothing to commit
09:47 alpha_ if there's change, commit that
09:48 idmistir joined #git
09:48 idmistir joined #git
09:48 Vampire0 alpha_, `git commit >/dev/null`, but that will also suppress output when a commit was done
09:49 ferr joined #git
09:51 User458764 joined #git
09:51 a_thakur joined #git
09:51 zulutango joined #git
09:53 Harzilein joined #git
09:53 Harzilein hi
09:54 thebope joined #git
09:54 a_thakur_ joined #git
09:55 Harzilein just two assumptions: 1) git read-tree HEAD clobbers the index and does nothing to the directory cache 2) git update-index --refresh --no-assume-unchanged clobbers the index and recreates the directory cache
09:55 Harzilein is that right so far?
09:55 Harzilein will git-read-tree be a no-op in this sequence?
09:56 Harzilein *will git-read-tree HEAD be a no-op in this sequence?
09:57 grawity the index and the directory cache are the same thing
09:57 Vampire0 Harzilein, I cannot tell you this, but what I can tell you is, that you almost certainly do **not** want to use --assume-unchanged ever
09:57 zermous grawity, i finally tracked it down. in july 2015 someone decided to delete the release branch and recreate it. a bunch of my tags were on the deleted branch, which lingered on in various forks.
09:57 Harzilein grawity: hmm... then the manpage is misleading i think
09:58 Harzilein grawity: what i'm wondering is this: of course in the next step i want to do git checkout-index. will this only cause writes for files that git update-index --refresh --verbose shows as needing an update?
09:59 Harzilein Vampire0: i think it'd work in my case, this is a worktree for the freebsd ports collection which i build out of tree
10:00 Harzilein shouldn't there be a fuse adapter for the index really? that'd help so much with those zillions of files
10:01 grawity there are a few
10:01 grawity alternatively, look into "sparse checkout"
10:02 Cabanossi joined #git
10:02 Harzilein grawity: i need the entire collection. i do manage .git/shallow
10:02 grawity hmm
10:02 Harzilein so back to that assumption about checkout-index
10:02 Harzilein i understand read-tree followed by checkout-index
10:03 Harzilein but i don't understand update-index followed by checkout-index really
10:03 h12o joined #git
10:03 grawity well, .git/shallow is not "sparse checkout", it's shallow clone
10:03 grawity anyway, iirc Microsoft's approach was to have a FUSE adapter which shows all files, but *also* use sparse checkout to tell git which files to look at
10:04 dsdeiz joined #git
10:04 grawity (the FUSE adapter managed that checkout file as well)
10:04 robattila256 joined #git
10:04 Snugglebash joined #git
10:04 User458764 joined #git
10:06 Harzilein grawity: i know, i'm just saying, i can just about manage with the _size_ of the checkout, it's repeatedly scanning the tree or even worse rewriting unchanged files that stresses me out
10:08 a_thakur joined #git
10:09 Harzilein i think i don't understand checkout-index -f particularly. does that mean "rewrite even if not needed" or does it mean "rewrite even if there is a file". i don't get why the latter condition should be extraordinary
10:09 om_henners joined #git
10:10 zermous left #git
10:10 valhala_22 joined #git
10:11 ki0_ joined #git
10:11 ki0_ joined #git
10:13 Hunter1 joined #git
10:14 Vampire0 Harzilein, I still cannot say anything to your main question as I'm not familiar with those commands. But --assume-unchanged tells Git to really assume the files are unchanged. This means if Git wants to overwrite the files, because you change branches, or merge or rebase changes and so on it will simply overwrite your file as it thinks it is unchanged and you loose your local changes without any Git-way t
10:14 Vampire0 o bring them back
10:15 Vampire0 Harzilein, if that is what you want, --assume-unchanged is fine
10:15 Harzilein Vampire0: i will have no local changes
10:16 Vampire0 Harzilein, hm, what effect does --assume-unchanged has then? The only effect I know is to tell git to think the file is unchanged, no matter what it really contains
10:16 a_thakur joined #git
10:16 Harzilein Vampire0: i want to optimize away scanning huge amounts of directories
10:17 kurkale6ka joined #git
10:17 Harzilein Vampire0: i just want to update with git show-ref -s > .git/shallow, git update-ref, git read-tree, git checkout-index
10:18 Vampire0 Harzilein, ah, interesting
10:18 Harzilein but git read-tree should be a hindrance there, right?
10:19 Vampire0 As I said, I'm not yet familiar with those commands, sorry. I just have seen --assume-unchanged and felt I should warn you :-)
10:20 Harzilein i want to say "what was in the index before the read-tree was unchanged, changes in the index should be reflected in the filesystem, don't bother to check unchanged files in the index for their metadata and/or contents"
10:20 Harzilein and i certainly don't want to rewrite everything
10:26 kurkale61 joined #git
10:27 peterfleck joined #git
10:27 Kaisyu joined #git
10:27 Harzilein ah, right, seems that entry.c:checkout_entry checks changed before force
10:27 Harzilein so i can safely specify force
10:28 raspado joined #git
10:31 finalbeta joined #git
10:32 Cabanossi joined #git
10:32 aard_ joined #git
10:33 xall joined #git
10:38 waveclaw joined #git
10:40 Hunter1 joined #git
10:42 Snugglebash joined #git
10:48 fckup joined #git
10:48 thebope joined #git
10:54 plos joined #git
10:55 m4sk1n joined #git
10:55 peacememories joined #git
10:59 kurkale61 joined #git
11:00 al-damiri joined #git
11:01 oskarkv joined #git
11:01 kurkale6ka joined #git
11:02 guampa joined #git
11:05 kurkale61 joined #git
11:10 auzty joined #git
11:11 Hunter1 joined #git
11:14 kurkale6ka joined #git
11:17 beerdrop joined #git
11:17 dglambert joined #git
11:17 dglambert yo
11:19 zerow joined #git
11:21 peacememories joined #git
11:22 guampa joined #git
11:24 Silenced joined #git
11:24 ki0 joined #git
11:24 prg3 joined #git
11:27 PtxDK joined #git
11:27 plos joined #git
11:29 tlaxkit joined #git
11:33 Masber joined #git
11:34 altendky joined #git
11:34 oskarkv joined #git
11:37 oskarkv_ joined #git
11:38 jameser joined #git
11:40 tvw joined #git
11:42 thebope joined #git
11:45 scottjl joined #git
11:46 clickjack joined #git
11:47 FilipNortic_ joined #git
11:48 sbasso joined #git
11:50 blip- joined #git
11:51 blip- hi all, I just made 3 edits to a perl file (under linux, with Atom IDE).   Git diff shows some extra changes which look strange
11:51 blip- -#  then +#
11:51 blip- Is this some line-ending issue?
11:51 _ikke_ looks like it, inded
11:51 _ikke_ indeed
11:53 yanome joined #git
11:54 blip- _ikke_, and is it ok to commit the code with these changes ?  It's an open source prog, shouldnt make any difference right
11:54 acelee joined #git
11:54 h12o joined #git
11:54 blip- just looks sloppy, but maybe im the one using the correct line endings
11:54 _ikke_ blip-: Might be considered noise
11:54 JeroenT_ joined #git
11:55 blip- _ikke_, ok ty.  I'll see if vim works better
11:57 acelee left #git
11:58 plos joined #git
11:58 shinnya joined #git
11:58 tgragnato joined #git
11:59 synthroid joined #git
12:00 TheCycoONE joined #git
12:01 peacememories joined #git
12:01 kelvah joined #git
12:02 oskarkv joined #git
12:04 fmcgeough joined #git
12:04 acelee joined #git
12:05 Acerific joined #git
12:08 plos joined #git
12:08 fmcgeough_ joined #git
12:11 dsdeiz joined #git
12:12 Stumbler joined #git
12:14 MineCoins joined #git
12:17 sbasso joined #git
12:18 rebrec joined #git
12:19 Achylles joined #git
12:20 Felishia joined #git
12:20 Felishia how can I find the actual lines that changed with git or bash or whatever
12:21 Felishia eclipse is a piece of shit and made it so that every single line is reported as different
12:21 osse git diff
12:21 kelvah joined #git
12:21 Felishia no I get around 10.000 lines and I modified 1
12:21 Felishia thanks to eclipse
12:21 _ikke_ line ending change?
12:21 osse ẗhen eclipse changed the line endings, most likely
12:21 Felishia I don't know what shit it did but I can't find my actual change
12:22 osse Felishia: do you see more what you expect if you do git diff -w ?
12:22 _ikke_ if git reports them as changed, they are changed
12:22 Felishia osse, that works
12:23 osse Felishia: what about git diff --ignore-space-at-eol ?
12:23 osse that works too ?
12:24 Felishia the first one worked
12:24 Felishia thanks :D
12:24 Felishia piece of shit eclipse
12:24 Felishia >:c
12:25 dege joined #git
12:25 kexmex joined #git
12:26 osse if the second didn't then the changes are more complex than just line endings, I suspect
12:28 kristoff_ joined #git
12:28 caper joined #git
12:29 Gsham joined #git
12:29 plos joined #git
12:29 wrouesnel joined #git
12:31 jnavila joined #git
12:31 Cabanossi joined #git
12:32 Felishia osse, :c
12:34 BSab joined #git
12:35 maxime_ joined #git
12:35 oprypin during a rebase, what's a convenient way to edit the current commit as a patch file?
12:36 oprypin other than putting it to a file, editing it, undoing the current commit and applying the patch
12:37 _ikke_ Don't think there is a built-in way
12:37 thebope joined #git
12:37 fees joined #git
12:37 clickjack joined #git
12:38 JeroenT joined #git
12:40 plos joined #git
12:40 bremner Vampire0: oh, missed your question last night. Yeah I ended up making one big pack with "git repack -a", copy the pack over, and unpacking with git unpack-objects. Kindof overkill, but saved having to root around in all the existing packs
12:41 gunnaro joined #git
12:41 Saturn812 joined #git
12:42 fckup joined #git
12:42 Masber_080 joined #git
12:43 freddy_ joined #git
12:46 Masber_080 joined #git
12:46 miczac joined #git
12:47 Gloomy joined #git
12:48 JeroenT joined #git
12:49 Gurkenglas joined #git
12:49 osse oprypin: second best thing: git reset @~; git add -p; etc etc.
12:49 ChiLL_SurF joined #git
12:50 oprypin uhh thats the most cliche way
12:50 Snugglebash joined #git
12:50 oprypin i say i want to edit 1 file with all changes
12:51 gugah joined #git
12:51 osse cliche?
12:52 oprypin nvm it's pretty good
12:52 osse TIL cliche means bad
12:52 oprypin but i want it in my text editor
12:52 oprypin i didn't say bad, just not the way i want
12:52 osse you won't get it unless you write a script for it
12:52 sarri joined #git
12:52 sarri joined #git
12:52 osse the stuff you mentioned after "other than..." sounds scriptable
12:52 scoobertron joined #git
12:53 nod joined #git
12:55 oprypin the hard part is getting the commit id and preventing rebase from trying to apply the commit by itself
12:55 oprypin but nvm, i did it manually
12:55 oprypin thanks
12:56 fission6 joined #git
13:00 oprypin and i missed one commit along the way. gj
13:00 TheSimonator joined #git
13:01 Cabanossi joined #git
13:02 cdg joined #git
13:07 sbasso joined #git
13:07 floppydh joined #git
13:07 NeXTSUN joined #git
13:08 plos joined #git
13:08 miczac joined #git
13:08 floppydh joined #git
13:09 User458764 joined #git
13:09 ShapeShifter499 joined #git
13:13 kurkale6ka joined #git
13:14 livingstn joined #git
13:14 gnixev joined #git
13:14 Mbz joined #git
13:16 Mbz joined #git
13:16 Mbz left #git
13:18 bsanford joined #git
13:18 kbeflo_ joined #git
13:20 TheCycoONE joined #git
13:23 relipse joined #git
13:23 xall joined #git
13:23 jeffreylevesque joined #git
13:24 NeXTSUN joined #git
13:24 romank joined #git
13:24 Jackneill heyí
13:25 dviola joined #git
13:26 plos joined #git
13:27 DBag joined #git
13:27 SkyPatrol_ joined #git
13:27 Jackneill i did a git reset --soft comid to go back to a prev state but i still see the newest staTE. altough git status says im 2 commits behind
13:28 deepy was one of those commits a merge?
13:30 kelvah joined #git
13:30 Jackneill deepy, no
13:31 thebope joined #git
13:32 valhala_22 joined #git
13:34 JeroenT_ joined #git
13:35 Levex joined #git
13:37 floppydh joined #git
13:38 floppydh joined #git
13:39 Darcidride joined #git
13:40 theiostream joined #git
13:40 arooni joined #git
13:40 animi_vulpis joined #git
13:43 JeroenT joined #git
13:44 kelvah joined #git
13:45 kurkale6ka joined #git
13:46 tjbp joined #git
13:46 hseg joined #git
13:48 hseg Hi. I have some binary files (pdf, djvu, tiff) that, unless I'm mistaken should be in my repo (they're the lecture notes for the courses I'm summarising, with no reliable external source). The files are <10MB large each. Most of these files won't change. Recommendations?
13:49 selckin just add em no problem
13:50 hseg No special handling of binaries? No slowdowns due to files being incomparable?
13:50 kurkale61 joined #git
13:52 xanadu joined #git
13:54 Khisanth joined #git
13:54 maxime_ joined #git
13:54 Hello71 the main problem with binaries in git is that when you change the file git may have to store the same file again
13:54 _ikke_ Hello71: well, the same thing happens with text files
13:54 Hello71 sure
13:54 _ikke_ the question is how good they delta compress
13:54 Hello71 so if you change a 10MB file by 1 byte your repo may be 20MB
13:55 Hello71 but unlike some people's claims it won't magically grow just because you have binaries
13:55 hseg OK. So how do pdf djvu and tiff delta-compress?
13:55 Hello71 depends on what changes you make.
13:57 kexmex joined #git
13:57 _ikke_ But are these files generated from the source? Because than it might be better to not even commit them
13:57 thiago joined #git
13:57 _ikke_ right, no reliable external source
13:57 hseg Nope. Got them off the internet.
13:58 _ikke_ But if they remain constant it should not be a big problem
13:58 bremner hseg: I use git-annex for this kind of thing, but istr it didn't work for you
13:58 miczac joined #git
13:58 JeroenT_ joined #git
13:58 hseg Right, I'm working on Windows atm.
13:58 tymczenko joined #git
13:59 bsanford joined #git
13:59 SaschaVoid joined #git
13:59 hseg And I'd rather be able to use my own servers, so git-lfs is also out.
14:00 hseg _ikke_: If I enter them into my repo now, how hard will it be to convert to e.g. git-annex later?
14:00 ahrs joined #git
14:00 _ikke_ I don't know, sorry
14:00 _ikke_ haven't used git annex myself
14:01 valhala_22 joined #git
14:01 hseg OK, as a proxy for that value, how hard would it be to extract them into their own submodule?
14:01 bremner hseg: it's a bit hard to to remove files from git history; not impossible, but requires things like force-pushing.
14:01 Sound joined #git
14:02 hseg Figured that'd be part of it.
14:02 hseg But that aside, how much work are we talking here?
14:02 bremner well, probably an hour from starting with "man git-filter-branch"
14:02 gitinfo the git-filter-branch manpage is available at https://gitirc.eu/git-filter-branch.html
14:03 strk left #git
14:03 hseg OK. So not *too* painful, if it came down to it.
14:03 bremner that's assuming a single user repo
14:04 hseg Assumption correct.
14:04 Sound_ joined #git
14:04 hseg So onboarding effort is minimal.
14:04 clickjack joined #git
14:05 Dougie187 joined #git
14:08 Altiare joined #git
14:09 peacememories joined #git
14:09 Levex joined #git
14:09 romank joined #git
14:12 LeBlaaanc joined #git
14:13 g0d355__ joined #git
14:14 h12o joined #git
14:14 hseg Last question: How do I tell git I renamed a file? Moreover, if I have a file in two different paths across branches, is there a way to synchronize their changes (e.g. by rebasing the rename on top of any changes)?
14:16 Cabanossi joined #git
14:17 AaronMT joined #git
14:19 zxd joined #git
14:21 JeroenT joined #git
14:21 salamanderrake joined #git
14:22 scoobertron joined #git
14:23 hseg Use case: I have a "configs" repository, which I want to use both for windows (gVimPortable) and linux (regular vim). But they expect their configs in different places. Ideally, I'd have a windows and a linux branch, with the same file under different paths and differences ported from one to the other.
14:23 mkillebrew joined #git
14:23 Jitta joined #git
14:25 fission6 joined #git
14:25 thebope joined #git
14:26 NeverDie joined #git
14:27 bremner I'd use symlinks, if that works on windows.
14:27 hseg Just a moment, gotta change computers.
14:27 hseg left #git
14:27 Ownix I installed VS2017 and now I get "fatal: fatal: Authentication failed for https://my-server....." when I try and git pull through bash. But VS still pulls just fine. So im guessing this is an issue with the credential manager?
14:27 Es0teric joined #git
14:28 justanotheruser joined #git
14:28 mizu_no_oto joined #git
14:28 prg3 joined #git
14:29 a_thakur joined #git
14:29 menip joined #git
14:29 hseg joined #git
14:30 hseg I'm back. Symlinks on windows could work, except I'm working with FAT which doesn't have that concept.
14:30 bremner so many bad life choices ;)
14:34 Emperor_Earth_ joined #git
14:34 Mitt joined #git
14:34 tlaxkit joined #git
14:34 hseg You call them life choices, I call them dealing with the tools I have. :)
14:34 dfas` joined #git
14:36 netj joined #git
14:36 rxc joined #git
14:36 Ryanar joined #git
14:37 gugah joined #git
14:37 mikecmpb_ joined #git
14:38 perlpilot joined #git
14:39 crose joined #git
14:39 tlaxkit joined #git
14:40 User458764 joined #git
14:41 salamanderrake joined #git
14:41 HardlySeen joined #git
14:42 TheFuzzball joined #git
14:44 hseg joined #git
14:48 jt joined #git
14:48 plos joined #git
14:48 tymczenko joined #git
14:48 atrigent joined #git
14:53 cahoots joined #git
14:53 peacememories joined #git
14:54 gnixev joined #git
14:55 h12o joined #git
14:57 dob1 joined #git
14:59 dob1 hi, hope is not offtopic, i am a bit confused about A,B,C on kdiff3: i have a develop branch from develop branch i created a feature1 branch, so after finishing feature1 i return to develop for merging so from develop, git merge --no-ff feature1. There are some conflicts because develop changed, so what are A, B, C ?
15:00 dob1 A is the develop when i checkout feature1 ?
15:00 dob1 B is feature2, and C is the actual develop?
15:00 ahrs joined #git
15:01 dob1 because looking at this question on stackoverflow: http://stackoverflow.com/q/4018476/399637  seems different
15:01 roelmonn_ joined #git
15:02 meLon joined #git
15:02 Ownix I installed the latest git and it cleared stuff up somehow.
15:03 bsanford joined #git
15:03 Snugglebash joined #git
15:05 gnixev joined #git
15:05 plos joined #git
15:05 boombatower joined #git
15:06 chachasmooth joined #git
15:06 LeBlaaanc What's the etiquette for merging in changes from someone who forked your repo on GitHub?
15:07 Gloomy joined #git
15:07 aard_ joined #git
15:07 Plorntus joined #git
15:08 Ownix LeBlaaanc: very carefully
15:09 LeBlaaanc nice
15:09 raspado joined #git
15:09 nckpz joined #git
15:09 Harzilein there is etiquette for that? can't be good etiquette
15:11 LeBlaaanc what do you mean?
15:11 Harzilein if people make major changes that amount to what was a fork in previous times they don't bother to move the readme, don't add copyright information for newly created parts... if they don't bother to make pull requests it is a nuisance to want to add their code
15:11 Abbott joined #git
15:12 TbobbyZ joined #git
15:12 LeBlaaanc They did do a bunch of work on Android support for a repo I created.
15:12 perlpilot LeBlaaanc: I'd be more worried about the content of the changes than the etiquette for merging them  :)
15:12 cdg joined #git
15:13 perlpilot LeBlaaanc: but, if you're good with the changes, merge it, thank the author, put them in an AUTHORS file, whatever
15:13 LeBlaaanc should it be a PR just as a formality that "hey I'm doing this"?
15:14 flavius joined #git
15:14 a_thakur joined #git
15:15 h12o joined #git
15:15 plos joined #git
15:16 perlpilot LeBlaaanc: that's up to you.   In projects I've been involved in, if someone make a significant contribution, they often get commit rights to the original repo.  You might want to think about that.
15:17 Harzilein perlpilot: that seems to solve the documentation part at least
15:17 lxnr joined #git
15:18 malmalmal joined #git
15:19 thebope joined #git
15:19 Cabanossi joined #git
15:19 Harzilein just saying, "hostile downstream" is a thing that exists just as much as the "hostile upstream" case.
15:19 PEMapModder_ joined #git
15:19 LeBlaaanc This is the repo in question... hrm https://github.com/crowtec/react-native-pixel-color ?
15:20 _ng joined #git
15:20 UTAN_dev joined #git
15:22 Gustavo6046 joined #git
15:23 dreiss joined #git
15:23 malmalmal Hello. I am following a tutorial to deploying with git, by checking out worktree to a different (live) folder than where the repo is. When writing a post-receive hook, I am unsure about how git treats paths, in order to provide the right one. Here is the link to the tutorial: https://www.digitalocean.com/community/tutorials/how-to-set-up-automatic-deployment-with-git-with-a-vps
15:23 dob1 I got it now, sorry for the question
15:23 Gurkenglas joined #git
15:24 malmalmal While being under var/repo/site.git/hooks/ I am instructed to create the post-receive hook and give it a path to worktree which would seem absolute to ssh login point ? is that so ?
15:24 LBV_User joined #git
15:24 malmalmal This is the exact content of the post-receive hook as per the tutorial: https://pastebin.com/rR1AVEcz
15:24 rominronin joined #git
15:25 Starky joined #git
15:25 plos joined #git
15:25 rominronin joined #git
15:25 malmalmal I would have imagined the path would be relative to the hooks folder, but it seems to be absolute , could someone please confirm ? thank you
15:28 rominronin joined #git
15:28 Snugglebash joined #git
15:29 mikecmpbll joined #git
15:29 roelmonnens joined #git
15:30 rebrec joined #git
15:30 navidr joined #git
15:30 cam27 joined #git
15:30 hobodave joined #git
15:32 hseg joined #git
15:32 duderonomy joined #git
15:32 mmlb joined #git
15:34 rkazak joined #git
15:34 hseg Sorry for joins/parts. So, I see git has little support for renaming files while remaining aware of their identities?
15:35 TikityTik joined #git
15:36 rebrec joined #git
15:36 ssarah joined #git
15:37 brent__ joined #git
15:37 brent__ joined #git
15:38 _ikke_ hseg: git can follow renames, but never prerecords that a file has been renamed
15:39 brent__ joined #git
15:40 hseg Yeah, but what I want is a little different. I want to be able to say to git: file a on branch foo and file b on branch bar are renames of each other, so when I diff the branches or merge/rebase them, autorename the files in question before applying any patches.
15:41 dirac1 joined #git
15:41 hseg Effectively, it'd be like having the rename be rebased on top of all the in-file edits, and have git manage this.
15:41 rebrec joined #git
15:41 mdw joined #git
15:41 hseg IIUC, darcs does something like this, but Linus thinks it's unnecessary.
15:41 dirac1 Help i'm having problems copying a repository, the output is this : fatal: pack is corrupted (SHA1 mismatch) ; fatal: index-pack failed
15:42 Starky joined #git
15:42 dirac1 i cloned the same repository in a different pc recently.
15:42 brent__ joined #git
15:43 brent__ joined #git
15:43 brent__ joined #git
15:46 Eugene dirac1 - Looks like the repo you are attempting to clone from is corrupt. Good news: each clone of a repo is also a full copy of it. Push from your existing copy to an empty repo(delete/move the corrupt one out of the way first) and you should be back in business
15:46 Masber_080 joined #git
15:46 Pulp joined #git
15:47 svm_invictvs joined #git
15:47 ShapeShifter499 joined #git
15:48 dirac1 but it didn't clone the repo in the second device.
15:48 Introoter joined #git
15:48 dirac1 How the repo corrupted in less than 1 hour? :/
15:48 dirac1 got corrupted*
15:48 overlord_tm joined #git
15:48 User458764 joined #git
15:51 a_thakur joined #git
15:54 madewokherd joined #git
15:54 invisbl joined #git
15:54 atrigent joined #git
15:54 grift joined #git
15:55 lindenle joined #git
15:56 Altiare joined #git
15:56 Es0teric joined #git
15:57 xall joined #git
15:57 peacememories joined #git
15:59 grift joined #git
15:59 sbasso joined #git
16:00 flavius joined #git
16:00 phinxy joined #git
16:01 Masber joined #git
16:01 Phylock joined #git
16:03 orbyt_ joined #git
16:03 grift joined #git
16:03 hseg joined #git
16:04 svm_invictvs joined #git
16:05 mel00010 joined #git
16:05 thiago joined #git
16:06 dreiss joined #git
16:09 durham joined #git
16:11 grift joined #git
16:11 h12o joined #git
16:12 slidercrank joined #git
16:13 thebope joined #git
16:14 tunekey joined #git
16:14 nitric joined #git
16:15 kelvah joined #git
16:16 grift joined #git
16:17 TheSimonator joined #git
16:21 prg3 joined #git
16:22 Xethron joined #git
16:25 gnixev joined #git
16:26 Altiare joined #git
16:26 immae joined #git
16:28 rominronin joined #git
16:30 m4sk1n joined #git
16:31 hseg_ joined #git
16:31 JanC_ joined #git
16:32 jackrandom joined #git
16:32 vuoto joined #git
16:33 LionsMane joined #git
16:35 tyreld joined #git
16:36 clickjack joined #git
16:37 Sna4x8 left #git
16:40 jackrandom joined #git
16:41 rebrec joined #git
16:42 re1 joined #git
16:43 eehackr joined #git
16:43 h12o joined #git
16:44 rebrec joined #git
16:46 IndigoTiger joined #git
16:50 malmalmal joined #git
16:50 dirac1 joined #git
16:50 rkazak joined #git
16:50 hseg joined #git
16:51 dirac1 Eugene, i cloned the same repo from another pc, and it worked fine, so i don't understand what's wrong with the server where i'm trying to copy it.
16:51 SteffanW joined #git
16:53 Xethron joined #git
16:53 synthroid joined #git
16:53 eehackr joined #git
16:53 thebird joined #git
16:54 groverdill joined #git
16:54 synthroi_ joined #git
16:55 maarhart joined #git
16:55 hahuang65 joined #git
16:56 aielima joined #git
16:57 jnavila joined #git
16:57 cstratak joined #git
16:57 hashtagstrashtag joined #git
16:58 Quurz joined #git
16:59 str joined #git
17:00 durham_ joined #git
17:01 aielima joined #git
17:02 de_fragment joined #git
17:04 dreiss joined #git
17:05 UrsoBranco joined #git
17:07 maxime_ joined #git
17:07 thebope joined #git
17:07 jnavila joined #git
17:10 DaGoaty joined #git
17:11 mikecmpbll joined #git
17:12 ki0_ joined #git
17:13 valhala_22 joined #git
17:13 svm_invictvs joined #git
17:13 tg joined #git
17:14 h12o joined #git
17:15 Cavallari joined #git
17:17 misosoup joined #git
17:17 nixjdm joined #git
17:18 durham joined #git
17:18 DaGoaty joined #git
17:19 DaGoaty joined #git
17:23 samcv joined #git
17:23 kexmex joined #git
17:26 Es0teric joined #git
17:28 griffindy joined #git
17:29 lindenle joined #git
17:30 nowhere_man joined #git
17:31 hahuang65 joined #git
17:31 jnavila joined #git
17:31 hahuang65 joined #git
17:32 hahuang65 joined #git
17:32 lindenle joined #git
17:33 robotroll joined #git
17:33 lindenle joined #git
17:33 cahoots_ joined #git
17:33 nckpz joined #git
17:34 svm_invictvs joined #git
17:37 svm_invictvs joined #git
17:37 TomyLobo joined #git
17:38 relipse joined #git
17:38 jnavila joined #git
17:39 cebula joined #git
17:39 Atm0spher1c joined #git
17:42 griffindy joined #git
17:42 manuelschneid3r joined #git
17:43 h12o joined #git
17:44 graingert joined #git
17:44 joshszep joined #git
17:44 timwis joined #git
17:45 dave0x6d joined #git
17:46 aleb joined #git
17:46 valhala_22 joined #git
17:46 raynold joined #git
17:46 clickjack joined #git
17:47 nezZario joined #git
17:50 TheSimonator joined #git
17:50 duderonomy joined #git
17:51 jnavila joined #git
17:53 theiostream joined #git
17:53 irqq joined #git
17:54 m0viefreak joined #git
17:58 caper joined #git
17:59 rominronin joined #git
18:00 wizardedit joined #git
18:00 livingstn joined #git
18:00 ki0 joined #git
18:01 ki0 joined #git
18:01 thebope joined #git
18:01 btree joined #git
18:02 Sasazuka joined #git
18:02 Doginal joined #git
18:03 livingst_ joined #git
18:03 btree left #git
18:04 svm_invictvs joined #git
18:04 Cabanossi joined #git
18:04 jakew_ joined #git
18:05 mizu_no_oto joined #git
18:06 satifant joined #git
18:07 jnavila joined #git
18:08 DaGoaty joined #git
18:08 nckswt joined #git
18:10 z3n0wl joined #git
18:10 Cassiopaya joined #git
18:11 robotroll joined #git
18:12 h12o joined #git
18:13 orbyt_ joined #git
18:14 angrybacon joined #git
18:14 rxc joined #git
18:15 bs joined #git
18:15 nckswt Hello! I'm seeing the following error message on Ubuntu 14.04 with git version 2.13.0:  BUG: setup_git_env called without repository
18:15 nckswt Anything I can do to fix this or help debug the issue?
18:15 angrybacon What's the cautious way to pull and merge changes from another branch? So that I can review each commit one by one and go to the next
18:16 _ikke_ nckswt: What command did you execute?
18:16 _ikke_ angrybacon: A merge does not work commit by commit
18:16 _ikke_ angrybacon: it merges the end results of the two branches
18:17 nckswt Nothing special I can think of. I suspect this happened when I upgraded to 2.13.0
18:17 Ulysses000 joined #git
18:17 _ikke_ nckswt: They did some moving around of some early initialization, and this is a catch all
18:17 angrybacon _ikke_: I meant that I would like to see the commits before I merge
18:17 valhala__ joined #git
18:18 mgoodwin joined #git
18:18 _ikke_ git log ..<branch> and git log <branch>.. shows the commits of each branch
18:18 nckswt Yeah, I saw something about that here: https://github.com/blog/2360-git-2-13-has-been-released
18:18 angrybacon But that wouldn't show the diffs
18:18 _ikke_ nckswt: any way for me to reproduce it?
18:19 lordjancso joined #git
18:19 nckswt _ikke_: Not that I can figure out - I don't even know what's causing it!
18:20 _ikke_ nckswt: What exact command did you execute?
18:21 ForeignBiscuit joined #git
18:21 nckswt According to my bash history, the following https://www.irccloud.com/pastebin/Ra8VfK4w/Last%20git%20commands
18:22 _ikke_ And it was the last git status returning that error?
18:22 nckswt _ikke_: So, nothing that seems odd or out of place. I know I was running some software updates in the meantime. When I got back from lunch, I started seeing the error message
18:22 _ikke_ nckswt: Do you see it regularly?
18:22 nckswt Every time I enter a new line in terminal
18:23 _ikke_ aha
18:23 _ADN_ joined #git
18:23 _ikke_ You probably have a git prompt set, right?
18:23 nckswt AH that's probably it, yeah. problem with ohmygit, likely
18:24 _ikke_ using bash?
18:24 nckswt https://github.com/arialdomartini/oh-my-git/issues/110
18:24 _ikke_ oh, omz
18:24 nckswt It's a known issue. I should've realized!
18:24 nckswt Thanks =)
18:24 Lauven joined #git
18:25 _ikke_ right
18:25 _ikke_ I did see that thread on the mailing list
18:26 nckswt Thanks for the help - I'll wait around for a patch to hit =)
18:26 Lauven joined #git
18:29 h12o joined #git
18:30 disi joined #git
18:33 Sound joined #git
18:33 Sound joined #git
18:33 ExpiredDev joined #git
18:34 nixjdm joined #git
18:34 robotroll joined #git
18:37 valhala_22 joined #git
18:38 wiretrap joined #git
18:38 tezar joined #git
18:39 livingstn joined #git
18:40 SkyPatrol joined #git
18:40 eehackr joined #git
18:43 livingst_ joined #git
18:45 livings__ joined #git
18:46 livingstn joined #git
18:47 bitmod joined #git
18:47 pks joined #git
18:48 Cavallari1 joined #git
18:50 dreiss joined #git
18:51 Johnson1977 joined #git
18:51 Johnson1977 If I have the bitbucket key in my known_hosts
18:51 MattMaker joined #git
18:51 Johnson1977 why does it still ask to verify authenticy?
18:51 Johnson1977 I am trying to do a git clone in a shell script
18:52 ResidentBiscuit joined #git
18:54 angrybacon left #git
18:54 maxime_ joined #git
18:55 MattMaker joined #git
18:57 Vampire0 Johnson1977, !repro
18:57 gitinfo Johnson1977: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
18:58 Johnson1977 https://gist.github.com/XaroRSA/d55a93127cb223bd60b0b9aa68a31227
18:58 theiostream joined #git
19:00 h12o joined #git
19:00 Husky_Apocalypse joined #git
19:01 robattila256 joined #git
19:02 jstein_ joined #git
19:03 Gsham joined #git
19:04 peacememories joined #git
19:04 meLon joined #git
19:06 synthroid joined #git
19:06 freimatz joined #git
19:07 gunnaro joined #git
19:09 King_Hual joined #git
19:09 gugah_ joined #git
19:10 m0viefreak joined #git
19:11 Oatmeal joined #git
19:11 vamiry_ joined #git
19:11 GothAlice joined #git
19:12 Seveas Johnson1977: is the script running as you?
19:12 Johnson1977 yes
19:13 GothAlice I have a global .gitconfig with user signing key, and [commit] section with gpgsign = true by default.  I also have a ton of pre-commit hooks to run tests, verify ASTs, markup syntax, security vulns., etc.  Is there a mechanism I can use when committing that if I skip pre-commits, the commit is not signed?
19:13 Seveas Johnson1977: what's the output of: grep bitbucket.org ~/.ssh/known_hosts
19:14 tezar joined #git
19:14 manuelschneid3r joined #git
19:14 Johnson1977 mmm its not showing.....
19:14 Johnson1977 https://gist.github.com/XaroRSA/2e1e3f4bf960796ccb867c84913953d8
19:14 Seveas might be hashed known hosts.
19:15 Johnson1977 only altssh which is no good
19:15 Johnson1977 this is impossible
19:15 Seveas would you mind pastebining the whole file?
19:15 Johnson1977 that was it..
19:15 Seveas heh ok
19:16 Seveas well, that explains then :)
19:16 Seveas also, bitbucket.org has 3 ip addresses, you may need confirm them all
19:16 Johnson1977 when I look on my text editor
19:16 Johnson1977 i saw all the other ips
19:16 Johnson1977 not with this grep
19:16 Seveas did you look at the same file?
19:17 Johnson1977 wait im reburning image
19:17 Johnson1977 will start fresh
19:17 zivester joined #git
19:17 NeXTSUN joined #git
19:20 jakew_ joined #git
19:20 jnavila joined #git
19:22 nckpz joined #git
19:22 Es0teric joined #git
19:25 romank joined #git
19:29 h12o joined #git
19:29 armyriad joined #git
19:29 xall joined #git
19:31 rominronin joined #git
19:31 theiostream joined #git
19:32 dirac1 joined #git
19:32 MineCoins joined #git
19:33 DaGoaty joined #git
19:33 user_____ joined #git
19:33 nixjdm joined #git
19:34 Cabanossi joined #git
19:35 Levex joined #git
19:38 heroux joined #git
19:41 cam27 joined #git
19:42 sbasso_ joined #git
19:43 Domhack joined #git
19:45 jakew_ joined #git
19:47 sbasso_ joined #git
19:48 d5sx43 joined #git
19:49 swift1 joined #git
19:49 thebope joined #git
19:50 roelmonnens joined #git
19:52 Husky_Apocalypse joined #git
19:54 str joined #git
19:56 jagob joined #git
19:56 Acerific joined #git
19:57 orbyt_ joined #git
19:58 h12o joined #git
20:00 animi_vulpis joined #git
20:02 TheFuzzball joined #git
20:04 eehackr joined #git
20:04 t7 joined #git
20:05 t7 hello all, i would like to squash my last 3 commits into one and keep the latest commit message
20:05 t7 what do
20:05 t7 i tried rebase -i  and then  f
20:05 t7 but it kept the oldest commit message
20:05 lordjancso joined #git
20:06 b1tchcak_ joined #git
20:06 t7 do i just squash?
20:06 _ikke_ t7: us squash instead of fixup
20:06 _ikke_ yes
20:06 _ikke_ then remove the part you don't want
20:07 maarhart joined #git
20:08 lordjancso joined #git
20:11 Starky joined #git
20:11 yitz joined #git
20:12 yitz Can I delete/drop a remote branch without hurting my local copy? I got a feature branch that got some changes. I rebased on master, etc. But somehow I ended up with a remote branch existing so when I push it says it's not a fast forward but I'd rather drop the remote and re-create/push from local
20:13 fission6 joined #git
20:13 avar push with -f if you mean it
20:13 b1tchcak_ joined #git
20:13 cdg joined #git
20:13 kadoban Probably that, though keep in mind it changes history, and all that entails ^
20:13 yitz Heh. I think I do... Thanks!
20:14 kadoban There is a way to explicitly delete a remote branch though, if you really want to.
20:14 yitz Yeah. Remote copy of the branch is not needed. -f worked I think
20:15 yitz but how would I delete remote and not local?
20:15 kadoban (If you do a refspec like   'git push origin :blah'   that's how you nuke a remote branch. The empty source (the part before the colon) signals that.
20:15 yitz Ah. Cool. Thanks
20:16 SaschaVoid joined #git
20:17 mgoodwin joined #git
20:17 avar you can use the more obvious `git push --delete origin blah`
20:17 jstein__ joined #git
20:18 tristanp joined #git
20:19 justan0theruser joined #git
20:20 marlinc joined #git
20:20 lordjancso joined #git
20:21 * yitz nods
20:21 shgysk8zer0 joined #git
20:22 man_arab joined #git
20:23 lordjancso joined #git
20:24 brent__ joined #git
20:24 man_arab left #git
20:25 rkazak joined #git
20:27 foodSurprise joined #git
20:27 foodSurprise hey guys. if I wanted to submit some work for copyright, how can I get a list of all the edits I did to files accross repos
20:29 sgen joined #git
20:29 _ikke_ You need to script something to work accross repos, but git log --all --author="your name" should return all your commits (add -p if you want the diff too)
20:29 safe joined #git
20:30 foodSurprise i'd like something like git blame but shows the history of more than just who last edited it
20:31 mkillebrew Is there an easy way to delete all the users from github enterprise from a partial migration that failed?
20:31 foodSurprise i don't think the copyrigth office allows you to upload an entire git repo
20:31 _ikke_ mkillebrew: That's more a question for #github
20:31 h12o joined #git
20:31 _ikke_ foodSurprise: No idea what the copyright office requires
20:32 mkillebrew I didn't know there was that as well
20:32 t7 left #git
20:32 mkillebrew thanks
20:32 nixjdm joined #git
20:33 DaGoaty joined #git
20:33 _ikke_ You might have to wait longer for an answer there though, you might be better of using the actual github support
20:34 DaGoaty_ joined #git
20:35 strk joined #git
20:35 mdw joined #git
20:35 strk why does `git svn fetch` take so much time when issued on a repository that already has the metadata ?
20:36 strk ie, the git-svn-id: labels
20:36 strk it takes up to a second
20:36 strk for *one* revision
20:36 dreiss joined #git
20:38 avar how long does it take you to run "svn up" ?
20:38 avar i.e. if you clone with svn
20:38 sunri5e joined #git
20:39 avar if "similar" then "that's your answer then, git-svn can hardly be faster than svn" else "hrm, odd" fi
20:39 avar :)
20:39 strk ok, but I thought the "svn metadata" in the commit log was meant to avoid that work ?
20:40 strk manual page says: "if you lose your $GIT_DIR/svn/**/.rev_map.*  files, git svn will not be able to rebuild them."
20:40 LaptopBrain joined #git
20:41 strk but `git svn fetch` is really rebuilding them no matter those metadata, isn't it ?
20:41 Es0teric joined #git
20:42 avar it's not rebuilding that, going over the network & overhead just takes a bit of time
20:43 avar 'svn up' on this random repo I have takes 1s, and fetch needs to do the equivalent of that
20:43 atrigent joined #git
20:43 strk wait, I'm saying 1 second *per revision*
20:43 thebope joined #git
20:44 strk I didn't test svn up from an old revision
20:44 ujjain joined #git
20:44 ujjain joined #git
20:44 strk I'm doing something like: `git svn fetch -r 1:13778`
20:45 foodSurprise so git log --all --author="your name" worked but how do I narrow it down to only files of a certian type
20:45 avar -- '*.c'
20:45 avar or something like that
20:46 strk which has done ~2000 revisions in 4 minutes
20:46 groverdill joined #git
20:47 Murii joined #git
20:47 ash_workz how do I see what changes git is complaining about before I pull?
20:47 strk isn't that too much, avar ?
20:47 ash_workz it's saying I have uncommitted changes... I don't remember making any. It gives me the file, but can I see the actual diff?
20:47 strk PID USER      PR  NI    VIRT    RES    SHR S  %CPU %MEM     TIME+ COMMAND
20:47 strk 17056 strk      20   0  185892  36392   7512 S  20.6  1.8   4:14.44 git-svn
20:47 Es0teric joined #git
20:48 strk and only got to r3211
20:48 miczac joined #git
20:48 kadoban ash_workz: 'git diff HEAD'
20:48 ash_workz kadoban: thanks
20:49 ash_workz kadoban: okay, so... can I see just added files that have been modified?
20:49 ash_workz kadoban: (files that've been added already)
20:49 kadoban Are you talking about staged changes? 'git diff --cached'
20:49 ash_workz kadoban: no
20:50 kadoban Don't know what you mean then
20:50 ash_workz kadoban: gisting...
20:50 lordjancso joined #git
20:50 rivarun joined #git
20:50 tango_ joined #git
20:52 TheFuzzball joined #git
20:53 ogny joined #git
20:53 ash_workz kadoban: https://gist.github.com/anonymous/fcb390cd28fa7b4e024472c341aa2b44
20:53 MeiR joined #git
20:53 Gsham joined #git
20:53 ash_workz kadoban: but in this case, changes to foo are a mystery to me
20:53 orbyt_ joined #git
20:54 MeiR hi, how can i clone only files from a specific branch?
20:54 cjohnson git clone --single-branch
20:54 cjohnson git clone -b mybranch --single-branch git://sub.domain.com/repo.git
20:55 kadoban ash_workz: Not really sure what you're asking for. Doesn't 'git diff HEAD' work fine? It refuses because you have uncommited changes in files that would be modified by the merge.
20:55 TheFuzzball joined #git
20:55 ash_workz kadoban: I know, but it shows a ton of changes to files that haven't been added in that diff
20:56 ash_workz kadoban: which I don't care about. they're session files and crap
20:56 kadoban ash_workz: You can probably just stash them, do whatever you want, and then apply the stash. session files? Are you tracking a bunch of stuff that doesn't make sense?
20:57 MeiR cjohnson thanks. if the dir is not empty i'll have to clone to a new dir and then move the files?
20:58 ash_workz oh
20:58 ash_workz no
20:58 ash_workz these are added files
20:58 rafaz joined #git
20:58 ash_workz they're modes
20:58 rafaz need help to recover data from Sd card can anyone guide me to a good support channel?
20:59 cjohnson MeiR: clone always makes a new dir afaik
20:59 cjohnson I'm not exactly sure what happens if you point it to an existing one
20:59 MeiR fatal: destination path '.' already exists and is not an empty directory.
20:59 MeiR that what happens ^ :D
21:00 h12o joined #git
21:03 ash_workz yeah so someone changed the modes on a bunch of different files
21:03 ash_workz and the server can't commit or stash
21:03 ash_workz how do I pull the new changes?
21:03 rominronin joined #git
21:04 Cabanossi joined #git
21:05 mizu_no_oto joined #git
21:05 Es0teric joined #git
21:06 orbyt_ joined #git
21:06 d5sx43 joined #git
21:06 strk left #git
21:07 prg3 joined #git
21:09 Es0teric joined #git
21:09 raffo joined #git
21:10 svm_invictvs joined #git
21:11 caper joined #git
21:13 raspado joined #git
21:18 apotry joined #git
21:19 jeffreylevesque joined #git
21:19 romank joined #git
21:22 romank joined #git
21:23 str joined #git
21:23 raffo joined #git
21:24 TheFuzzball joined #git
21:26 bigjazzsound joined #git
21:28 ServChan joined #git
21:29 h12o joined #git
21:33 nixjdm joined #git
21:35 tymczenko joined #git
21:36 basiclaser joined #git
21:38 thebope joined #git
21:38 Xethron joined #git
21:38 ResidentBiscuit joined #git
21:38 TheFuzzball joined #git
21:38 roelmonnens joined #git
21:40 relipse joined #git
21:41 b1tchcakes joined #git
21:42 TheSimonator joined #git
21:42 Discovery joined #git
21:42 invisbl_ joined #git
21:43 jt joined #git
21:46 TheFuzzball joined #git
21:47 mattp_ joined #git
21:50 DaGoaty joined #git
21:51 ixian joined #git
21:51 yohnnyjoe joined #git
21:55 mmlb joined #git
21:55 gear4 joined #git
21:55 gear4 hi guys
21:55 gear4 I have a post-receive hook that only works when I commit from Linux or WSL but not Windows
21:55 gear4 any idea why ?
21:56 aidalgol joined #git
21:57 bilal joined #git
21:57 netj joined #git
21:57 gear4 also the .git/ file was made on windows
21:57 kadoban gear4: post-receive doesn't have anything to do with commiting
21:57 kadoban That's a hook that's run on the server-side when you push to that remote.
21:58 h12o joined #git
21:58 ertes joined #git
21:59 tmsmith joined #git
22:01 itseris joined #git
22:02 cagomez joined #git
22:02 BorkStick joined #git
22:04 Cabanossi joined #git
22:04 gear4 aha
22:04 gear4 so it's a problem with wsl then ?
22:05 gear4 when I commit on wsl or on linux it doesn't commit
22:05 kadoban wsl? When you commit it doesn't commit? That's not making a ton of sense. Can you be more specific? !transcript could help. What actually looks wrong?
22:05 gitinfo Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
22:05 cahoots joined #git
22:06 gear4 kadoban: it commits but it doesn't automatically check out
22:06 DaGoaty joined #git
22:06 kadoban What does that mean?
22:06 gear4 it automatically updates when I commit with linux or WSL, but not when I commit with Windows
22:07 gear4 automatically pulls rather
22:07 kadoban define "it", "automatically" and "updates". Also I have no idea what WSL is.
22:07 kadoban O.o
22:07 gear4 wsl == windows subsystem for linux
22:07 kadoban Oh. Okay, with you on that part then. Only confused about everything else you mean.
22:07 gear4 imagine WINE, but for Windows, and it has a Linux shell
22:08 gear4 ok gimme a se
22:08 gear4 c
22:08 jakew_ joined #git
22:09 gear4 I dunno how I'll paste this :/
22:09 gear4 3 terminals open
22:10 ozcanesen joined #git
22:10 kadoban At a guess, you have some hook set up on linux to do something on some circumstances. I don't know what circumstances or what it's doing though. And that hook (or hooks) aren't set up on your other repos on the other OSes.
22:11 Ulysses1 joined #git
22:11 gear4 it's supposed to update a website automatically
22:12 kadoban Every time you commit or something? That sounds awful
22:12 gear4 yea\
22:12 gear4 it's just for me though
22:12 gear4 I mess around on Windows when I'm bored and updating a game or something
22:12 gear4 like PHP tetris
22:13 kadoban Well, you'd have to figure out what hook you have that's doing that in the repo in which it works, and figure out how to get that working on the other OSes.
22:13 gear4 PHP-only, all CSS and HTML gets generated inside PHP tags lol
22:13 gear4 post-receive is the one I need
22:13 gear4 the other OSes have it
22:13 kadoban post-receive doesn't operate when you commit.
22:15 gear4 it does when I push
22:15 gear4 oh wait I got something
22:16 gear4 remote: hooks/post-receive: line 4: cd: /c/Users/dev/web: No such file or directory
22:16 gear4 o.o
22:16 gear4 I get that from the .bat file I use to auto-push
22:16 gear4 but then after pushing, it automatically updates the website
22:17 invisbl joined #git
22:17 kadoban Hooks are just arbitrary scripts/executables. Making them actually do the right thing is up to you.
22:17 cbreak joined #git
22:17 gear4 a
22:17 gear4 alright
22:17 gear4 thanks a lot man
22:18 gear4 I dunno why it suddenly worked
22:18 gear4 ah it's not working when I commit to linux but it is when I commit to WSL
22:18 gear4 hm
22:18 kadoban Your terms make it impossible to tell what's going on ...
22:20 h12o joined #git
22:20 mmlb joined #git
22:20 gear4 I made a .git/ repo on Linux and tried pushing from Windows and WSL, didn't update. updates when pushing from Windows and Linux to WSL
22:20 gear4 doesn't work when pushing from WSL and Linux to Windows
22:20 gear4 gah
22:21 kadoban The correct hook needs to be set up in the repo to which you're pushing, if it's post-receive
22:21 gear4 they all have the correct hooks :(
22:21 gear4 it's fine, I'll just commit to WSL and auto-FTP over to web server
22:22 gear4 but thanks anyway
22:22 gear4 explaining stuff isn't my strongest point .. I'm mostly a shut-in programmer and graphic/website designer
22:23 gear4 thanks for patience
22:24 kadoban Yeah anytime, sorry I couldn't help. You did fine, it's easy to be confusing with git's terms sometimes. I suspect what's going wrong is just that the hook isn't working on some of those OSes or in some of those contexts.
22:25 mel00010 joined #git
22:26 Uneliasmarsu joined #git
22:27 gear4 if you're interested, I'm making a service to automatically push any and all changes to a new branch that automatically gets created called "wip"; I have another 2 services that listen to 2 files ("prod" and "test") and I modify them with whichever last commit I want to use to test or use on production, and it automatically gets deployed
22:27 gear4 no need for my using the terminal and I can group commits into categories and give them titles
22:28 kadoban I prefer not to tie my deployment so tightly into git, personally. I mostly just use rsync in a script that's easy to run.
22:29 malmalmal joined #git
22:29 gear4 the company I work for requested I have it set up by next week Monday :/
22:30 gear4 we used to use a terrible python script for deploying
22:32 thebope joined #git
22:33 nixjdm joined #git
22:34 animi_vulpis joined #git
22:35 animi_vulpis hi, I need help to reproduce an error I found in git v2.13.0. Is there a better place to ask? (it's about weird `git branch -v` output)
22:35 dax left #git
22:35 Acerific joined #git
22:37 gear4 oh poo it's not working again :(
22:39 v4ult joined #git
22:39 dwmw2_gone joined #git
22:41 gear4 man I'm just gonna make an inotify C service that watches for changes and then pulls
22:43 gear4 kadoban: does post-receive have to be on all the clients ? or just the host ?
22:44 kadoban Just the repo that you are pushing *to*, and it runs there.
22:44 gear4 ok cool
22:44 gear4 time to kill myself
22:45 robattila256 joined #git
22:46 gear4 omg
22:46 gear4 i'm an idiot
22:47 gear4 kadoban: I've not done this in a while but can I do: git://user@server:/path/to/repo.git ?
22:47 gear4 or ssh or something
22:47 gear4 wait I can google that
22:47 gear4 nevermind
22:47 dirac1 joined #git
22:48 kadoban user@server:/path/to/repo would be SSH syntax, the one above would work I think if you have git daemon set up or whatever that is (I never use that). I think that's usually read-only, though I'm not sure.
22:49 kadoban There's some other more explicit syntax for SSH, but nobody ever seems to use it.
22:49 hahuang65 joined #git
22:49 snowkidind joined #git
22:49 gear4 awesome, thanks a lot again
22:50 madewokherd joined #git
22:51 LTRand joined #git
22:54 arch-nemesis joined #git
22:56 ServChan joined #git
22:56 osse joined #git
22:56 arch-nemesis left #git
22:58 arch-nemesis joined #git
22:59 arch-nemesis Silly question. If I clone the linux repo from...seems like anywhere (git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git) multiple filesare markedmarked as modified on a fresh clone.
22:59 arch-nemesis My question is why not how to solve it, but why is this happening?
23:00 kadoban arch-nemesis: What's the modified part? Permissions? (+x bit) or line endings?
23:01 kadoban The short answer in either case is that your git config isn't quite right. Though I'd have to look up which one exactly and how to fix it personally.
23:01 arch-nemesis I see actual lines are different if I do git diff. but it's a fresh clone.
23:01 svm_invictvs joined #git
23:01 kadoban Not just the line endings?
23:02 arch-nemesis Not just crlf or something.
23:03 kadoban That's fairly hard to believe, can't imagine why that would be. Some weird git wrapper doing something funny maybe?
23:04 kadoban Maybe something *very* strange in some config, but I can't imagine what. And it couldn't come from the repo you're cloning.
23:04 Cabanossi joined #git
23:05 kadoban arch-nemesis: Is there some sense to be made of the differences?
23:06 arch-nemesis I'm making a pastebin, will paste in a sec.
23:08 gear4 aha! f*** you WSL, auto-start SSH + git is my thing now
23:09 gear4 now I gotta auto-commit
23:09 gear4 -_-
23:09 miczac joined #git
23:10 SkyPatrol joined #git
23:11 arch-nemesis Here we are: https://pastebin.com/7Y6xEcth
23:11 netj joined #git
23:11 acetakwas joined #git
23:14 qki joined #git
23:15 BorkStick joined #git
23:15 tourdownunder joined #git
23:16 invisbl joined #git
23:17 dirac1 left #git
23:17 Achylles joined #git
23:17 Altiare left #git
23:19 LTRand joined #git
23:19 Levex joined #git
23:20 BorkStick joined #git
23:22 anuxivm joined #git
23:22 om_henners joined #git
23:25 sbasso joined #git
23:26 thebope joined #git
23:27 roelmonnens joined #git
23:30 eehackr joined #git
23:31 nevodka joined #git
23:31 arch-nemesis It doesn't do it to any repo except linux repos, but it seems to do it for every linux kernel repo I can find. It could be something I am doing, but I don't know what.
23:33 nixjdm joined #git
23:34 BSaboia joined #git
23:35 rominronin joined #git
23:35 stepho joined #git
23:38 kadoban arch-nemesis: Is there .gitattributes in there or something? Any filters in your config or weird stuff in there?
23:40 raspado joined #git
23:41 mel00010 joined #git
23:42 epsi10n joined #git
23:42 pheurton joined #git
23:43 pheurton I've just created a dir and ran git init --bare on my server. when I push to this from my local machine, nothing changes?
23:44 epsi10n git does not add empty directories
23:44 pheurton I want to at least see the files so I can manually move them to my website's documentroot
23:44 epsi10n to push empty directories you could generate a hidden file (usually called .gitkeep) and add this file
23:44 pheurton epsi10n: it's not empty, I have a website locally
23:44 TbobbyZ_ joined #git
23:44 salamanderrake joined #git
23:44 epsi10n oh. Sorry.
23:44 cagomez joined #git
23:45 NeverDie_ joined #git
23:45 pheurton no problem. all I want to do is get the files onto the server so I can put them in the /var/www/html/mywebsite folder
23:46 kadoban pheurton: --bare means that it does not have a working directory. And you don't want one for a repo you're pushing to.
23:46 arch-nemesis @kadoban there is a gitattributes, and I pasted my global config https://pastebin.com/22ahsWgv it's a pretty simple config.
23:46 sunri5e joined #git
23:46 pheurton kadoban: is there a way for me to make the DocumentRoot the working directory, and checkout the code to there?
23:46 Rotaerk joined #git
23:47 kadoban pheurton: !deploy has some ideas if you want
23:47 gitinfo pheurton: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
23:47 kadoban arch-nemesis: It's probably the diff=cpp part. I'm not terrifically sure what that does
23:47 arch-nemesis @pheurton, you can. It doesn't need to be a bare repo. alternatively, you might want to have your bare repo somewheree else and do the deploy with a git hook
23:48 DaGoaty joined #git
23:48 pheurton kadoban: thanks. I have the bare repo in my home dir, but I want the code in my /var/www dir
23:48 arch-nemesis Use the hooks, so you can also deny changes that fail tests.
23:49 Levex joined #git
23:49 kadoban pheurton: I personally don't like using git for deployment. It's a good version control system. It's a fairly shit deployment system. So I'd just have the bare repo on the server if you want it there, and use rsync (on my local machine) to deploy when I want, or whatever other system you like.
23:49 sbasso joined #git
23:49 NeverDie joined #git
23:50 pheurton kadoban: It's only a very basic static website that I'm deploying so I just want a quick and dirty mechanism
23:51 kadoban rsync or even scp are quite quick
23:51 Manishearth joined #git
23:51 pheurton yeah but I still want the version control
23:51 Manishearth Is there a channel for git development?
23:51 orbyt_ joined #git
23:51 arch-nemesis I'd say git post-receive hook is the poor-mans jenkins. :P
23:52 Manishearth Have questions about the patch submission process
23:52 kadoban pheurton: Good, keep the version control. Use it for the part it's good at.
23:52 pheurton arch-nemesis: that's what I was looking for, but I couldn't get it working
23:52 kadoban pheurton: If you really want to, the link above tells you how to do automatic deployment with git. I'd just personally recommend against it. *shrug* up to you.
23:55 nckpz joined #git
23:55 pheurton kadoban: I know its bad, but now that I've investigated further I don't want to give up :)
23:55 pheurton I'll use a real platform as soon as I figure out this shit
23:55 kadoban Heh, that's a weird urge, but okay.
23:55 pheurton actually it's now almost 1am so I need to give up...
23:56 bremner Manishearth: #git-devel
23:57 pheurton thanks for the help, see ya
23:57 Manishearth thanks
23:57 MarioBranco joined #git
23:59 scoobert1on joined #git

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