Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-05-18

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

All times shown according to UTC.

Time Nick Message
00:00 Hunter1 joined #git
00:00 Cabanossi joined #git
00:02 dustinm joined #git
00:03 thebope joined #git
00:05 sitaram milki_, _ikke_: interesting.  I'll watch the ML traffic, but I think it's a perfectly good idea to unset that variable
00:06 safe joined #git
00:06 sitaram the text on the commit indicates it's a safety feature, and -- if you know what you're doing -- it's ok to bypass it carefully
00:07 wxg joined #git
00:07 sitaram and speaking of gitolite, I think at least the "partial refs" feature would require this...
00:07 ilgix joined #git
00:07 sitaram partial copy, I mean
00:08 ilgix left #git
00:09 sitaram hmm
00:12 Guest29587 joined #git
00:12 ilgixcom joined #git
00:12 cioran89 joined #git
00:13 sbasso joined #git
00:13 dsdeiz joined #git
00:14 sitaram I wonder if only the refs are unavailable or the objects themselves.  If the objects are there, I may not have to do anything (for the "partial-copy" feature to continue to work)
00:17 Hunter1 joined #git
00:17 tmsmith joined #git
00:18 rnsanchez joined #git
00:22 itseris joined #git
00:25 hugdru joined #git
00:26 thebope joined #git
00:26 TheFuzzball joined #git
00:28 kadoban_ joined #git
00:38 crater2150 joined #git
00:38 snowkidind joined #git
00:39 jarod_ joined #git
00:41 mizu_no_oto joined #git
00:42 NeXTSUN joined #git
00:43 Rodya_ joined #git
00:45 d^sh joined #git
00:47 watabou joined #git
00:48 abra0 joined #git
00:49 mel00010 joined #git
00:51 justanotheruser joined #git
00:52 fstd_ joined #git
00:53 Noodlewitt joined #git
00:56 duderonomy joined #git
01:02 YouCallItFar joined #git
01:02 YouCallItFar is there any way to check a github "release" into a project?
01:02 cqi joined #git
01:02 jarod_ left #git
01:02 YouCallItFar like add github releases as submodule?
01:07 Eugene YouCallItFar - I believe that the Releases feature will create a Tag that you can use with `git tag` etc
01:07 Eugene (pretty sure.... I always make my tag first, then create the Release)
01:07 thiago joined #git
01:08 YouCallItFar i want to use the release binary in other projects
01:09 YouCallItFar have travis.ci build a static library and submit it as a github release, then use that release in another project
01:09 YouCallItFar would be really cool if you could do that
01:09 bannakaffalatta joined #git
01:10 YouCallItFar like if you could do "git add release <releaseurl>" just like you can do "git add submodule <submodule url>"
01:11 YouCallItFar maybe i mean the "release archive".  i havent made a git release yet.  wherever you would put binary data
01:11 Eugene Sorry, what are you trying to do?
01:11 Eugene You want the build output to be made available to other services?
01:12 YouCallItFar yeah, i think so.  i want to add the build output to a repository.
01:12 Eugene git doesn't have a mechanism for that, really. What you're describing is just a CDN ;-)
01:12 YouCallItFar im trying to make a better version of https://github.com/emileb/OpenSSL-for-Android-Prebuilt
01:12 Eugene Github will generally let you use their Releases mechanism for this for public projects
01:14 YouCallItFar i add OpenSSL-for-Android-Prebuilt as a submodule to my project
01:14 Eugene It is not recommended to add build products to git's tracking
01:15 YouCallItFar i would rather use a release.  but i need to be able to add the release into my project.
01:16 YouCallItFar otherwise i would have to download like 10 releases of my different libs and put them all into place
01:17 finalbeta joined #git
01:18 CDanU I am trying to apply a patch. On linux the generated patch works, on windows I get this: fatal: BUG: caller miscounted postlen: asked 48, orig = 48, used = 49 .. does someone know what that means?
01:19 YouCallItFar i could use a source repository and a binary repository and update the binary repository from travis.ci after building source, but as you say thats not recommended
01:19 ghoti joined #git
01:19 YouCallItFar what i need is the ability to add release assets to git repositories just like they were a submodule
01:19 Eugene !annex
01:19 gitinfo git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs
01:20 YouCallItFar its like time square being empty when youre a thought leader
01:20 YouCallItFar ahh interesting Eugene thanks
01:20 YouCallItFar !binary problem
01:20 gitinfo Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions
01:20 Eugene git is meant as a source code tracker; binaries are not really its bag(they don't diff+compress+dedupe well)
01:20 roelmonnens joined #git
01:21 Eugene Most people just use an external directory of some sort to deal with this, and serve it up via HTTP, FTP, rsync, whatever
01:21 Stumbler joined #git
01:22 dviola joined #git
01:23 YouCallItFar right. but i can forsee a revolution where noone has to rebuild source for trust reasons. if every public project has public .travis.yml that builds project, we can setup Reproducible Builds so anyone can verify the hash of the binary for a given source tree (which contains deterministic build procedure ie travis.yml)
01:24 YouCallItFar the good news is this is all possible on android
01:24 Eugene Lofty goals ;-)
01:24 YouCallItFar the !binary problem is the worst part of ideal android example
01:24 gitinfo Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions
01:26 YouCallItFar but gonna look into git-annex, git media, and git lfs
01:27 sunri5e joined #git
01:38 finalbeta1 joined #git
01:47 Marquisk2 joined #git
01:47 rchavik joined #git
01:47 Rodya_ joined #git
01:47 Marquisk2 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:51 tunekey joined #git
01:54 d^sh_ joined #git
01:57 CDanU left #git
02:00 Random832 joined #git
02:00 TbobbyZ joined #git
02:00 BSAlb joined #git
02:00 dermoth joined #git
02:01 Es0teric joined #git
02:04 cqi joined #git
02:06 lagothri1 joined #git
02:07 tourdownunder joined #git
02:12 arecaceae joined #git
02:13 jameser joined #git
02:14 sbasso joined #git
02:15 Vortex35 joined #git
02:17 dreiss joined #git
02:18 kbeflo joined #git
02:20 zxd_ joined #git
02:21 ljc joined #git
02:22 menip joined #git
02:23 TikityTik joined #git
02:25 ojdo joined #git
02:27 tunekey joined #git
02:28 hexagoxel joined #git
02:28 Stumbler joined #git
02:30 SkyPatrol joined #git
02:30 netj joined #git
02:33 safe joined #git
02:33 Stumbler_ joined #git
02:34 theiostream joined #git
02:37 ribasushi joined #git
02:40 chachasmooth joined #git
02:42 a_thakur joined #git
02:42 str joined #git
02:44 om_henners joined #git
02:46 Rodya_ joined #git
02:46 SkyPatrol joined #git
02:48 tanuki joined #git
02:48 malmalmal joined #git
02:50 k0nichiwa joined #git
02:50 cyphase joined #git
02:51 a_thakur joined #git
02:52 a_thakur joined #git
02:58 ResidentBiscuit joined #git
03:00 Random832 joined #git
03:00 d^sh joined #git
03:00 Cabanossi joined #git
03:06 Stumbler joined #git
03:09 aavrug joined #git
03:09 roelmonnens joined #git
03:10 aavrug joined #git
03:11 Goplat joined #git
03:13 malmalmal joined #git
03:20 ki0 joined #git
03:20 navidr joined #git
03:23 jt joined #git
03:25 singlerider joined #git
03:26 a_thakur joined #git
03:27 LeBlaaanc joined #git
03:28 jeffreylevesque joined #git
03:28 chachasmooth joined #git
03:29 Cabanossi joined #git
03:30 a_thakur joined #git
03:30 cyphase joined #git
03:30 robotroll joined #git
03:33 freddieptf joined #git
03:38 chachasmooth joined #git
03:38 spinningarrow[m] How do folks manage the installation and sharing of hooks for projects in a team?
03:40 miczac joined #git
03:43 Andrew_K joined #git
03:46 Rodya_ joined #git
03:47 Andrew_K joined #git
03:48 jt joined #git
03:51 jaziz joined #git
03:59 bpna joined #git
03:59 Cabanossi joined #git
04:01 thiago spinningarrow[m]: manually
04:02 TbobbyZ joined #git
04:08 allandaemon joined #git
04:09 Es0teric joined #git
04:12 raspado joined #git
04:15 sbasso joined #git
04:17 dhollinger joined #git
04:19 dhollinger joined #git
04:19 om_henners joined #git
04:23 Emperor_Earth joined #git
04:25 ski7777 joined #git
04:27 ZyX-I joined #git
04:30 Noodlewitt joined #git
04:32 milki sitaram: the objects in quarantine are setup as an alternate object dir. they needed to update the alternates implementation to support quarantine so im not yet sure how special it is
04:36 karols146 joined #git
04:37 Murr- joined #git
04:38 _ikke_ sitaram: From what I understood, it's the objects themselfs that are quarentined (to be able to trash them if the push is rejected). The reason I thought it might be harmful is if it interfered with git unquantining the object, but looking at the commits, it doesn't seem that way
04:39 vmonteco_ joined #git
04:41 milki ah, yeah, thats important. if unsetting it the hook causes git to forget where the quarantine dir is, then that would prevent unquarantining
04:41 jeffreylevesque_ joined #git
04:42 milki hm.. how does it deal with some refs being rejected and some accepted
04:43 milki https://github.com/git/git/commit/722ff7f876c8a2ad99c42434f58af098e61b96e8#diff-d917d49f29d7cec92c230590c3bc03b3R1462 is the unquarantining
04:43 _ikke_ milki: the pre-receive hook runs just once
04:43 _ikke_ even if you push multiple refs
04:43 _ikke_ milki: so you can only accept or reject all refs
04:44 milki o right. its all or nothing
04:44 Cabanossi joined #git
04:45 ayogi joined #git
04:45 nurdie joined #git
04:46 D630 joined #git
04:47 milki huh, looks like the alternates is setup in memory - https://github.com/git/git/commit/2564d994c9c91aea58d59565d68d42bbc017f536#diff-98a2e58f9c31bf7df2889564c6a90478R270
04:47 Rodya_ joined #git
04:54 durham joined #git
04:54 _ikke_ right, it only needs to exist as long as the push is running
04:54 xall joined #git
04:54 _ikke_ note that the objects are written to disk, it's just the list of alternates that remains in memory
04:55 dreiss joined #git
04:56 karols146 joined #git
04:56 karols146 joined #git
04:57 roelmonnens joined #git
04:57 thebope joined #git
04:59 om_henners joined #git
05:00 freimatz joined #git
05:00 Raging_Hog joined #git
05:00 svm_invictvs joined #git
05:03 cqi joined #git
05:05 LTRand joined #git
05:07 dec0n joined #git
05:09 milki ok, so tmp_objdir makes no reference to GIT_QUARANTINE_PATH. its probably not dependent on it at all and keeps track of the tmpdir in other structures
05:09 dag_ joined #git
05:09 dag_ how can i create a branch
05:10 Motoko joined #git
05:10 milki but since the alternates is added in memory, a hook that uses another git process to access the repo wouldnt have access to the quarantined objectrs
05:10 milki !branch
05:10 gitinfo A branch and a tag are just convenient ways of spelling the name of a particular commit.  A commit represents a specific set of files and the history of all commits which came before it, and the SHA-1 hash tag official name provides cryptographic assurance of the lineage of a particular commit (and thus branch or tag).  A branch's reference may change.  A tag usually doesn't.
05:10 milki hm.. that doesnt help
05:11 milki dag_: git branch <branchname> creates a branch
05:11 dag_ milki: git checkout -b <branchname> ? does the same thing?
05:11 rscata joined #git
05:11 milki dag_: that does 2 things. it creates a branch and also switches to the branch
05:12 milki a convenient shortcut
05:12 _ikke_ already left
05:15 milki aw
05:16 om_henners joined #git
05:17 danimal2 joined #git
05:21 qt-x joined #git
05:22 om_henners joined #git
05:22 Introoter joined #git
05:24 vadg joined #git
05:27 tunekey joined #git
05:28 vadg how can we remove a branch
05:28 furrykef rtfm
05:28 Cabanossi joined #git
05:29 yitz git branch -d|-D
05:29 Motoko git branch -remove-it -please -now -i-really-mean-it branch-name
05:30 vadg yitz: git branch -d|-D vig_ansibledocker bash: -D: command not found fatal: branch name required
05:30 Motoko Why not type "git help branch" and read the output?
05:31 yitz Or jeebus
05:31 yitz *Oh
05:32 Motoko Deleting a branch is pretty simple. Reading the output or searching it for "delete" would be a good idea.
05:34 sathed_ joined #git
05:34 osse yitz: try using / instead of | next time :p
05:35 * Motoko smacks osse upside the head
05:37 sangy joined #git
05:37 axisys joined #git
05:40 dreiss joined #git
05:42 menip Should I be committing when I am signing off? Or is just adding ok?
05:42 atrigent joined #git
05:42 brent__ joined #git
05:43 LovesTha commits shouldn't be tied to the clock, they should be tied to you finishing a bucket of work
05:43 grift joined #git
05:43 LovesTha adding is how you compose a useful commit
05:44 Motoko It depends on what you want to do and how you want to work.
05:44 menip So for example, I was working on a class diagram today. I should commit once I feel like I am finished, not while I feel like there is more to do?
05:44 Motoko You could commit on regular to a working temp branch then rebase to cleanup when done with a unit.
05:44 yitz You should commit when you finished a unit of work
05:46 rnsanchez joined #git
05:46 Raging_Hog joined #git
05:46 grawity commit early and commit often; this is not svn
05:48 Rodya_ joined #git
05:49 om_henners joined #git
05:52 thebope joined #git
05:53 menip If I add but not commit, my changes will still be there the next day right?
05:54 Motoko They'll be staged.
05:54 grawity it's not like Git is going to throw them away overnight
05:55 Motoko I often like to do small commits then rebase to squash things together to look nice before I push.
05:55 yitz Why would files change over night?
05:56 menip This is my first project with git, so learning. Doing only local for now
05:56 Motoko I mostly do it so I can roll back a change if I mess up before I complete the work.
05:56 Motoko You get to a point where there is some stuff working? Commit.
05:56 Motoko When you're ready to make it look nice, rebase.
05:56 atrigent joined #git
05:57 Motoko There are many ways to work in git.
05:57 Motoko Sometimes I do holding commits and then branch them off so I can work on different things as needed.
05:58 mmlb joined #git
05:59 King_Hual joined #git
05:59 King_Hual joined #git
06:01 TheWild joined #git
06:04 TbobbyZ joined #git
06:07 lb1c joined #git
06:10 dege joined #git
06:13 MineCoins joined #git
06:16 sbasso joined #git
06:17 manuelschneid3r joined #git
06:18 acetakwas joined #git
06:20 furrykef http://stackoverflow.com/questions/44038973/copying-a-subdir-from-another-git-repo-while-keeping-history  I just posted this question
06:20 furrykef I asked this in here earlier but I'm not sure the answer I got is for the exact case I'm dealing with.
06:22 lindenle joined #git
06:22 kadoban furrykef: Does the subdirectory have the same name in both?
06:23 furrykef yeah
06:23 kadoban Actually it probably doesn't matter. You can just filter-branch everything else away in the original one, and if you want to change the name. Then just merge that history into the other repo.
06:24 freimatz joined #git
06:24 freddieptf joined #git
06:24 HurricaneHarry joined #git
06:24 kadoban You'd want tree-filter I think, just have to write a script that deletes everything except the subdirectory you want and run that.
06:24 furrykef I'm sorry but this is a little greek to me. I don't really grasp how filter-branch relates to getting the history from another repo.
06:26 kadoban It doesn't. Getting the history from another repo is as simple as fetching from it and merging into whatever branch you want. But since you only want the one subdirectory, first you modify the history in the source branch to remove everything else.
06:26 kadoban You can make a copy of the original before you modify it if you want, if you want the original to stay pristine, up to you.
06:26 roelmonnens joined #git
06:27 justan0theruser joined #git
06:29 furrykef Well, this was the guide I followed: https://jrsmith3.github.io/merging-a-subdirectory-from-another-repo-via-git-subtree.html
06:29 furrykef What do I do given that I have already followed these steps?
06:29 chele joined #git
06:29 JeroenT joined #git
06:30 furrykef If you look at the history you get a link to both the "mainline" and the "split": https://github.com/SNES-SDK/llvm/commits/65816/lib/Target/WDC65816
06:30 furrykef What I want to do is merge these.
06:32 Bock joined #git
06:34 dersand joined #git
06:34 schleppel joined #git
06:35 druonysus joined #git
06:37 SaberArthur joined #git
06:38 SaberArthur joined #git
06:38 overlord_tm joined #git
06:38 SaberArthur joined #git
06:39 SaberArthur joined #git
06:41 roelmonnens joined #git
06:46 thebope joined #git
06:49 Rodya_ joined #git
06:49 wxg joined #git
06:51 elect joined #git
06:53 ExpiredDev joined #git
06:54 tunjin joined #git
06:55 mozzarel1 joined #git
06:57 flaviodesousa joined #git
06:57 finalbeta joined #git
07:01 metalraiden34 joined #git
07:03 atrigent joined #git
07:04 Neo joined #git
07:04 TomyWork joined #git
07:04 FuzzyWuzzyPanda joined #git
07:05 zefferno joined #git
07:07 indistylo joined #git
07:07 Noodlewitt joined #git
07:07 jason237 joined #git
07:09 maxime_ joined #git
07:10 Gloomy joined #git
07:13 a_thakur joined #git
07:14 Gurkenglas joined #git
07:14 Cabanossi joined #git
07:15 sbulage joined #git
07:15 a_thakur_ joined #git
07:16 alkisg joined #git
07:16 a_thakur_ joined #git
07:18 Tobbi joined #git
07:19 freimatz joined #git
07:20 alkisg Hi, I'm new to git. A have a source repository where I don't have write access, and I want to maintain a mirror of it, but with a single file changed with a small sed command, `sed 's|^upstream/|#&|' -i debian/patches/series`
07:20 alkisg What's the easiest way to do that? Do git branches allow me to have a single file constantly modified, or do I need a full clone of that repository?
07:26 yitz Maintain your mirror. When you want to use it, clone and modify it
07:28 mrkake joined #git
07:30 alkisg yitz, I guess what I'm asking is, can I maintain that separate file in a branch instead of in a whole separate repository, so that future pulls from the origin are faster?
07:31 yitz In git, everything is in a branch. Either the master branch or another.
07:31 floppydh joined #git
07:31 yitz If you got local changed files that are not in the upstream, a pull can have merge conflicts
07:31 alkisg So if I run e.g. "git checkout -b disable-upstreamed-patches", and then run the sed command inside that new branch,
07:32 alkisg can I then continue pulling from master without conflicts?
07:32 alkisg I.e. if the change was commited in a new, local branch, that is not in the original repository...
07:32 yitz You can commit your change to your local branch then change back to the master branch and pull ... but your branches drift out of sync
07:33 alkisg I can easily manually sync that one file, if that's what it takes at that point
07:35 alkisg Thank you yitz, testing...
07:35 TheWild hello
07:36 TheWild is there a change of making git server on a free web hosting?
07:36 TheWild *chance
07:37 Levex joined #git
07:37 kadoban Depends what you mean by a git server. Git repos are just files in a directory, so if it's just for you, and you can SSH in or something similar, that'd work.
07:37 kadoban Not sure why you'd bother though, github or bitbucket are going to be just plain superior.
07:39 chele joined #git
07:40 thebope joined #git
07:42 MrMojit0 left #git
07:43 pbandark joined #git
07:45 grayjoc joined #git
07:46 sbasso joined #git
07:46 a_thakur joined #git
07:49 Rodya_ joined #git
07:51 DDBag joined #git
07:54 kelvah joined #git
07:54 aielima joined #git
07:55 karols146 joined #git
07:56 marcogmonteiro joined #git
07:57 kurkale6ka joined #git
07:57 drola joined #git
07:58 brent__ joined #git
07:58 mikecmpbll joined #git
08:00 zerow joined #git
08:02 roelmonnens joined #git
08:03 chachasmooth joined #git
08:03 freddieptf joined #git
08:03 roelmonnens joined #git
08:04 tvw joined #git
08:04 Tobbi joined #git
08:04 zzz joined #git
08:06 Orion3k joined #git
08:07 TbobbyZ joined #git
08:09 courrier joined #git
08:11 wandering_vagran joined #git
08:14 _ADN_ joined #git
08:14 Cabanossi joined #git
08:15 a_thakur joined #git
08:16 sbasso joined #git
08:18 m4sk1n joined #git
08:19 ki0 joined #git
08:20 tterrag joined #git
08:20 JeroenT joined #git
08:21 chele joined #git
08:22 G1eb left #git
08:25 diogenese joined #git
08:26 Snugglebash joined #git
08:26 j08nY joined #git
08:26 Johnson1977_ joined #git
08:28 cgundersson joined #git
08:28 tunekey joined #git
08:29 Johnson1977_ When im doing git clone, I get prompted about 'host authenticity'
08:29 Johnson1977_ I already added all bitbucket keys to known hosts
08:29 Johnson1977_ and the known_host has chmod 600 permission
08:29 Johnson1977_ How can I make it that it doesn't prompt
08:29 Johnson1977_ without disabling strict checking hack
08:30 g5pw joined #git
08:32 _ADN_ joined #git
08:32 d-fence_ joined #git
08:32 alkisg left #git
08:34 thebope joined #git
08:35 JeroenT_ joined #git
08:35 sarri joined #git
08:35 sarri joined #git
08:38 _ADN_ joined #git
08:40 ams__ joined #git
08:41 Yatekii joined #git
08:41 Snugglebash joined #git
08:44 cstratak joined #git
08:44 JohnA joined #git
08:45 osse Johnson1977_: do you get the same message if you run 'ssh -T git@bitbucket.com' ?
08:45 osse several times
08:45 Johnson1977_ no
08:45 JohnA joined #git
08:45 Johnson1977_ o wait
08:45 Johnson1977_ yes
08:45 Johnson1977_ i mean
08:46 osse Then it's out of Git's hands. It's an SSH config issue
08:46 JohnA joined #git
08:46 MineCoins joined #git
08:46 osse I don't know the answer
08:47 osse Probably a setting in .ssh/config or /etc/ssh/ssh_config
08:47 Johnson1977_ if I add all the bitbucket keys to known_hosts
08:47 osse Johnson1977_: btw the file is usually called 'known_hosts' with an s at the end
08:47 Johnson1977_ It shouldn't ask right
08:47 osse dunno
08:49 Vampire0 Johnson1977_, maybe you should try deleting the file and then let SSH create it with the correct entry after you said "yes". You then can either be happy or compare the files for differences to know why SSH didn't like your old file
08:49 EugenA joined #git
08:50 Johnson1977_ ok ill try
08:50 EugenA how can I exclude single file from .gitignore? if I add !myfile I still cannot add that file to git
08:50 DelTree won't .ssh/know_hosts' obfuscation prevent any comparing of the file ?
08:51 Yatekii hey guys, can anyone help me with this: https://pastebin.com/H9reH0d0 ?
08:51 Yatekii I litterally just pulled and it seems to be up to date but then can't push, what?
08:51 Rodya_ joined #git
08:51 osse Yatekii: git status?
08:52 osse seems like you're detached but you think you're on master
08:52 Yatekii ooh true I am detached
08:52 Yatekii ....
08:52 borkr joined #git
08:52 Yatekii I have a git version from the stoneage (my institute at school has old systems, can't help it)
08:53 Yatekii so it's very non verbose or maybe it's illconfigured so I overlook this stuff quite often
08:53 Yatekii ty
08:53 robattila256 joined #git
08:54 Yatekii oh now I failed ... lol I just changed to master and lost the commit on head
08:54 Yatekii sad day for me
08:54 Yatekii luckily it's easy to fix
08:57 sbasso joined #git
08:58 Yatekii osse: can I somehow get that commit back? :S
08:58 tobiasvl Yatekii: !reflog
08:58 gitinfo Yatekii: The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
08:58 osse Yatekii: you should make temp branch at that point:  git branch tmp HEAD@{1}
08:59 osse was it only one commit you made? git cherry-pick tmp
09:00 Yatekii yep it was the only one
09:01 Yatekii tnak you, I did git cherry-pick HEAD@{2}
09:01 Yatekii I was afraid it would maybe already GC
09:01 EugenA I have in .gitignore: public/data/* and I want to unignore: public/data/cms_data/myfile.json
09:02 Yatekii !public/data/cms_data/myfile.json should do it? :)
09:02 gitinfo [!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
09:02 Levex joined #git
09:03 tobiasvl Yatekii: you probably need !public/data/cms_data (and then *public/data/cms_data/* below)
09:03 gitinfo Yatekii: [!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
09:03 overlord_tm joined #git
09:03 tobiasvl Yatekii: ignore gitinfo, it's triggering on ! public
09:03 osse Yatekii: are you sure 2 is right instead of 1 ?
09:04 osse in HEAD@{...} I mean
09:05 Yatekii tobiasvl: oh kk :D
09:05 Yatekii osse: yep :)
09:05 Yatekii I checked in git log -g
09:06 osse ok, good
09:06 Yatekii osse: somehow the commit which i pulled in with the bad checkout to master was HEAD 1 makes kinda sense, right?
09:07 overlord_tm joined #git
09:08 Yatekii osse: well the weird part is that I now have the commit in git log but the file I changed in that commit is unchanged :S
09:08 YuGiOhJCJ joined #git
09:09 nineg joined #git
09:09 TheFuzzball joined #git
09:09 achadwick joined #git
09:10 Yatekii ok I might have failed
09:10 Yatekii nvm
09:13 chll_ joined #git
09:13 peterfleck joined #git
09:14 tourdownunder joined #git
09:16 howitdo joined #git
09:16 howitdo joined #git
09:18 EugenA Yatekii: git add public/data/cms_data/myfile.json still says: path is ignored, use -f to add
09:19 kadoban EugenA: Just use -f. Once you are tracking something, .gitignore has no effect at all.
09:19 styx_ joined #git
09:22 mindfart joined #git
09:25 Introoter joined #git
09:28 TheFuzzball joined #git
09:28 thebope joined #git
09:30 Vampire0 EugenA, as tobiasvl told you, you need two more lines before the one Yatekii gave you. Or you don't modify the .gitignore and just force-add it like kadoban suggested. You can also see !gitignore_whitedir and !gitignore_whitefile
09:30 gitinfo EugenA: A global/directory .gitignore blacklist with a (potentially) subdirectory whitelist is not easy to specify in git. However, something like `echo -e '/*\n!/a/\n/a/*\n!/a/b/\n/a/b/*\n!/a/b/c/' > .gitignore` (ignore everything but a/b/c directory) or `echo -e '*\n!*/\n!*.txt' > .gitignore` (ignore everything but *.txt files) may do what you want.
09:30 gitinfo EugenA: A global/directory .gitignore blacklist with specific file whitelist is trivial to specify in git, since files tracked by git are ignored by .gitignore.  So simply make a .gitignore of "*" and then `git add -f filename`  Those specific files will be tracked by git and show up in git status and friends.
09:30 Snugglebash joined #git
09:32 ertes-w joined #git
09:33 xall joined #git
09:33 thebope joined #git
09:34 cstratak joined #git
09:45 Matsv- left #git
09:46 Matsv joined #git
09:47 ferr joined #git
09:47 Duality joined #git
09:48 Duality setting up a git server was easier then i thought! :)
09:49 a_thakur joined #git
09:49 Keavon joined #git
09:50 catch22 joined #git
09:50 star_prone joined #git
09:52 karols146 joined #git
09:52 Keavon I have a repository called "project" from two years ago with an early attempt at a project. Then I have a second repository called "project_v2" started one year ago with a more modern attempt at the project (no shared code, started separately). I want to take all the history of "project_v2" and put it on top of "project" (as if the next commit to "project"
09:52 Keavon involved deleting all files from the repo and adding all the files in the oldest commit to "project_v2").
09:53 Rodya_ joined #git
09:54 Keavon So the old "project" contains the old code up to its most recent commit from two years ago, then the next commit is from one year ago when "project_v2" was started replacing all the files in the repo. Ultimately "project" should end up with the history of both projects inside the "project" repo.
09:55 tobiasvl Keavon: !git-stitch-repo perhaps?
09:55 gitinfo Keavon: The git-stitch-repo tool allows for stitching several git repositories together as a unified history without merges, see https://metacpan.org/module/git-stitch-repo for more info.
09:55 Keavon I'll take a look at that, thanks.
09:56 stepho joined #git
09:57 Keavon tobiasvl: That page says this:
09:57 Orion3k joined #git
09:57 Keavon "The RESULT repository will contain all commits from repositories ../A ../B ../C & ../R, with the paths of the files rewritten: the files from the ../A repository will be in subdirectory A/ of the new repository, the files from ../B in its subdirectory B/, the files from ../C in subdirectory X/, and the files from ../R in its root directory."
09:57 Keavon If I'm understanding it right, that means that all the files of the history of "project" goes into one child folder and all the files throughout the history of "project_v2" goes into another directory?
09:58 tobiasvl yeah that seems to be right.
09:58 Keavon But I just want them all in the root of the repo's folder.
09:59 Keavon Would that just mean running git-stitch-repo A B instead of ../A ../B?
10:00 ppang joined #git
10:00 om_henners joined #git
10:03 Kaisyu joined #git
10:04 romank joined #git
10:04 Vampire0 Keavon, I guess you should simply add project_v2 as remote to project, then fetch the commits of project_v2. You then can do branches and tags how you like them on both histories to get the desired result. You will have two separate unrelated histories in that one repo then. Alternatively you then can also create a merge commit to merge those unrelated histories into one, taking only the files from the v2
10:04 Vampire0 side, or you can use a graft to just define that the last commit of project is the parent or project_v2. In the latter case you will have one history following the other and they are connected lineary. I guess that is the desired solution in your case
10:06 Keavon Vampire0: I'd like to keep it all in master, as if I went back in time 1 year and, instead of making project_v2, I just deleted everything and committed my new code in master
10:06 tvw joined #git
10:07 Keavon I'd like to avoid creating any new commits for merging if possible
10:07 Vampire0 Keavon, yep, exactly what I said
10:07 Vampire0 Keavon, if you follow my last suggestion you will get exactly that
10:08 Vampire0 Keavon, add v2 as remote to v1, fetch v2 remote, make a graft that defines last commit of v1 as parent of first commit of v2
10:09 Keavon So I use a graft to define the latest commit of "project" to be the parent of "project_v2"? How do I do that?
10:09 Vampire0 Keavon, if all is well and as expected you can make the graft permanent
10:09 Keavon Okay. Right now I have both repos cloned on my desktop.
10:09 TbobbyZ joined #git
10:09 Vampire0 Keavon, !graft
10:09 gitinfo Keavon: [!grafts] Grafts are an obscure feature allowing distinct histories to be joined together; see https://git.wiki.kernel.org/index.php/GraftPoint
10:10 Keavon So first I need to make project_v2 have its remote be the local cloned copy of v1?
10:11 Vampire0 Keavon, I'm sorry, but I don't understand what you mean. Either add v2 as remote to v1 or v1 as remote to v2. Actually adding v1 as remote to v2 will probably be better
10:11 Vampire0 Keavon, man git remote
10:11 gitinfo Keavon: the git-remote manpage is available at https://gitirc.eu/git-remote.html
10:12 Vampire0 Keavon, something like `git remote add v1 url/to/v1`, then `git fetch v1 --tags`
10:13 Vampire0 Keavon, then use a Graft to stitch the histories together and if you are happy, make the graft permanent
10:13 Keavon Sorry, I am somewhat confused about this. As I understand it, a remote is a copy of the repo hosted somewhere like on my external git server. It's set within the git metadata to an address for that remote server. I can also set it to something local, I guess, and that's what you're suggesting?
10:14 Vampire0 Keavon, well, a remote is just a definition of another repo, basically a name and an URI (yes, it can also point to a local repository)
10:14 Vampire0 Keavon, whether you point to the local or the remote one of v1 doesn't matter
10:15 Keavon Okay, so for simplicity I'll just have it be the one on my server since I'm used to treating it like that
10:15 Vampire0 Keavon, sure
10:15 Keavon So I'll go into v2 and run that command to make it so the v1 on my server is the remote for v2?
10:16 Keavon Shouldn't it be the other way around, since I'm adding stuff on top of v1, so I should set v1's remote as v2?
10:16 Vampire0 Keavon, you didn't quite understand yet I think
10:16 Vampire0 Keavon, there is not "THE" remote of a local repository
10:17 Keavon Yeah, I'm still a bit confused, sorry!
10:17 Vampire0 Keavon, you can have 20 remotes in one repository
10:17 Vampire0 Keavon, a remote is just a pointer to some remote repository with a name
10:17 Keavon Ok.
10:17 kurkale61 joined #git
10:17 Vampire0 Keavon, "origin" is just an arbitrarily chosen name that happens to be the default name for a remote
10:17 davimore joined #git
10:17 chardan__ joined #git
10:18 fiasco joined #git
10:18 Keavon I see.
10:18 dsdeiz joined #git
10:18 Vampire0 Keavon, if you used the command like I have shown, you will have a second remote called v1
10:18 Keavon And I'll be adding a second remote to v1 pointing to an instance of the v2 repo?
10:18 Vampire0 Keavon, why?
10:18 fiasco hello, if I'm on a detatched head state how do I see log differences from a branch, the usual git log HEAD..origin/branch shows nothing, I did git fetch before
10:18 Keavon Perhaps I'm misunderstanding the intent then.
10:19 Keavon Is the goal to be able to pull "changes" (i.e. all the commits from the v2 repo) into the v1 repo so they can be grafted?
10:19 grawity fiasco: .. shows the differences in one direction
10:19 Vampire0 Keavon, you add the remote URL of v1 to the local clone of v2 and fetch, to get all of the history in v1 into the local clone of v2, additionally to what is already there
10:19 grawity fiasco: i.e. stuff in origin/branch but not HEAD
10:20 Vampire0 Keavon, then you use a graft to connect the two
10:20 blunaxela joined #git
10:20 grawity fiasco: you might want to swap the two names, or use ... instead
10:20 Vampire0 Keavon, btw. be aware that with this you will !rewrite history
10:20 gitinfo Keavon: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
10:20 disi joined #git
10:20 Keavon Yeah, I'm aware it involves rewriting history.
10:20 duderonomy joined #git
10:21 Vampire0 Keavon, after you stitched the histories together, made it permanent and pushed it to the remote repo for v2, you have everything there
10:21 Keavon Yeah.
10:22 jgrasser joined #git
10:22 Keavon So I added the URL of v1 as the remote to v2
10:22 Keavon Then I ran git fetch
10:22 Vampire0 Keavon, a remote definition is a local thing and does not affect the remote repository in any way, if that is what confuses you
10:22 Vampire0 Keavon, exactly
10:22 Keavon Now I need to stitch?
10:22 Vampire0 Keavon, exactly
10:22 bitslip joined #git
10:22 Keavon I mean graft
10:23 Vampire0 Keavon, you stitch with a graft :-)
10:23 ash_workz joined #git
10:23 cyphase joined #git
10:24 fiasco grawity: the direction is correct, I need to show commits in the remote and not on local branch, let me try with ... what is the difference?
10:24 arch-nemesis joined #git
10:24 fiasco grawity: nothing changes
10:24 fiasco :(
10:24 kurkale6ka joined #git
10:25 finalbeta joined #git
10:25 fiasco grawity: ok maybe the git fetch command was wrong
10:26 Keavon Vampire0: I'm actually also a little fuzzy on what fetch does. I just looked through the history with `git log` and it seems to only date back to the start of v2, but not v1. I assume that's to be expected, but what exactly did adding the remote and fetching do?
10:27 Snugglebash joined #git
10:28 Vampire0 fiasco, log A..B shows the commits present in B but not in A. log A...B shows the commits present in A or B, but not in both. For more information about that see man gitrevisions
10:28 gitinfo fiasco: the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html
10:29 fiasco Vampire0: yes thanks I'm aware of that
10:29 fiasco the thing is that git fetch origin remotebranch, somewhat failed
10:29 Vampire0 fiasco, well, you asked for the difference
10:29 fiasco git fetch , then leads to the correct git log HEAD..origin/remotebranch
10:29 fiasco Vampire0: I was asking with the three dots ...
10:30 Vampire0 fiasco, what git version and how many remotes do you have?
10:30 fiasco 1.7.10.4 and one remote
10:30 Vampire0 fiasco, yes, and I described the difference between two and three dots, I don't know what your problem is :-/
10:30 Vampire0 fiasco, !fetch4
10:30 gitinfo fiasco: [!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).
10:30 Vampire0 fiasco, actually you should update your Git, it is 9 years hold or so :-D
10:31 Vampire0 Keavon, adding the remote added a name that is pointing to an URL
10:31 fiasco wow, let see if jessie has an update :(
10:31 fiasco Vampire0: ok thanks very much for clearing that fetch+merge thing
10:31 Vampire0 Keavon, fetching downloads the history from that remote and stores them into remote tracking branches in the local repository
10:31 Keavon Vampire0: When I did `git fetch`, did I need to specify the remote?
10:32 Vampire0 Keavon, yes, as I showed before
10:32 Vampire0 Keavon, otherwiese I thingk origin is fetched by default
10:32 Keavon I think I missed that step.
10:32 Keavon Is it just `git fetch v1`?
10:32 slidercrank joined #git
10:32 Vampire0 Keavon, you can also do `git fetch --all` to fetch all remotes at once
10:32 Vampire0 Keavon, bbut yes, git fetch v1 if v1 is your remote name
10:33 fiasco oh cool I can upgrade
10:33 Keavon Wouldn't that involve fetching two different repos though? origin points to the identical copy of v2, v1 points to the copy of v1
10:33 Vampire0 Keavon, yes, `git fetch --all` would fetch from "origin" and from "v1". Hence the name of "--all"
10:34 pbandark joined #git
10:34 Vampire0 Keavon, they are fetched to different namespaces so no problem
10:34 Vampire0 Keavon, after you fetched do `git branch -a
10:34 Vampire0 `
10:34 thebope joined #git
10:35 notebox joined #git
10:35 Keavon Oh, I see. So basically each remote clones to a different branch?
10:37 Levex joined #git
10:38 karols146 joined #git
10:38 PEMapModder_ joined #git
10:39 osse Keavon: !remote_tr
10:39 gitinfo Keavon: [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch>
10:39 Keavon So now to do the graft, do I actually create a file in .git/info called grafts, containing the SHA hash of the oldest v2 commit and the newest v1 parent commit?
10:41 bitmod joined #git
10:43 BSaboia joined #git
10:43 oskarkv joined #git
10:45 Hunter1 joined #git
10:46 Keavon Cool, that seems to have worked!
10:47 Keavon Now I understand what you mean by saying "make it permanent", since the simple presence of that file causes the graft to happen, rather than being a command that changes history.
10:47 _ikke_ correct
10:47 _ikke_ and this file is not distributed
10:48 netj joined #git
10:48 kexmex joined #git
10:50 cdleonard joined #git
10:52 Keavon Vampire0: I ran the command to make it permanent, removed the graft file and the v1 remote, and it looks like it's all good!
10:52 Keavon Thanks so much for your help! And for teaching me some more of the concepts behind git!
10:53 ppang joined #git
10:53 D630 joined #git
10:53 Keavon Oh, one last question: Do repos have names?
10:55 Keavon Since this re-historied "project_v2" is now what I want to force push to "project", can I just rename the parent folder? Is there a name stored anywhere else?
10:55 stepho joined #git
10:56 karols146 joined #git
10:57 tobiasvl Keavon: no
10:58 Keavon So just rename the parent folder?
11:03 _ikke_ Keavon: correct
11:03 Vampire0 Keavon, yes, you can rename or reposition the root folder of a git repository without any problems as long as not any other repository has it defines as remote repository
11:05 cstratak joined #git
11:08 Hunter1 joined #git
11:09 TheFuzzball joined #git
11:11 sbasso joined #git
11:14 sz0 joined #git
11:14 Cabanossi joined #git
11:16 Levex joined #git
11:17 Snugglebash joined #git
11:17 mindfart joined #git
11:19 D630 joined #git
11:19 nowhere_man joined #git
11:21 bongjovi joined #git
11:22 karols146 joined #git
11:23 zefferno joined #git
11:25 jimmyrcom_ joined #git
11:28 thebope joined #git
11:31 VladGh joined #git
11:34 astrofog joined #git
11:35 LTRand joined #git
11:35 kurkale61 joined #git
11:37 Levex joined #git
11:39 livingstn joined #git
11:40 iveqy joined #git
11:43 wakd joined #git
11:45 maxime_ joined #git
11:46 abra0 joined #git
11:47 Snugglebash joined #git
11:47 maxime_ joined #git
11:48 hseg joined #git
11:50 scottjl joined #git
11:50 astrofog joined #git
11:52 jimmyrcom_ joined #git
11:55 hseg Hi. I have a directory in which there are several git repos (some nested in subdirectories). How do I find all *globally* untracked files, i.e. all files that aren't tracked by any repo? Moreover, how do I find all files which have changes w.r.t. upstream?
11:56 tourdownunder joined #git
11:57 _ikke_ hseg: Only through a script that traverses all repositories
11:58 hseg OK. What would I have to do to find the local information, i.e. in each git repo?
11:59 _ikke_ man git ls-files can help you list the files
11:59 gitinfo the git-ls-files manpage is available at https://gitirc.eu/git-ls-files.html
11:59 _ikke_ it has options to select what types of files it returns
11:59 Levex joined #git
11:59 _ikke_ for changes regarding upstream you might need to do git diff --name-status
11:59 tobiasvl for the first one: for dir in $DIRECTORIES; do git -C $dir ls-files --others --exclude-standard; done
12:00 tobiasvl should do it
12:00 hseg OK. And finding files that differ from upstream?
12:00 _ikke_ define upstream
12:00 tobiasvl in general, git -C is probably what you want to do to "find the local information for each git repo"
12:01 hseg upstream: the remote called 'origin'.
12:01 hseg So I want to find differences between foo and origin/foo
12:01 hseg for all branches foo.
12:01 tobiasvl hseg: files that differ from the remote-tracking branch or the actual remote
12:01 SkyPatrol joined #git
12:01 tobiasvl ok, so the remote-tracking branch
12:01 grawity git for-each-ref
12:03 sbasso joined #git
12:03 hseg grawity: ?
12:04 hseg re: git -C, what I usually do in such cases is find -name .git -execdir
12:04 hseg Which extends nicely to listing all files that are not in a git repo.
12:05 synthroid joined #git
12:06 drbojingle joined #git
12:06 D4R5C0D3 joined #git
12:06 Johnson1977__ joined #git
12:08 kurkale6ka joined #git
12:10 Gloomy joined #git
12:11 kurkale61 joined #git
12:12 Gurkenglas joined #git
12:16 ti2 I have patches that are generated with 'git format-patch' which do apply with 'patch' (and fuzz 2), but 'git-am' fails.  Is there a way to enable fuzz for git-am?
12:17 dglambert joined #git
12:17 dglambert yo
12:18 hseg Looking at the output of ls-files, I see it only prints absolute paths w.r.t. the repo.
12:18 hseg How do I get actual absolute paths?
12:19 ogny joined #git
12:20 mizu_no_oto joined #git
12:20 osse there doesn't seem to be a way
12:20 tobiasvl that's something for your shell, git doesn't know the filesystem location of its files (I think)
12:20 basiclaser joined #git
12:21 tobiasvl but if you put the git repo's root directory in git -C you already have it, right?
12:22 ppang_ joined #git
12:22 koichirose joined #git
12:22 osse g ls-files | awk -vpwd="$PWD/" '{ print pwd $0}'
12:22 hseg Yeah.
12:22 thebope joined #git
12:23 hseg OK, thanks
12:23 ppang_ joined #git
12:24 bongjovi joined #git
12:24 smokeo joined #git
12:25 koichirose Hello! I inherited a big repository containing some large images that I'd like to delete. I already ignored them and used filter-branch but the .git folder is still 1.1GB. Can I do something about it?
12:26 _ikke_ just ignoring them is not doing anything
12:26 _ikke_ did you remove them with filter branch?
12:27 koichirose _ikke_: yes
12:27 koichirose with this: git filter-branch --tree-filter 'rm -rf images/original' --prune-empty HEAD
12:27 tobiasvl then the images aren't contributing to the 1.1GB and are irrelevant
12:28 dviola joined #git
12:28 str joined #git
12:28 tobiasvl koichirose: did you run git gc?
12:28 koichirose tobiasvl: yes. I basically followed this first answer here http://stackoverflow.com/questions/10067848/remove-folder-and-its-contents-from-git-githubs-history
12:29 caper joined #git
12:29 koichirose running du-sh ./* shows that the image folder is 842MB. Everything else is relatively small
12:29 koichirose and the history is not that long
12:29 karols146 joined #git
12:29 tobiasvl well you only removed images/original
12:30 tobiasvl so images still contains some large files, right?
12:30 tobiasvl what do you want to do with them?
12:30 cqi joined #git
12:31 koichirose images are stored elsewhere now. original only contained original images "as a backup"
12:31 stepho joined #git
12:31 koichirose so images/ now contains 3MB of icons/misc images
12:32 tobiasvl so images/ contains 3MB and also 842MB?
12:32 NeXTSUN joined #git
12:33 koichirose tobiasvl: yes. images/misc = 3.1MB - and these are in git
12:33 Johnson1977__ joined #git
12:33 koichirose images/original = 842MB - should not be in git
12:33 Tobbi joined #git
12:33 koichirose nothing else is  there
12:34 tobiasvl so you're saying images/original i still tracked?
12:35 koichirose it's not tracked as they are now ignored. I can add more images in there and they won't be added to git. but I'm not sure it removed them from the history
12:35 koichirose also if I browse the latest commit on bitbucket (that's what we're using) the 'original' folder is not there
12:36 tobiasvl just `rm -rf images/original` then to remove them from disk
12:36 tobiasvl of course then they'll be gone
12:37 tobiasvl or mv them out of the git dir
12:37 kbeflo joined #git
12:37 hseg_ joined #git
12:37 iveqy joined #git
12:38 koichirose but I only want to remove it from git. or at least I want to find out if it has actually removed it and maybe I'm missing something
12:39 tobiasvl but isn't it removed from git?
12:39 tobiasvl I don't understand
12:40 tobiasvl you ran `du -sh` but that reports disk usage. the images obviously still take up space on disk
12:40 koichirose it's not removed from git. .git/objects is still 1.1GB
12:40 tobiasvl OK, relevant information
12:40 koichirose yes, I ran du -sh on the .git folder
12:40 tobiasvl aaaah
12:41 NeXTSUN joined #git
12:41 koichirose I still want to keep images/original on the filesystem for now, I simply want to ignore it (done) and remove them from git to reduce the repository size (done/not sure it worked :D)
12:42 _ikke_ git log --all images/original --name-only
12:43 _ikke_ koichirose: Did you also remove the backup refs?
12:43 dsdeiz joined #git
12:43 dsdeiz joined #git
12:43 _ikke_ koichirose: filter-branch backs up the old refs in case you want to revert it again
12:43 koichirose _ikke_: if you mean this then yes: git for-each-ref --format="%(refname)" refs/original/ | xargs -n 1 git update-ref -d
12:44 _ikke_ right
12:44 koichirose running that git log command shows some commits containing the images
12:44 Stumbler joined #git
12:44 _ikke_ you can also do: git for-each-ref --format="delete %(refname)" refs/original/ | git update-ref --stdin
12:45 _ikke_ koichirose: so some commits still contain it
12:45 koichirose yes, very old ones from 2015
12:45 koichirose latest: may 2015
12:45 _ikke_ koichirose: you did not specify -- --all to filter-branch, that means it only filters the current branhc
12:46 _ikke_ branch
12:46 koichirose but I'm pretty sure some more were added after May 2015
12:46 koichirose oh.
12:47 koichirose is it -- --all?
12:47 _ikke_ yes
12:47 _ikke_ everything after -- is passed on to rev-list, which filter-branch uses to generate the list of commits
12:48 jt joined #git
12:48 koichirose git filter-branch -f --tree-filter 'rm -rf images/original' --prune-empty HEAD -- --all -> Found nothing to rewrite
12:48 Gloomy joined #git
12:49 mizu_no_oto joined #git
12:49 peacememories joined #git
12:52 jeffreylevesque joined #git
12:56 Johnson1977___ joined #git
12:56 tourdownunder joined #git
12:57 TheFuzzball joined #git
12:57 fission6 joined #git
12:59 livingstn joined #git
13:00 kurkale6ka joined #git
13:01 livingstn joined #git
13:03 livingstn joined #git
13:04 axisys joined #git
13:05 beerdrop joined #git
13:07 kurkale61 joined #git
13:08 _Patrick_ joined #git
13:10 a3Dman joined #git
13:13 gugah joined #git
13:14 dust_ joined #git
13:14 lss8 joined #git
13:14 guardianx joined #git
13:16 peacememories joined #git
13:16 thebope joined #git
13:18 lordjancso joined #git
13:18 cdg joined #git
13:18 LionsMane joined #git
13:19 Abhijit joined #git
13:19 Abhijit i added /.projectile to .gitignore and it stll shows it under Untracked ffiles in gt status?
13:19 Abhijit is that expected?
13:20 Vampire0 koichirose, when deleting files with filter-branch you should use an index-filter, not a tree-filter. It is much faster as you don't need to have a worktree while rewriting the commits, but can operate solely on the index. Your command would look something like `git filter-branch -f --index-filter 'git rm --cached --ignore-unmatch images/original' --prune-empty -- --all`
13:21 tobiasvl Abhijit: no. is the file located in the root of the git repo?
13:21 _ikke_ Abhijit: assuming .projectile lives in the same directory as the .gitignore, no
13:21 Vampire0 koichirose, but i guess it will lead to the same result. Do you maybe have a typo in "images/original", or is it not the path from the root of the repo but from your current worktree?
13:21 Vampire0 Abhijit, !repro
13:21 gitinfo Abhijit: [!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
13:21 Abhijit MyFolder/.git, MyFolder/.gitignore and MyFolder/web_app/.projectile Vampire0 _ikke_ tobiasvl
13:22 Abhijit fixed.
13:22 _ikke_ Abhijit: right, /.projectile only ignores that file in MyFolder
13:23 Abhijit yes.
13:23 shinnya joined #git
13:23 guardianx joined #git
13:23 tobiasvl Abhijit: yes, you don't want to ignore /.projectile then. you might want either .projectile (to ignore all .projectile files anywhere) or /web_app/.projectile (to just ignore that one specifically)
13:24 _ikke_ or /.projectile in web_app/.gitignore
13:24 tobiasvl or that
13:25 nurdie joined #git
13:25 Orphis joined #git
13:26 Peuc joined #git
13:27 h12o joined #git
13:28 sbulage joined #git
13:29 cam27 joined #git
13:30 relipse joined #git
13:31 robattila256 joined #git
13:32 bpna joined #git
13:34 synthroid joined #git
13:34 Es0teric joined #git
13:36 eindoofus joined #git
13:38 GT4066 joined #git
13:39 DDBag joined #git
13:39 lindenle joined #git
13:39 beaky joined #git
13:41 mizu_no_oto joined #git
13:42 Sythrik joined #git
13:42 guardianx left #git
13:45 kbeflo joined #git
13:45 tvw joined #git
13:48 NeXTSUN joined #git
13:51 theiostream joined #git
13:52 lss8_ joined #git
13:53 al-damiri joined #git
13:54 SaschaVoid joined #git
13:55 leeN joined #git
13:55 crose joined #git
13:56 Rodya_ joined #git
13:56 griffindy joined #git
13:57 fragMental joined #git
13:57 bannakaffalatta joined #git
14:00 visual_ joined #git
14:01 str joined #git
14:02 hashpuppy joined #git
14:02 AaronMT joined #git
14:02 strugee joined #git
14:03 jknetl joined #git
14:05 plos joined #git
14:06 lightstalker joined #git
14:07 askb joined #git
14:07 malmalmal joined #git
14:08 livingstn joined #git
14:11 thebope joined #git
14:11 LeBlaaanc joined #git
14:12 h12o joined #git
14:12 Starky joined #git
14:13 TbobbyZ joined #git
14:15 sgen joined #git
14:16 dxtr joined #git
14:17 User458764 joined #git
14:19 dxtr joined #git
14:21 mmlb joined #git
14:26 ski7777 joined #git
14:26 karols146 joined #git
14:29 TheCycoONE joined #git
14:29 bilal joined #git
14:29 tvw joined #git
14:30 Darren_ joined #git
14:31 IRQ` joined #git
14:31 jerematic joined #git
14:31 Gloomy joined #git
14:32 nurdie joined #git
14:34 User458764 joined #git
14:35 Darcidride joined #git
14:36 UTAN_dev joined #git
14:38 publio joined #git
14:38 h12o joined #git
14:39 tgragnato joined #git
14:39 ntnn joined #git
14:40 tvw joined #git
14:41 robotroll joined #git
14:42 kexmex joined #git
14:42 quackgyver joined #git
14:43 chitopunk joined #git
14:43 meLon joined #git
14:44 Cabanossi joined #git
14:45 notebox joined #git
14:45 Levex joined #git
14:46 IanLiu left #git
14:46 IanLiu joined #git
14:46 ntnn joined #git
14:47 peacememories joined #git
14:47 TbobbyZ joined #git
14:47 floppydh joined #git
14:48 floppydh joined #git
14:48 xall joined #git
14:49 karols141 joined #git
14:49 indistylo joined #git
14:49 floppydh joined #git
14:52 Snugglebash joined #git
14:53 floppydh joined #git
14:55 floppydh joined #git
14:56 Rodya_ joined #git
14:57 kbeflo joined #git
14:57 elsevero joined #git
14:58 Levex joined #git
14:59 overlord_tm joined #git
14:59 dreiss joined #git
15:00 sgen joined #git
15:00 ueberall joined #git
15:00 TheCycoTWO joined #git
15:01 kbeflo_ joined #git
15:03 Snugglebash joined #git
15:03 roelmonn_ joined #git
15:03 TheFuzzb_ joined #git
15:06 lindenle joined #git
15:07 a_thakur joined #git
15:07 UrsoBranco joined #git
15:07 thiago joined #git
15:09 Rodya_ joined #git
15:10 thebope joined #git
15:13 raspado joined #git
15:17 bilal_ joined #git
15:19 Razesdark joined #git
15:20 bilal__ joined #git
15:21 PioneerAxon joined #git
15:21 kegster joined #git
15:22 FilipNortic joined #git
15:22 piotr joined #git
15:23 theiostream joined #git
15:24 Aljone joined #git
15:25 Introoter joined #git
15:30 karols141 joined #git
15:31 rominronin joined #git
15:31 TheCycoONE joined #git
15:32 cebor joined #git
15:33 Snugglebash joined #git
15:34 kbeflo joined #git
15:34 Starky joined #git
15:35 jnewt joined #git
15:37 nurdie joined #git
15:37 iatkotep joined #git
15:38 TheCycoTWO joined #git
15:39 hobodave joined #git
15:41 gugah joined #git
15:41 gugah joined #git
15:42 gugah joined #git
15:42 peacememories joined #git
15:43 hobodave_ joined #git
15:44 a3Dman joined #git
15:47 str joined #git
15:48 ibeekman joined #git
15:49 synthroid joined #git
15:49 bilal joined #git
15:49 orbyt_ joined #git
15:50 strugee joined #git
15:51 h12o joined #git
15:53 ertes-w joined #git
15:53 ibeekman Hi I'm experiencing some behavior with git and I am trying to determine if it is caused by either my (or my system's) configuration, or a bug in git, or if it is correct behavior: I am using git 2.13.0 on MacOS 10.10.5 (Yosemite) with bash 3.0.15. The behavior I am observing is that if I run a git command on a file (either with ${CWD} inside the git repository or outside the git repository) and I specify the full path to that file, I
15:53 ibeekman get an error message of `fatal: /path/to/file: '/path/to/file' is outside repository`. Now, if I add the `--work-tree=${CWD}` option before the git subcommand, then it works as anticipated
15:55 chardan joined #git
15:55 Abhijit joined #git
15:55 ibeekman Is this the correct default behavior? I would have thought that wither using `-C /path/to/repo` or having `"${CWD} == /path/to/repo"` would have been sufficient for git to resolve the repo when using the full path. Could this be due to a case insensitivity issue of HFS filesystem? Or maybe some other issue? Or is this default behavior?
15:55 gugah_ joined #git
15:56 cstratak joined #git
15:56 sbasso_ joined #git
15:57 cstratak joined #git
15:57 bilal joined #git
15:57 dreiss joined #git
15:58 Puomp joined #git
15:58 durham joined #git
15:59 brent__ joined #git
16:00 brent__ joined #git
16:01 TbobbyZ_ joined #git
16:01 nitric joined #git
16:02 bilal joined #git
16:05 ibeekman Anyone have any thoughts?
16:06 mel00010 joined #git
16:06 Tobbi joined #git
16:08 flavius joined #git
16:08 rkazak joined #git
16:09 watabou joined #git
16:10 TbobbyZ joined #git
16:10 relipse joined #git
16:10 peacememories joined #git
16:10 perlpilot ibeekman: sorry, no.
16:10 wandering_vagran joined #git
16:11 perlpilot ibeekman: (other than,  "that's strange"  :-)
16:11 linuxmodder joined #git
16:11 Es0teric joined #git
16:12 Levex joined #git
16:16 thebope joined #git
16:16 tgragnato joined #git
16:16 tonyj joined #git
16:17 peacememories joined #git
16:18 peterbecich joined #git
16:20 Gloomy joined #git
16:21 peterbecich joined #git
16:22 freddy_ joined #git
16:23 Starky joined #git
16:24 Es0teric joined #git
16:24 chrisM_1 joined #git
16:29 madewokherd joined #git
16:29 cdleonard left #git
16:29 cdleonard joined #git
16:29 cdleonard left #git
16:29 Darren_ joined #git
16:30 freddy_ joined #git
16:31 rominronin joined #git
16:32 bilal joined #git
16:32 Smigwell joined #git
16:32 eindoofus joined #git
16:34 Es0teric joined #git
16:35 Smigwell left #git
16:36 Gustavo6046 joined #git
16:36 roelmonnens joined #git
16:37 Introoter joined #git
16:37 rkazak joined #git
16:38 Masber joined #git
16:38 Starky joined #git
16:39 hashtagstrashtag joined #git
16:40 lucifer333 joined #git
16:40 mikecmpbll joined #git
16:41 visual_ left #git
16:41 ZyX-I joined #git
16:41 lucifer333 joined #git
16:42 visual joined #git
16:42 chitopunk joined #git
16:43 LTRand joined #git
16:43 oleksiyp joined #git
16:44 ilyaigpetrov joined #git
16:44 Cabanossi joined #git
16:45 ilyaigpetrov Hi. After doing git rebase how am I supposed to push to server? with --force?
16:45 canton7 yes, but beware of!rewriting_public_hsitory
16:46 canton7 yes, but beware of !rewriting_public_hsitory
16:46 canton7 yes, but beware of !rewriting_public_history
16:46 gitinfo [!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
16:46 * canton7 fails badly
16:46 LTRand joined #git
16:46 fission6 joined #git
16:46 PioneerAxon joined #git
16:47 ilyaigpetrov thanks
16:47 freddy_ joined #git
16:48 freimatz joined #git
16:50 djb-irc joined #git
16:51 jt joined #git
16:51 jt__ joined #git
16:51 freddy__ joined #git
16:51 h0777777 joined #git
16:52 orbyt_ joined #git
16:54 karols141 joined #git
16:54 armyriad joined #git
16:54 blackwind_123 joined #git
16:55 livingstn joined #git
16:56 Peuc joined #git
16:56 roelmonnens joined #git
16:56 YouCallItFar is there anything like git annex that works with git releases?
16:57 TomyLobo joined #git
16:57 madewokherd` joined #git
16:57 YouCallItFar i basically want to store a link to a gitrelease in a git repository like how git annex does with external files
16:57 cdleonard joined #git
16:57 YouCallItFar and then run something that will resolve them all
16:57 eindoofus joined #git
16:59 ibeekman perlpilot: Thanks for at least responding... I found a fix eventually. I have been using Homebrew for a very long time and they have moved around files (and use git internally for versioning) and also have been through many upgrades of git since I first cloned. I ended up leaving all the installed packages and sym-linkes in place and just blowing away and re-cloning the main homebrew repo
16:59 YouCallItFar !annex
16:59 gitinfo git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs
16:59 dave0x6d joined #git
17:00 YouCallItFar meh i think none of these do what i want
17:00 YouCallItFar this is a good opensource project
17:01 YouCallItFar we can just fork git annex and modify it to be git release-annex
17:01 ibeekman I suspect a path issue thanks to Homebrew updates or  parhaps a format/convention issue across versions of git, but I really have no idea why.
17:01 Atm0spher1c joined #git
17:01 endor joined #git
17:02 ibeekman anyway thanks
17:02 ibeekman left #git
17:02 learning joined #git
17:04 Davey joined #git
17:04 Davey joined #git
17:05 ilyaigpetrov It seems I have broken .git/refs/remotes/origin/HEAD. If I clone repo and the `git branch -a` -- it shows two development branches: one green (local) and one red (remote)
17:05 ilyaigpetrov and then
17:06 ilyaigpetrov may I fix it by editing remotes/origin/HEAD ?
17:06 gunnaro joined #git
17:07 TheCycoONE joined #git
17:07 ilyaigpetrov oh, it's ok to have two branches, it's not broken I guess
17:08 niggler joined #git
17:09 niggler hello! what git mantra pushes all branches and tags? git push by default pushes branches but not tags, and git push --tags is pushing tags but not pushing changes to other branches
17:13 star_prone joined #git
17:13 Starky joined #git
17:13 lucifer333 niggler?
17:13 lucifer333 what kind of name is that?
17:13 Dougie187 joined #git
17:13 lucifer333 op?
17:14 visual kek
17:14 SteffanW joined #git
17:14 nurdie joined #git
17:14 * visual raps @ niggler
17:14 boombatower joined #git
17:14 svm_invictvs joined #git
17:14 lilyofthevalley joined #git
17:15 visual niggler: yo check me out homie
17:15 visual niggler: yayo yayo, weed & chains & booty
17:16 niggler gotta tie CVS and SVN into your lyrics visual
17:16 visual niggler: we smokin 24/7, we dont need no tooty fruity
17:16 thebope joined #git
17:16 visual niggler: git branch, git commit git pushy
17:16 mkoskar joined #git
17:17 niggler so git push isn't pushing tags by default, and git push --tags for some strange reason isn't pushing other branches
17:18 visual it's the white men keepin us down homie
17:18 visual those crackaz invented git to keep the black man down
17:18 visual http://i36.photobucket.com/albums/e31/Bordak/computers.jpg
17:20 nowhere_man joined #git
17:20 lucifer333 ok what did stormfront walk into this channel, is op sleeping or what?
17:20 rorro joined #git
17:20 visual kek, im fucking around man, this guy has "niggler" for a nickname, which is pretty funny
17:21 sbasso joined #git
17:21 lucifer333 next an antisemtic name will be funny
17:21 lucifer333 riight
17:21 visual what?
17:21 lucifer333 OOOP
17:21 jnewt joined #git
17:21 niggler lucifer333 you have access to a dictionary
17:22 TbobbyZ_ joined #git
17:22 lucifer333 op has been notified this si going to be an ip ban , enjoy while it last
17:23 visual lucifer333: are you for real? :D
17:23 visual >tfw cant tell if joking or retarded
17:23 lucifer333 live it up
17:24 Celelibi Is there a hook that would run when pushing commits but before it asks for a password?
17:24 hobodave joined #git
17:24 King_Hual joined #git
17:24 Celelibi So that I don't have to type it if the commits won't get pushed anyway.
17:25 TbobbyZ_ joined #git
17:25 visual why would the commits not get pushed?
17:25 theiostream joined #git
17:25 visual and assuming that it's the remote that could give you any trouble, how would you reach it without entering the password? :U
17:26 freddy_ joined #git
17:29 tyreld joined #git
17:29 nurdie joined #git
17:29 nowhere_man joined #git
17:30 thiago joined #git
17:33 karols146 joined #git
17:33 Celelibi visual: I tagged some commits as "nopush" and have a hook script that deny the push if the commit is tagged.
17:34 Celelibi So that I can't push them by mistake.
17:34 Celelibi They contain some configuration.
17:34 visual i hear you, no idea man
17:34 chitopunk joined #git
17:34 Celelibi I code on top of that commit, and when it's ok, I rebase.
17:37 zofrex joined #git
17:37 sbasso_ joined #git
17:37 roelmonnens joined #git
17:37 zofrex is there any solution to the problem that zeroPaddedFilemode=ignore has no effect when fetching?
17:41 nixjdm joined #git
17:41 niggler Celelibi why not gitignore the config files
17:43 Celelibi niggler: because there's a template config file with the same name that is versionned.
17:44 orbyt_ joined #git
17:44 lucifer333 joined #git
17:44 Cabanossi joined #git
17:45 MineCoins joined #git
17:45 TbobbyZ joined #git
17:45 roelmonnens joined #git
17:50 Rodya_ joined #git
17:54 QubeX2 joined #git
17:54 LocusAsaf joined #git
17:55 elsevero joined #git
17:56 TbobbyZ joined #git
17:56 LocusAsaf If I do git clone for a specific commit and execute `git branch` the only thing I see the detached commit & master.  What do I need to execute to see other branches when I execute `git branch` ?
17:57 raynold joined #git
17:58 jstein_ joined #git
17:58 relipse joined #git
17:59 chitopunk joined #git
17:59 s2013 joined #git
17:59 Es0teric joined #git
18:01 Eugene LocusAsaf - `git branch -vva` is a good place to start.
18:01 prokbird joined #git
18:02 Sasazuka joined #git
18:02 Eugene If you don't actually have the branches downloaded you'll need to edit a config setting. Something like: git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
18:02 rominronin joined #git
18:03 LocusAsaf Eugene, I might be asking an XY problem
18:03 Eugene Quite possible ;-)
18:03 LocusAsaf I'm trying to automate something after a git clone
18:03 pks_ joined #git
18:03 LocusAsaf for a CI job
18:03 Eugene Aha. Don't do that.
18:03 Eugene !deploy
18:03 gitinfo 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
18:03 SaschaVoid joined #git
18:03 QubeX2 joined #git
18:03 Eugene man git-archive is a good place to start; that will give you a tarball(even from a remote repo)
18:03 gitinfo the git-archive manpage is available at https://gitirc.eu/git-archive.html
18:04 Eugene Fold, spindle, and mutilate that as required in your CI job
18:04 LocusAsaf Eugene, we use gitlab and it does git clone commithash as part of the build I don't have control of that
18:04 Eugene AFAIK clone doesn't accept a commithash o.O
18:04 Eugene It does accept a branch, and from there you can force-checkout a particular commit
18:04 duderonomy joined #git
18:04 misosoup joined #git
18:05 Gustavo6046 joined #git
18:05 LocusAsaf well Im not sure exactly what it does, it might just do a clone and then checkout
18:05 Eugene Probably
18:05 kadoban I thought it does accept a commithash, but only if it's reachable from a ref that the remote has. I could be wrong though.
18:05 QubeX2 joined #git
18:05 LocusAsaf with that aside let me try and ask more directly what Im doing
18:06 LocusAsaf so part of our process is that we use specific branch names to represent qa & staging (lets say the branch names are respective)
18:06 fknwomb68 joined #git
18:07 armyriad joined #git
18:07 LocusAsaf when I'm trying to do is write a script that determines if the given branch if branched directly down the line from qa or staging
18:08 pks_ joined #git
18:08 ryoshu left #git
18:08 LocusAsaf I'm using git merge-base to find the first commit the feature branch and the qa/staging share
18:08 ertes joined #git
18:09 Eugene Sounds sane so far
18:09 LocusAsaf then I do a git rev-list HEAD and walk up until I see a commit that matches the merge-base ones
18:10 LocusAsaf the issue I'm finding is that merge-list doesn't seem to work properly unless it "knows" about the branch
18:10 fknwombat joined #git
18:10 Eugene Do you ahve the branch name available in your script?
18:10 LocusAsaf so i wanted to script the build job to "know" about the branches
18:10 LocusAsaf yes I do
18:11 Tobbi joined #git
18:11 Chillance joined #git
18:11 Eugene `git fetch <url> refs/heads/<branch>`
18:11 Eugene This will give it to you as FETCH_HEAD
18:11 LocusAsaf can url be origin?
18:11 atrigent joined #git
18:11 Eugene Sure, if origin is defined
18:12 LocusAsaf okay lemme try that
18:12 Eugene I assume very little in scripts
18:13 LocusAsaf origin is defined, I don't know specifically how it all works but every repo in gitlab has a built in gitlab-ci-token user and it clones with some special token for that user
18:13 orbyt_ joined #git
18:14 Cabanossi joined #git
18:15 mikecmpbll joined #git
18:16 User458764 joined #git
18:16 LocusAsaf Eugene, that git fetch command didn't solve the problem, git merge-base still complains "fatal: Not a valid object name <branch>"
18:16 YuGiOhJCJ joined #git
18:16 LocusAsaf the only thing I know for sure works to fix the problem so far is "git checkout <branch>"
18:16 Eugene Try `git fetch <url> refs/heads/<branch>:refs/heads/<branch>`
18:16 LocusAsaf trying now...
18:16 Radzio joined #git
18:17 thebope joined #git
18:17 Eugene This is a terrible magic incantation
18:18 LocusAsaf haha it worked
18:18 brent__ joined #git
18:18 * LocusAsaf hands wand back to Eugene
18:18 brent__ joined #git
18:20 h12o joined #git
18:20 livingst_ joined #git
18:21 tgragnato joined #git
18:25 malmalmal joined #git
18:26 prokbird joined #git
18:27 sunri5e joined #git
18:28 grayjoc joined #git
18:28 cam27 joined #git
18:28 zueore joined #git
18:29 grayjoc joined #git
18:29 rkazak joined #git
18:30 grayjoc joined #git
18:31 grayjoc joined #git
18:33 robattila256 joined #git
18:34 NeXTSUN joined #git
18:34 manuelschneid3r joined #git
18:36 qqx joined #git
18:39 xall joined #git
18:39 aerlindir hi ! I cannot open xcproj after pulling changes, there is no conflict. What could it be?
18:43 TbobbyZ_ joined #git
18:43 Vampire0 aerlindir, probably someone checked in a broken file?
18:44 Vampire0 aerlindir, `git diff @{1} @ -- xcproj
18:44 pks_ joined #git
18:46 satifant joined #git
18:49 foodSurprise joined #git
18:50 aerlindir Vampire0, it gives nothing.
18:51 raijin joined #git
18:52 kpease joined #git
18:53 learning joined #git
18:53 TbobbyZ joined #git
18:53 raatiniemi joined #git
18:55 vmonteco_ left #git
18:55 nixjdm joined #git
18:55 notebox joined #git
18:57 Acerific joined #git
18:57 rkazak joined #git
19:00 durham_ joined #git
19:03 Stumbler joined #git
19:03 prokbird joined #git
19:03 mizu_no_oto joined #git
19:04 User458764 joined #git
19:04 Vampire0 aerlindir, then nothing change, or you did more since pulling.
19:04 Vampire0 aerlindir, do "git log -- xcproj" then you should only get log entries that changed that file
19:06 jackrandom joined #git
19:07 aswen joined #git
19:08 thiago why can't you open the file? Is it missing?
19:11 JanC joined #git
19:13 strk joined #git
19:13 strk how are remote tags deleted ?
19:14 LordRyan `git push origin :<tagname>`
19:14 LordRyan the `:` is the important bit
19:15 kadoban strk: They usually shouldn't be, by the way.
19:15 NeXTSUN joined #git
19:16 nurdie joined #git
19:16 QubeX2 joined #git
19:16 thiago strk: everyone who already has that tag will keep it
19:16 xall joined #git
19:17 diego4 joined #git
19:18 strk yeah, well, my mirroring script made a mistake
19:19 aerlindir thank everyone, it is opened magically
19:19 jccn joined #git
19:19 aerlindir thanks guys!
19:20 aerlindir may the Force be with you!
19:20 diego4 joined #git
19:23 matsaman joined #git
19:30 durham joined #git
19:30 borkr joined #git
19:31 pks_ joined #git
19:31 chitopunk joined #git
19:32 re1 joined #git
19:33 preaction and also with you
19:34 rominronin joined #git
19:34 h12o joined #git
19:34 elect joined #git
19:35 Es0teric joined #git
19:37 durham joined #git
19:37 bernd27 joined #git
19:41 SaschaVoid joined #git
19:41 robattila256 joined #git
19:42 orbyt_ joined #git
19:45 SaschaVoid joined #git
19:45 chitopunk joined #git
19:47 fuzzykef joined #git
19:48 fuzzykef left #git
19:49 peterbecich joined #git
19:51 aak joined #git
19:51 SaschaVoid joined #git
19:51 finalbeta joined #git
19:52 prokbird joined #git
19:53 cgundersson joined #git
19:53 peterbecich joined #git
19:55 str joined #git
19:56 Tobbi joined #git
19:56 orbyt_ joined #git
19:56 nixjdm joined #git
19:57 _ADN_ joined #git
19:58 NotreDev joined #git
19:59 NotreDev i’ve got a github branch `patch-1` that i’d like to checkout locally. `git checkout origin/patch-1` checks it out in a detachted state (apparently not what I want). how can I check it out so I can push changes back?
20:01 TheCycoTWO joined #git
20:03 Es0teric joined #git
20:04 hitesh joined #git
20:07 cdg joined #git
20:07 a3Dman joined #git
20:08 jesst joined #git
20:09 lafleurdubien This may be a dumb question, but can somebody please explain to me why its best to export an existing repository into a new bare repository on a git server?
20:11 lafleurdubien Instead of using the existing repository?
20:12 gabrielschulhof joined #git
20:12 strk left #git
20:13 _ikke_ !bare
20:13 gitinfo A bare repository is used to push/fetch (useful for running a git server), and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/
20:13 gabrielschulhof Hi! How can I see what files a commit has added or removed? Basically, I would like the output I would see if I were to move to one commit ahead of the one for which I want info, and I were to git reset HEAD~1.
20:14 matsaman ...is there a way to make git STFU about slow file enumeration? (status -uno, etc.)? The last thing I want after something _apparently_ taking longer than ideal is a fsckin' lecture
20:14 gabrielschulhof Or, rather to the commit I want to see.
20:14 Es0teric joined #git
20:14 Cabanossi joined #git
20:14 phinxy joined #git
20:15 disi Given branch A is based on branch B and branch C, is there a way to `git diff A B` while subtracting anything in C?
20:15 matsaman gabrielschulhof: maybe tack '--stat' onto the end
20:15 gabrielschulhof So, like, the output of git checkout <commitid> && git reset HEAD~1 but without actually doing any damage.
20:15 orbyt_ joined #git
20:15 matsaman git log --stat is handy for recent commits
20:15 _ikke_ git show --name-only
20:15 matsaman you can use it with specific sum diffs, too, in another way, IIRC
20:16 itseris joined #git
20:16 gabrielschulhof _ikke_: But that doesn't give me M <filename> D <filename> A <filename>
20:16 kpease joined #git
20:17 _ikke_ gabrielschulhof: --name-status
20:17 thebope joined #git
20:17 lafleurdubien _ikke_: Thank you!!!
20:17 ozcanesen joined #git
20:18 dege joined #git
20:19 gabrielschulhof _ikke_: Awesome! Thanks!
20:22 thiago joined #git
20:22 star_prone joined #git
20:24 m0viefreak joined #git
20:26 kpease joined #git
20:27 theiostream joined #git
20:28 jnavila joined #git
20:30 chitopunk joined #git
20:31 cebula joined #git
20:33 mizu_no_oto joined #git
20:34 viccuad joined #git
20:35 eindoofus joined #git
20:35 Puffball joined #git
20:36 viccuad oh, git gurus, is there a way to add something to the gitconfig so a specific branch name never gets pushed? thanks in advance
20:37 viccuad setting tracking on the current branch is not enough, as I want to push more than 1 branch
20:37 viccuad but just not one, specifically
20:38 thiago viccuad: no
20:38 qqx You could perhaps set branch.<name>.pushRemote to something invalid.
20:38 kadoban viccuad: Don't think that exists. You can search for push.default setting in man git config, but none of those really match at all.
20:38 gitinfo viccuad: the git-config manpage is available at https://gitirc.eu/git-config.html
20:39 _ikke_ qqx: was thinking about that, but if you do git push foo branch, it will still push it
20:39 kadoban Also it sounds like they want push.default to be something like 'matching', except that's not going to care about pushRemote, is it?
20:39 qqx It could definitely be blocked by a pre-push hook. But that's more complicated.
20:39 plicki joined #git
20:40 Puffball joined #git
20:40 viccuad that's actually not a bad idea
20:41 jesst joined #git
20:42 m0viefreak joined #git
20:43 viccuad what about setting the push remote to a period (the local repository)?
20:43 _ikke_ You can still push it by explictly specifying the remote
20:44 synthroid joined #git
20:44 viccuad true, as you said
20:44 Cabanossi joined #git
20:44 viccuad maybe that's enough for my usecase
20:45 Es0teric joined #git
20:45 viccuad but will it still push if you specify a remote for all, not for that branch? no, no? it gets overridden
20:45 peterbecich joined #git
20:46 kadoban viccuad: With push.default=matching are we talking about, or what command are you running?
20:46 viccuad kadoban: I'm talking about the `branch.<name>.pushRemote ` config option
20:46 kadoban viccuad: Right, but then what command are you running?
20:47 boze joined #git
20:47 viccuad kadoban: well.. I'd like to do a `push --all --follow-tags origin` and don't push 1 branch
20:47 viccuad and this happens for me in several different repositories
20:48 kadoban Hmm. I'm not actually sure how --all works exactly :-/ I wonder if that uses branch.<blah>.pushRemote or what
20:48 qqx Then no, I'm pretty sure there's no way to accomplish what you want.
20:48 MillerBoss joined #git
20:48 kadoban If you specify a remote I'd guess it doesn't.
20:48 boze I constantly do an interactive rebase to fixup my commits before pushing. Is there a way to fixup a bunch of commits? Like git --fixup HEAD^^^ or something?
20:48 kadoban Maybe if you don't it does, and then that idea would work? I really don't know.
20:49 qqx A pre-push hook could block the push, but it would prevent the entire push not just the one branch.
20:49 itseris joined #git
20:49 MillerBoss joined #git
20:50 jidar joined #git
20:50 qqx The docs for --all give a hit about how it works by saying "cannot be used with *other* refspecs" (emphasis mine).
20:51 qqx So it's just another way to write a refspec. And as such branch configuration won't have an effect on it.
20:51 viccuad "When the command line does not specify where to push with the <repository> argument, branch.*.remote configuration for the current branch is consulted to determine where to push""
20:51 kadoban viccuad: Which raises the question of what it means by "the current branch", to me anyway.
20:51 Johnson1977 How can i switch to a new remote branch
20:52 Johnson1977 I keep getting detached head problem
20:52 Johnson1977 I am on master branch locally
20:52 Johnson1977 but I want new branch this is remot
20:52 Johnson1977 remote
20:53 qqx Johnson1977: If you want to check out origin/example locally you should be able to use `git checkout example`.
20:53 thiago Johnson1977: create a local branch that matches that remote branch
20:53 qqx Assuming that there is no "example" branch either locally or on a different remote, git will automatically create a local branch with that name tracking the remote one.
20:54 rebrec joined #git
20:54 lagothrix joined #git
20:54 kadoban boze: The closest that comes to mind is the --autosquash stuff from man git rebase
20:54 gitinfo boze: the git-rebase manpage is available at https://gitirc.eu/git-rebase.html
20:55 kadoban boze: That may save you some tedium if you use that. I haven't used it myself much though, so I'm not sure how convenient it'd be.
20:55 boze thanks
20:55 viccuad kadoban: I understand that it iterates on each branch, and for each branch sees if it has a remote set up
20:56 kadoban viccuad: It seems ambiguous to me, though it's probably easy enough to test what it does.
20:56 nixjdm joined #git
20:57 raspado joined #git
20:58 bronson joined #git
20:59 MrC joined #git
20:59 jidar joined #git
21:00 ertesx joined #git
21:00 yqt joined #git
21:00 rorro joined #git
21:03 vka joined #git
21:06 rominronin joined #git
21:06 caper joined #git
21:09 regedit joined #git
21:10 eldritch joined #git
21:10 caper joined #git
21:10 CheckDavid joined #git
21:11 thebope joined #git
21:12 anderson_ joined #git
21:14 Cabanossi joined #git
21:15 robattila256 joined #git
21:17 weltall2 joined #git
21:18 kexmex joined #git
21:20 indistylo joined #git
21:22 aidalgol joined #git
21:24 drbojingle joined #git
21:26 aakz joined #git
21:28 timlyo[m] joined #git
21:28 jascot[m] joined #git
21:29 hiq[m] joined #git
21:31 cdg joined #git
21:34 raijin joined #git
21:34 irisl joined #git
21:34 polyrob joined #git
21:36 h12o joined #git
21:37 jagob joined #git
21:37 tvw joined #git
21:38 Levex joined #git
21:38 tymczenko joined #git
21:38 Dougie187 Question: Is there an easy way to take a set of changes to a specific file, and break them into separate commits based on hunks within the file?
21:39 Dougie187 Like, hunks as in selectable chunks that you would see with `git add -i`
21:39 finalbeta joined #git
21:41 TheWild joined #git
21:41 TheWild hello
21:42 TheWild I did `git stash save -u "temporary"` and it does it and does... Does it follow .gitignore?
21:43 Vampire0 Dougie187, in what context? After reading the first line I was about to suggest `git add -p` which is the `patch` subcommand of `git add -i` as direct parameter
21:43 sondr3 joined #git
21:43 Dougie187 Vampire0: That's basically what I want, but I want an automated way to be like, "stage the first hunk of this file, commit it, and continue until there aren't any more hunks left"
21:44 hobodave joined #git
21:45 Vampire0 TheWild, yes, .gitignore is honored, let me quote man git stash:
21:45 gitinfo TheWild: the git-stash manpage is available at https://gitirc.eu/git-stash.html
21:45 Vampire0 TheWild, If the --include-untracked option is used, all untracked files are also stashed and then cleaned up with git clean, leaving the working directory in a very clean state. If the --all option is used instead then the ignored files are stashed and cleaned in addition to the untracked files.
21:45 Vampire0 Dougie187, ah, ok, maybe write a script?
21:45 Dougie187 Vampire0: Sure, but is there even a command that is equivalent to `git add -p / y / q` ?
21:46 Vampire0 Dougie187, I guess - but really just a guess, I didn't try it - that you can do something like `echo -e 'y\nq' | git add -p && git commit -m hunk` and then do it in a loop
21:47 Dougie187 Ok, I'll give it a shot.
21:47 TheWild oh, good. Thanks Vampire0. For whatever reason `git stash save` took a couple of minutes to finish just for few files. Right now I checked what was added to stash add see .gitignore was honored.
21:47 orbyt_ joined #git
21:47 blackwind_123 joined #git
21:48 TheWild when I break a long running operation, is there a chance that I corrupted the repository?
21:48 Dougie187 Vampire0: Thanks, I think that worked.
21:48 bernd9000 joined #git
21:49 jeffreylevesque joined #git
21:49 WaReZ joined #git
21:50 blahdodo joined #git
21:50 dsdeiz joined #git
21:50 dsdeiz joined #git
21:51 chitopunk joined #git
21:52 Vampire0 TheWild, you will have a very hard time breaking a Git repository except by manually mangling with the files in .git
21:53 mizu_no_oto joined #git
21:54 watabou joined #git
21:55 ixian joined #git
21:55 TheWild Vampire0: Thank you very much for all the info.
21:55 nixjdm joined #git
21:56 misosoup joined #git
21:58 Vampire0 TheWild, you're welcome
21:59 Cabanossi joined #git
22:04 niggler left #git
22:05 thebope joined #git
22:10 anuxivm joined #git
22:11 roelmonnens joined #git
22:12 kadoban joined #git
22:15 askb joined #git
22:19 Anja joined #git
22:22 rda-mac joined #git
22:27 str joined #git
22:30 NeXTSUN joined #git
22:34 timetrex joined #git
22:36 ecuanaso joined #git
22:37 rominronin joined #git
22:44 cagomez joined #git
22:48 raspado joined #git
22:51 Marumarsu joined #git
22:52 VladGh joined #git
22:55 kyan joined #git
22:55 theiostream joined #git
22:56 nixjdm joined #git
23:02 sbasso joined #git
23:02 aakz joined #git
23:06 vacho joined #git
23:07 vacho when I run git pull origin master, I am getting this error: error: unable to create temporary file: No space left on device
23:07 vacho but I have enough free disk-space, so not sure why it's complaining.
23:07 vacho https://paste.ofcode.org/Q78KZmGmsUYxYyr4NKuWJm
23:10 itseris joined #git
23:10 b0nn vacho: how big is the repo you're pulling down? If it's > 1.4 G... etc
23:10 tourdownunder joined #git
23:12 Silenced_v2 joined #git
23:12 LeBlaaanc joined #git
23:13 Eugene vacho - `df -i`
23:19 sbasso joined #git
23:20 vacho Eugene: /dev/xvda1     524288 524288      0  100% /
23:20 vacho that is actually fully used
23:20 Eugene Tada ;-)
23:20 vacho Eugene: what next?
23:20 vacho what is dev/xvda1?
23:20 Eugene Go delete some files, or get a bigger filesystem with more inodes
23:20 Eugene No idea. WHat is your hardware? a VPS presumably?
23:21 itseris joined #git
23:21 vacho Eugene: EC2 envinroment with AWS
23:21 Rotaerk joined #git
23:21 vacho Eugene: is it something I can clear up?
23:22 Eugene xvda is the first Xen desk; xvda1 would be a partition.
23:22 Eugene Sure, just clean out whatever is occupying the inodes. That is a complex question, though ;-)
23:22 Eugene The easiest thing to do would be to increase the size of your EBS volume(presumably), and then resize the partition / ext filesystem upwards to suit
23:23 vacho inodes?
23:23 Eugene They're a linux filesystem thing. Basically a reference to a file
23:24 vacho Eugene: https://paste.ofcode.org/34Uj5hihGyTFpetKFXnPTFT
23:24 Eugene You would actually be looking for lots of small files(occupy an inode, but not very many Bytes)
23:24 mellernoia joined #git
23:25 Eugene This is more of a sysadmin question than a git one, though
23:25 Peng Also, they may be deleted files
23:25 Eugene Here's a blog post that may or may not be useful https://www.ivankuznetsov.com/2010/02/no-space-left-on-device-running-out-of-inodes.html
23:25 Peng (sudo lsof +L1)
23:25 Eugene (of course, don't delete thigns that you don't know what they are - that will break your system)
23:26 Peng Adn then you'll learn what they are! It's educational. :P
23:26 duderono_ joined #git
23:28 stepho joined #git
23:28 vacho Eugene: ok thank you. will read that post
23:30 vacho I am sudo, but I don't have password
23:30 vacho how to I switch to sudo, so I can run for i in /*; do echo $i; find $i |wc -l; done
23:32 yitz Which bits of that loop do you need to be root to run?
23:32 itseris joined #git
23:33 shinnya joined #git
23:34 Bhootrk_ joined #git
23:36 Gloomy joined #git
23:38 cam27 joined #git
23:39 Levex joined #git
23:40 Noodlewitt joined #git
23:41 caper joined #git
23:42 Hello71 "switch to sudo"
23:42 Hello71 sigh
23:42 Bhootrk_ joined #git
23:42 vacho Hello71: yes I am getting permission denied, how to I authenticate so I can run the command as a sudo user?
23:43 Hello71 no
23:43 yitz Which bits of that loop do you need to be root to run?
23:44 vacho df -i
23:44 yitz I... but... there's no df in that
23:44 vacho I run that command, and it's telling me I am at 100% /dev/xvda1     524288 524288      0  100% /
23:44 Cabanossi joined #git
23:45 vacho yitz: I am following the guide that Eugene posted
23:45 madewokherd joined #git
23:45 yitz ... do you know what the commands you are running do?
23:45 vacho yitz: yes it's suppose to look for files of 0 bytes and list how many it found
23:46 vacho or large number of small files, not necc 0 bytes
23:46 yitz Supposed to, maybe. There's no such anything in that which checks file sizes
23:46 raijin joined #git
23:47 yitz du -s may be more helpful
23:47 vacho 165428.
23:47 vacho yitz: still getting a bunch of permission denied
23:48 yitz du -sx /* 2>/dev/null
23:48 bernd9000 joined #git
23:48 vacho yitz: https://paste.ofcode.org/8wc92psTcXh65vdPu3aeEi
23:49 vacho yitz: just running a small little web app on EC2 .. not sure how I ran out of disk space, it's only 30-50mb
23:49 vacho MySQL is RDS, so it's not local to consume space
23:49 vacho it's basically a simple LAMP server with a small web app
23:50 yitz Where is that device mounted?
23:50 yitz Oh. nvm
23:50 vacho yitz: I don't know
23:50 yitz lol
23:50 vacho ... /dev/xvda1     524288 524288      0  100% /
23:50 vacho this is the problem
23:51 vacho I am not able to pull in my code from Github, because it's out of disk spae
23:51 ecuanaso joined #git
23:51 yitz du -sx /{usr,var,lib}/* 2>/dev/null | sort -n
23:52 yitz Your disk doesn't have a ton of space
23:52 vacho yitz: https://paste.ofcode.org/AveaXMnVEpNe7tEzPg92rQ
23:53 Bhootrk_ joined #git
23:53 vacho yitz: clearly ;) :)
23:54 yitz Delete stuff you don't need and get more space
23:54 vacho yitz: nothing stood out from those results?
23:54 peterbecich joined #git
23:54 vacho that I can delete
23:54 yitz That shows you which directories are large
23:55 yitz You get to figure out yourself what's in them and what can go
23:55 vacho ok thx
23:56 vacho I have no idea what to delete
23:57 vacho 1048580/var/swap.1
23:57 vacho can I delete that file
23:57 bernd27 joined #git
23:59 roelmonnens joined #git

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