Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-10

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

All times shown according to UTC.

Time Nick Message
00:00 quetz joined #git
00:00 Mikaela left #git
00:01 oskarkv joined #git
00:02 shgysk8zer0 joined #git
00:03 Lipp joined #git
00:05 mizu_no_oto joined #git
00:06 moei joined #git
00:06 chadhinton joined #git
00:07 railssmi_ joined #git
00:09 chadhinton joined #git
00:10 anuxivm joined #git
00:11 m0viefreak joined #git
00:11 drochman joined #git
00:11 r4nd0m0ne1 joined #git
00:13 Derderderd joined #git
00:15 Joost joined #git
00:15 ghostlight joined #git
00:15 Lipp joined #git
00:15 texinwien_ joined #git
00:16 chadhinton joined #git
00:16 drochman Git noob question.  I forked a repo, cloned the fork, created a new branch, and switched to it.  Then I added & staged a file, and committed the change.  Everything seems alright, except that I'm seeing "1 changed file with 0 additions and 0 deletions".  I was expecting "0 changed files with 1 addition and 0 deletions".  Is that correct?
00:18 corn13read joined #git
00:21 venmx joined #git
00:23 preaction so you added a file with no content inside? that means you changed a file (1 changed file), and since it has no content, there are (0 additions) and since you deleted nothing (0 deletions)
00:23 HoierM joined #git
00:23 LaydMonica joined #git
00:24 thebope joined #git
00:28 mischat joined #git
00:30 umpc joined #git
00:30 Crell joined #git
00:31 nwkj86 joined #git
00:32 madewokherd joined #git
00:33 nikivi joined #git
00:33 drochman The file that I added does have content - it's a SQL script (.sql extension), if that matters.  But I think I just had the a-ha moment.  "Changes" in this context refers to "Changes to the repository", so adding 1 file = 1 change.  Whereas addi) here refers to files themselves, whereas additions and deletions refer to changes *within* files...  maybe?
00:34 BlaXpirit joined #git
00:35 jottr joined #git
00:36 italoacasas joined #git
00:37 b3kN joined #git
00:37 b3kN joined #git
00:45 mizu_no_oto joined #git
00:45 einnjo joined #git
00:46 JamesBaxter joined #git
00:52 ejb joined #git
00:58 dsdeiz joined #git
00:58 cqi joined #git
00:58 kyan joined #git
00:58 Lipp joined #git
01:01 durham joined #git
01:02 Crell Greetings.  This is going to be a bit of an odd question. I'm looking into the Git plumbing commands for a particular app I'm trying to write for which I want to use git as a storage backend.  One issue I can see having is concurrency.  Is there a way to "lock" the staging area so that I can know only one client is making a commit at once?
01:03 Crell I may have multiple users wanting to make changes at the same time, and I don't want their changes to get mushed up into one commit.
01:03 thiago Crell: no, there's no way to do that with git plumbing.
01:03 Crell The best idea I have so far is to fall back to a good-ol-lockfile.
01:03 Crell Hm.  Drat.
01:04 Crell Have a better idea than a lock file? :-)  (I'm going to be working against a bare repo, presumably.)
01:04 thiago git isn't designed for concurrent commit support, since users don't type "git commit" simultaneously
01:04 eizua joined #git
01:04 thiago you should introduce your own external locking
01:04 Crell Right.  I'm looking at doing something rather unconventional, which may fail miserably. :-)
01:04 thiago that said, the operations would fail if you don't do it right, so why do you need a lock?
01:05 thiago git commit-tree is probably safe
01:05 thiago git update-ref takes the old SHA-1, so if it's been moved, it'll fail
01:05 thiago I just don't know if it copes with a race condition
01:05 thiago never mind, use a lock of your own
01:06 Crell Well (bearing in mind my plumbing knowledge is about an hour old at this point), I'm envisioning one user writing, say 4 new blobs to the staging area, then write-tree, then commit-tree to make the commit object.
01:06 Crell But if another user simultaneously tries to write their own 2 blobs, they'll end up in the wrong commit.
01:07 Crell Yeah, it's the race condition of 2 users trying to write to the index at once that I'm concerned about.  A lockfile seems the path of least resistence if it is sufficiently safe.
01:08 hfp joined #git
01:10 hfp hi, i made some commits on master (th eonly branch in my local repo) and I have no origin or upstream anywhere. the only copy of the repo is on my machine. I have added a commit with `--fixup :/message` because I want this commit to be squashed with the one that contains `message`. But I don't know what to run, `git rebase -i master` obviously results in a noop. Any ideas?
01:10 Crell hfp: git rebase -i HEAD~5
01:10 Crell That will let you rebase just the 5 most recent commits interactively.
01:11 Crell (Supply your own number as appropriate.)
01:12 xall joined #git
01:13 ColdKeyboard joined #git
01:14 Derderderd joined #git
01:17 thiago Crell: at least for the update-ref command
01:17 thiago hfp: git rebase -i --autosquash
01:17 Crell thiago: At least which for the update-ref command?
01:17 thiago Crell: the lock
01:18 thiago Crell: I think the other commands are safe to be run simultaneously
01:18 asterismo_m joined #git
01:20 Crell Really?  I'd think update-ref is the least likely to be an issue.
01:20 Crell update-index being the most dangerous (as that's what builds the index before it gets committed).
01:23 thiago Crell: though looking at the update-ref strace output, looks like it's also safe. It has locks.
01:23 Crell Ah, good to know.
01:23 thiago the index has a lock too, but obviously only for each update-index call
01:24 thiago if you make more than one, it's non-atomic anymore
01:24 Crell I'm mainly concerned about multiple plumbing commands that have to be run for a single higher level action (like, "save these 4 files.")
01:24 thiago do you need a checkout?
01:24 Crell I need to not have a checkout.
01:24 thebope joined #git
01:25 dikiaap joined #git
01:25 thiago then why do you need the index?
01:25 Crell More specifically, my app will want to read from arbitrary branches simultaneously.  That rules out a working copy (or I could just use porcelin commands on that).
01:25 thiago multiple branches also rules out an index
01:25 thiago so forget update-index
01:25 Crell Because I want a single commit object that represents changing multiple files.
01:25 Crell Orly?
01:25 Atrumx joined #git
01:25 thiago that statement does not imply you need update-index
01:26 thiago anyway, you can use an index: one per line of work
01:26 Crell It doesn't?  (As before, my plumbing knowledge is very new and I've yet to try any of this.)
01:26 thiago then each line of work is running on separate indexes and will not interfere with each other
01:26 Crell OK, I'm confused now.
01:27 thiago forget the index
01:27 thiago that's the easiest way
01:27 Crell Hm.  OK...
01:27 grawity joined #git
01:28 Crell I thought a commit object pointed at a tree, and the way to have a tree that represents multiple changes was via the index.  Is there a simpler way I'm missing?
01:28 thiago all you need is git hash-object, git mktree and git commit-tree
01:29 thiago and git update-ref
01:29 * Crell hasn't gotten to git mktree yet.  What's that do?
01:29 thiago makes at ree
01:29 Crell Well, I assume makes a tree...
01:29 thiago (as the name says)
01:29 Crell Oh!  Wait, I think I'm following.
01:30 thiago another solution is git fast-import, but note that it won't be able to cope with the branches changing from underneath
01:30 Crell So I'd hash-object for the 4 changed objects, then mktree to make a new tree and tell it to use those 4 objects, then update-ref the branch to point to that tree?
01:31 Crell How would I tell that tree to include the 100 existing objects from the, well, parent.
01:31 thiago first add the objects, then make trees (recursively if needed), then create the commit, then finally update the ref
01:31 thiago you list all objects you want in the tree, regardless of whether they're old or new
01:32 Crell So the resulting command could be quite large.
01:32 thiago no, because mktree reads from stdin :-)
01:33 thiago is it possible that you'll be operating twice on the same branch, at the same time?
01:33 Crell Which means I'd need to first get a list of all objects, remove those for which I'm adding new versions, add those new versions, and then mktree the result?
01:33 thiago or does the application prevent that?
01:33 thiago correct
01:33 Crell Currently the application doesn't prevent anything.  It's early enough that I can do what I want with it.
01:34 Crell (It's still in the "mess with stuff and see what works" phase.)
01:34 thiago if you can do that, then you should consider git fast-import
01:34 Crell That = lock only one update to a given branch at once?
01:34 thiago it's basically git hash-object, mktree, commit-tree, tagging, plus reading existing trees, all rolled up into one
01:34 Crell That sounds yummy.
01:35 thiago but it will not cope with two instances trying to update the same ref at the same time
01:35 Crell If I need an application-level lock anyway, that's fine.
01:35 Crell I take it that means that command is not atomic, just a convenient shorthand for what we described above?
01:36 thiago kinda
01:36 thiago it's actually a transaction, since git fast-import doesn't modify the repository until you either close the command stream or sen the "checkpoint" command
01:37 czart Does git automatically discover file removal and takes proper actions on its own? In other words, does 'rm file' has the same effect as 'git rm file'? So, after 'rm file' occurs, is git able to automatically unstage the file within the commit command? (i.e. git commit -a -m 'msg')
01:37 thiago until then, all new blobs, trees and commit objects are in a temporary packfile and all ref values are held in memory
01:37 thiago Crell: if you tell it to commit a removed file, it will do the same as git rm did
01:38 thiago Crell: that's  what the -a does to git commit
01:38 Crell Hm.  So, it's sort of the plumbing version of commit -Am "foo" ?
01:38 thiago Crell: more, because you can stage multiple commits before saving
01:39 Crell O_o
01:39 thiago czart: sorry, the two lines above "if you tell" and "that's what the -a does" are for you
01:40 czart thiago: Thanks.
01:40 thiago Crell: not for you. The "more, because" is for you.
01:40 Crell Race conditions! :-)
01:40 thiago yeah, because you've both got nicknames starting with c
01:40 czart Hehe
01:42 Crell fast-import is what push/pull use then, I presume?
01:42 thiago no
01:42 thiago push and pull use send-pack and receive-pack
01:42 Anja_ joined #git
01:42 Crell Oh.  Which I'm totally not going anywhere near at this point. :-)
01:42 thiago I mean, upload-pack
01:42 thiago fast-import *creates* packs
01:43 Crell You mean packfiles?  Or by pack do you mean "set of commits and their data"?
01:43 thiago packfiles
01:43 thiago fast-import was created to make it easy to import from other version control systems
01:44 Crell Ahhh...
01:44 Crell But you think it's still the appropriate tool for what I'm trying to do?
01:44 thiago unlike git-svn, which is slow precisely because it launches a lot of git plumbing commands
01:44 thiago it could be
01:44 thiago just remember that fast-import creates inefficient packfiles, trading off compression for time
01:45 thiago you'll want to repack the repository frequently after using it
01:45 Crell Hm, OK.
01:45 Crell GC is also a task I'd want to lock, yes?
01:45 thiago you can also look at libgit
01:45 thiago or libgit2, whatever it's called
01:46 Crell Yeah, libgit2.  For which the PHP bridge is ancient and not well maintained, so at least for now I'll just be exec()-ing a lot.
01:46 Crell Hopefully I can port it later once I have the logic sorted out.
01:46 thiago yes, gc'ing or pruning needs to be locked, because it can discard objects
01:46 asterismo joined #git
01:47 mischat joined #git
01:48 Crell So, if my actual dataset is going to involve tens of thousands of objects, which I want revisioned... that means a mktree command would involve tens of thousands of hashes fed to it.
01:48 thiago yes
01:48 thiago unless you use subdirectories
01:48 Crell Does Git have some sort of compression on that, or does it just say screw it and store a 10,000-line text file for the tree/commit?
01:49 Crell I could if I wanted to, I suppose.  Ah, because then I can nest them.
01:49 thiago just go to any repository and run: git ls-tree HEAD:
01:49 thiago (including the :)
01:49 ome joined #git
01:49 thiago that's what gets stored, though in binary form. That's one tree object.
01:50 Crell Hm.
01:50 Crell That would make the trees more efficient, but wouldn't it also make it much more difficult to track and manage when I want to load an object, and/or add a commit?
01:51 jon-mac joined #git
01:51 thiago now you know why the index exists
01:51 Crell How does the index help?
01:52 thiago not in your case, the index per se
01:52 thiago but its purpose: keep a flat list of the contents of the next commit, ready to be sent
01:52 thiago if you modify or create file a/b/c.txt, then you need to know you must hash-object c.txt as well as modify the a and a/b trees
01:52 thiago and the root tree, of course
01:53 Crell Right.
01:53 breezy_ joined #git
01:53 thiago if you use mktree directly, you must to that dance yourself
01:53 thiago if you use fast-import, it'll do it for you
01:53 Crell Ahhh...
01:54 ^7heo s/to/do/
01:54 thiago ^7heo: yes
01:54 ^7heo I know :)
01:55 polyrob joined #git
01:55 * Crell is reading through the man page for fast-import now, still looking for the how-to-use.
01:56 grawity joined #git
01:57 jottr_ joined #git
02:00 Joost joined #git
02:04 svm_invictvs joined #git
02:05 czart I'm going through 'Pro Git' book and it says to remove files as follows: "git rm log/\*.log". My question concerns the role of "backslash" here. Is it necessary? How it works depending on whether I use git under windows or linux?
02:05 preaction it depends if you want the * to be handled by git, or by your shell
02:06 preaction the book is telling you to let git handle the *, i suspect in case you already deleted the files themselves
02:06 finalbeta joined #git
02:08 czart preaction: but I tried three options: 1) git rm .\*.txt 2) git rm ./*.txt 3) git rm ./\*.txt and I do not see apparent difference.
02:09 Anja__ joined #git
02:09 preaction .\*.txt is completely different, and like i said, 2 is your shell handling the *, and 3 is git handling the *
02:10 preaction and it matters in certain situations, like i said, when the file itself has already been deleted, but it is still being tracked by git. in that case, 2 will not tell git about the file, because the shell does not know that the file is still tracked by git
02:11 czart OK, I see, many thanks :)
02:11 Crell thiago: OK, so from the man page, it looks like each application-level "commit" would translate into a single call to fast-import / commit, with a from <prev commit> and a couple filemodify commands, which from my app I could simply build as a string before hand and then exec("cat $mystring | git fast-import");
02:12 Crell Does that sound like I'm on the right track?
02:12 Crell And then wrap that in a lockfile check to ensure atomicity.
02:12 menip joined #git
02:12 madewokherd joined #git
02:14 Derderderd joined #git
02:14 Jameser joined #git
02:23 Limes_ joined #git
02:23 Ryanar joined #git
02:25 thebope joined #git
02:28 grawity joined #git
02:34 CEnnis91 joined #git
02:38 a3Dman joined #git
02:38 peeps[lappy] joined #git
02:46 baryon joined #git
02:46 thiago Crell: not cat
02:46 thiago Crell: I recommend you open a pipe to fast-import
02:46 thiago popen() or similar
02:46 star_prone joined #git
02:46 Crell Ah, OK.
02:46 Crell Hm, I hope that works in PHP in a non-CLI SAPI... :-)
02:46 Anja joined #git
02:46 ojdo joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and serious business | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:52 arman left #git
02:56 arman joined #git
02:56 ColdKeyboard joined #git
02:57 arman left #git
02:57 cdg_ joined #git
02:58 NeverTired joined #git
02:59 Joost joined #git
02:59 pks joined #git
03:07 joshszep joined #git
03:12 dsantiago joined #git
03:14 ColdKeyboard joined #git
03:17 sdothum joined #git
03:18 DeltaHeavy joined #git
03:20 Joost joined #git
03:21 DeltaHeavy I was going to check in a commit. 'git status' showed a few files changed. I run 'git add -A . && git status' and it then lists ALL the files as deleted. I then ran 'git pull' then 'git push' (looking at my .zsh_history right now). It then shows me every file as deleted in green. I never let this command run though cause this project is gigantic. Now when I run 'ls' in my project root I get this, and pwd shows that I'm in the appropriate
03:21 DeltaHeavy directory:
03:21 DeltaHeavy COMMIT_EDITMSG  FETCH_HEAD  HEAD  ORIG_HEAD  branches  config  description  hooks  index  index.lock  info  logs  objects  packed-refs  refs
03:21 arescorpio joined #git
03:22 DeltaHeavy Then oddly, running 'cd .. && cd projectName' makes everything there again, it's only when I open up git-for-windows for the first time it does that. It will automatically use the .zshrc to cd into this directory.
03:22 dreiss joined #git
03:22 nettoweb joined #git
03:22 DeltaHeavy 'git checkout' resets none of it.
03:23 DeltaHeavy Running this from cmd does the same thing...
03:25 DeltaHeavy I've tried rebooting. It's Windows 7
03:26 chachasmooth joined #git
03:26 grawity joined #git
03:26 thebope joined #git
03:29 anuxivm left #git
03:31 DeltaHeavy When I go into my repo over my Parellels network mount from OSX and run 'git checkout thing.html' which is the last thing in the 'git status' list I get: error: pathspec 'build-git.html' did not match any file(s) known to git.
03:31 DeltaHeavy I mean 'build-git.html', not 'thing.html'
03:34 r4nd0m0ne1 joined #git
03:35 _jmleo joined #git
03:35 LordRyan joined #git
03:36 zyxep joined #git
03:36 DeltaHeavy I hope it's not this: http://stackoverflow.com/questions/20​16404/git-status-shows-modifications-​git-checkout-file-doesnt-remove-them
03:36 ignarps joined #git
03:36 ketas joined #git
03:36 cdown joined #git
03:36 fatalhalt joined #git
03:37 buffal0 joined #git
03:37 sunny256_ joined #git
03:37 epist3me_ joined #git
03:37 cite joined #git
03:37 cagedwisdom joined #git
03:37 spb_ joined #git
03:37 misha_ joined #git
03:37 BlessJah_ joined #git
03:37 Juri_Agarin joined #git
03:37 RustySha1kleford joined #git
03:37 FilipNor1ic joined #git
03:37 doppo_ joined #git
03:37 colona_ joined #git
03:37 xkr47_ joined #git
03:37 ixian8 joined #git
03:37 jj-_ joined #git
03:37 rudi_s_ joined #git
03:37 vmiklos joined #git
03:38 thiago DeltaHeavy: you're in the wrong dir
03:38 wtfova joined #git
03:38 Hello71 joined #git
03:38 meZee- joined #git
03:38 mrnuke joined #git
03:39 eagle_mike joined #git
03:39 sunri5e joined #git
03:39 grawity joined #git
03:39 DeltaHeavy thiago Nope, pwd says I'm in the right one
03:39 DeltaHeavy And I see all the files after doing 'cd .. && cd ~-'
03:40 DeltaHeavy Which is weird
03:40 thiago there you go
03:40 thiago you were in the wrong dir
03:40 DeltaHeavy No, ~- is an alias to your last dir
03:40 DeltaHeavy But 'git checkout' still shows everything as deleted and I can't seem to change that.
03:40 DeltaHeavy Only the few files modified stay modified
03:41 thiago do you have the files: config, index, packed-refs?
03:41 cmn joined #git
03:41 DeltaHeavy Inside ./.git
03:42 thiago right, that's the *wrong* dir
03:42 nopf joined #git
03:42 thiago don't go inside .git
03:42 styx_ joined #git
03:42 DeltaHeavy ./.git meaning I'm inside ., and looking inside .git from .
03:42 thiago are you outside .git?
03:42 jimi_ joined #git
03:42 thiago ok
03:42 DeltaHeavy ./.git, not .
03:42 Slush- joined #git
03:42 thiago pastebin the output of git status, please
03:43 Lope joined #git
03:43 DeltaHeavy It's thousands of lines long and contains the entire map of all of our files which is confidential
03:43 DeltaHeavy Basically it's every file as 'deleted' in green with the 4 files I actually 'modified' listed as such instead.
03:43 thiago they're green
03:43 thiago ?
03:43 DeltaHeavy Yep, they're staged.
03:43 thiago ok
03:43 thiago and you want to restore them?
03:44 DeltaHeavy They're not actually deleted though
03:45 thiago ok, pick one file. Does it:
03:45 thiago a) appear in the "staged" list?
03:45 thiago b) appear in the "not staged" list
03:45 DeltaHeavy a) Yes
03:45 dreiss joined #git
03:45 thiago c) exist?
03:45 DeltaHeavy b) None
03:47 thiago yes or no?
03:47 DeltaHeavy b) They all exist
03:47 DeltaHeavy c*
03:47 DeltaHeavy Sorry, was double checking a bunch of files to make sure
03:47 DeltaHeavy Including the modified ones.
03:47 rewt so they're staged to be deleted, but they're still all there in your working tree?
03:47 DeltaHeavy Yes
03:48 thiago in the "not staged" list, do you have directory names listed?
03:48 DeltaHeavy I bet I should manually copy these changes and try: git rm --cached -r . && git reset --hard
03:48 DeltaHeavy thiago None
03:48 thiago nothing?
03:48 ghostlight joined #git
03:48 thiago do you have a .gitignore file?
03:48 DeltaHeavy Yep
03:48 thiago could it be ignoring everything?
03:49 mischat joined #git
03:49 grawity joined #git
03:49 DeltaHeavy Last change to that file was 10 days ago, master wasn't merged in recently, and nobody's been having any issues.
03:50 thiago do you have an environment variable whose name starts with GIT set?
03:50 Joost` joined #git
03:53 novas0x2a|laptop joined #git
03:54 DeltaHeavy How can I check that?
03:54 DeltaHeavy ~/.zshrc and the global one?
03:54 thiago env | grep GIT
03:54 DeltaHeavy Nope
03:54 DeltaHeavy Nothing
03:54 thiago ok
03:55 thiago try to git add one of the files listed as deleted
03:55 thiago what does git add tell you?
03:55 DeltaHeavy deleted >:
03:55 thiago huh?
03:56 bruce_lee joined #git
03:56 asterismo left #git
03:56 DeltaHeavy Makes no difference to the output of 'git status'
03:57 thiago did git add say anything? or did it exit with no output?
03:57 hexagoxel joined #git
03:58 DeltaHeavy exit with no output
03:58 thiago was it an exit with success?
03:58 thiago was $? zero?
03:58 cagedwisdom joined #git
04:00 DeltaHeavy Success yes
04:00 dsdeiz joined #git
04:00 dsdeiz joined #git
04:00 grawity joined #git
04:00 thiago run git status again. Is the file still listed as deleted?
04:03 DeltaHeavy one momenat
04:04 sdothum joined #git
04:06 [cust] joined #git
04:06 DeltaHeavy Back, the file is still lited
04:07 DeltaHeavy listed as deleted*
04:07 star_prone joined #git
04:08 thiago this is really weird
04:08 thiago to confirm: you want to discard whatever git things you had staged, right?
04:08 thiago just go back to the original state
04:09 DeltaHeavy I just finished saving all of my files
04:09 grawity joined #git
04:09 DeltaHeavy Out of the repo
04:09 DeltaHeavy Trying: git rm --cached -r . && git reset --hard HEAD
04:10 cagmz_ joined #git
04:10 DeltaHeavy Seems like it's rechecking out all the files now it thinks are deleted
04:11 DeltaHeavy Which will take a while
04:12 DeltaHeavy Awesome, it worked. Now I'm going to copy these files with a text editor to make sure they don't have some weird corruption going on.
04:13 Derderderd joined #git
04:13 Joost` joined #git
04:14 Vortex35 joined #git
04:14 dsdeiz joined #git
04:15 DeltaHeavy Fantastic! It worked. Thanks for your help thiago
04:17 grawity joined #git
04:18 buffal0 joined #git
04:20 ismithers joined #git
04:22 fstd_ joined #git
04:23 grawity joined #git
04:26 hanetzer left #git
04:28 geoid joined #git
04:31 bocaneri joined #git
04:32 grawity joined #git
04:35 cyan__ joined #git
04:35 buffffal00 joined #git
04:40 Joost` joined #git
04:40 cagmz joined #git
04:43 dodobrain joined #git
04:44 dreiss joined #git
04:45 grawity joined #git
04:45 di0_ joined #git
04:46 dodobrain joined #git
04:48 [Saint] joined #git
04:50 mischat joined #git
04:52 grawity joined #git
04:54 t-mart joined #git
04:55 breezy_ joined #git
05:00 grawity joined #git
05:01 qqx joined #git
05:02 TikityTik joined #git
05:02 TikityTik How do I fork my own repo?
05:02 Jameser joined #git
05:03 cagmz_ joined #git
05:03 Lyqyd joined #git
05:04 preaction TikityTik: do you mean on github?
05:04 TikityTik preaction: yes
05:05 preaction you don't
05:05 preaction what are you trying to achieve with this?
05:06 TikityTik preaction: just backing everything up before I make my stuff public
05:06 preaction what?
05:06 preaction how is forking your own project going to do that?
05:07 grawity joined #git
05:08 TikityTik ah I got it working, I had to actually make the repo on the website itself
05:09 Joost` joined #git
05:09 preaction i'm still not sure how this is going to achieve what you want
05:10 tnecniv joined #git
05:13 Derderderd joined #git
05:15 GT4066 joined #git
05:17 grawity joined #git
05:22 [Saint] thiago: you still around?
05:22 thiago [Saint]: yes
05:23 [Saint] Is the behavior you mentioned with gitconfig location version specific?
05:23 thiago not that I know of
05:23 thiago it must have been supported for at least a couple of years
05:24 [Saint] My system seems to gleefully disregard both ~/.config/git/config and /etc/*
05:24 [Saint] saint@saint-gittest:~$ git config --global --list
05:24 [Saint] fatal: unable to read config file '/home/saint/.gitconfig': No such file or directory
05:25 aruns joined #git
05:25 subhojit777 joined #git
05:25 thiago what version is that?
05:26 [Saint] kinda old-ish:
05:26 [Saint] saint@saint-gittest:~$ git --version
05:26 [Saint] git version 1.7.9.5
05:26 thiago 1.7 is ancient
05:26 thiago try something from the last year or two
05:27 [Saint] yeah - this is a tiny little image from a deadman switch that very rarely gets touched, just wanted to check it was indeed version-specific and that I shouldn't be looking elsewhere.
05:28 [Saint] something something, don'
05:28 [Saint] t touch a running system
05:29 thebope joined #git
05:30 grawity joined #git
05:31 QualityAddict joined #git
05:31 geoid joined #git
05:32 lindenle joined #git
05:33 pks joined #git
05:34 zerozero joined #git
05:34 Sample joined #git
05:34 sssilver joined #git
05:40 lindenle joined #git
05:40 Joost` joined #git
05:46 vdv joined #git
05:51 mischat joined #git
05:52 Cabanossi joined #git
05:57 Goplat joined #git
05:58 grawity joined #git
05:58 dikiaap joined #git
06:00 menip joined #git
06:00 aruns joined #git
06:01 Joost` joined #git
06:06 grawity joined #git
06:14 Derderderd joined #git
06:20 lindenle joined #git
06:25 Joost` joined #git
06:25 murgi joined #git
06:26 jstimm joined #git
06:28 Anthaas joined #git
06:31 lindenle joined #git
06:32 geoid joined #git
06:32 yaewa joined #git
06:33 donught joined #git
06:35 grawity joined #git
06:39 [0xAA] joined #git
06:39 romerocesar joined #git
06:40 fatalhalt joined #git
06:41 grawity joined #git
06:43 svm_invictvs joined #git
06:47 Joost` joined #git
06:51 mischat joined #git
06:53 grawity joined #git
06:53 Nilesh_ joined #git
06:54 dsdeiz joined #git
06:54 dsdeiz joined #git
06:56 [0xAA] joined #git
06:57 kumarsuraj joined #git
07:01 grawity joined #git
07:01 Sample joined #git
07:08 Bigcheese joined #git
07:09 relgar joined #git
07:11 martman joined #git
07:13 red82 joined #git
07:14 grawity joined #git
07:15 Derderderd joined #git
07:16 Joost` joined #git
07:21 navidr joined #git
07:22 iliv joined #git
07:22 brokensyntax joined #git
07:23 grawity joined #git
07:24 swalladge joined #git
07:24 [Saint] joined #git
07:27 Lipp joined #git
07:27 mmattice joined #git
07:28 AustinMatherne joined #git
07:30 quetz joined #git
07:33 geoid joined #git
07:35 Lipp joined #git
07:38 ToBeFree joined #git
07:40 Joost` joined #git
07:43 grawity joined #git
07:52 mischat joined #git
07:55 grawity joined #git
07:55 vuoto joined #git
07:56 GodEater` joined #git
08:01 jknetl joined #git
08:01 fearless_man joined #git
08:05 Joost` joined #git
08:06 rominronin joined #git
08:07 grawity joined #git
08:08 GodEater` left #git
08:09 GodEater joined #git
08:09 GodEater joined #git
08:12 Lipp joined #git
08:15 Derderderd joined #git
08:15 grawity joined #git
08:17 thesha joined #git
08:18 zzz_ joined #git
08:20 jmleo joined #git
08:20 GenteelBen joined #git
08:20 GenteelBen Hello.
08:20 gitinfo GenteelBen: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
08:20 GenteelBen Is this channel +r?
08:21 Lipp_ joined #git
08:21 mar77i_ joined #git
08:21 Electrom_ joined #git
08:21 bronson_ joined #git
08:22 thesha hi
08:23 thesha I am getting this error while using git send-email command
08:23 thesha Unable to initialize SMTP properly. Check config and use --smtp-debug. VALUES: server=smtp.gmail.com encryption=tls hello=fedora.localdomain port=587 at /usr/libexec/git-core/git-send-email line 1383.
08:23 Joost` joined #git
08:23 brokensyntax joined #git
08:23 DonRichie joined #git
08:24 blahdodo joined #git
08:24 chridal joined #git
08:24 Karazhan joined #git
08:24 GenteelBen left #git
08:25 noodle joined #git
08:25 geoid joined #git
08:26 thesha anyone knows here?
08:28 grawity joined #git
08:29 m___ joined #git
08:30 peepsalot joined #git
08:30 holgersson joined #git
08:31 thebope joined #git
08:32 mellernoia joined #git
08:33 vuoto joined #git
08:33 InfoTest joined #git
08:33 dreiss joined #git
08:34 subhojit777 joined #git
08:36 grawity joined #git
08:38 kumarsuraj joined #git
08:38 thesha joined #git
08:40 shampine joined #git
08:40 oskarkv I'm on Linux, and I have autocrlf=true and eol=native, but I'm getitng the warning "LF will be replaced by CRLF in .gitignore". This seems strange. Why is it happening?
08:42 ayogi joined #git
08:43 iliv joined #git
08:45 mahendratech joined #git
08:45 fcrick_ joined #git
08:46 grawity joined #git
08:47 derk0pf joined #git
08:47 jrnieder joined #git
08:48 andschwa joined #git
08:52 thesha Is this channel is active?
08:53 mischat joined #git
08:53 grawity joined #git
08:56 asd5a joined #git
08:56 Joost` joined #git
08:58 rominronin joined #git
08:58 ski7777 joined #git
08:58 zzz_ joined #git
08:59 meZee joined #git
09:00 mattcen joined #git
09:00 warthog19 joined #git
09:02 QuestionTime joined #git
09:02 grawity joined #git
09:03 _ikke_ thesha: it sure is
09:04 _ikke_ oskarkv: is there a .gitattributes file?
09:04 Oebele joined #git
09:05 oskarkv _ikke_: no, but apparently autocrlf is for if you want CRLF in working directory
09:05 oskarkv So I turned that off
09:06 babilen joined #git
09:06 Shentino joined #git
09:07 _ikke_ ok
09:07 runlevl4 joined #git
09:08 thesha _ikke_: i thought its dead
09:11 shampine joined #git
09:11 jstimm joined #git
09:11 cagedwisdom joined #git
09:11 parasite_ joined #git
09:11 freimatz joined #git
09:11 adymitruk joined #git
09:11 Ankhers joined #git
09:13 _ikke_ nah
09:13 overlord_tm joined #git
09:13 _ikke_ there are 1133 people in this channel now (not that they are all active :P)
09:16 grawity joined #git
09:17 thesha _ikke_: nobody is replying thats why i said this.
09:18 _ikke_ It's weekend
09:18 _ikke_ It's early morning in europe and late night in the US
09:18 _ikke_ So yeah, less people are active now
09:19 _ikke_ To answer your question:
09:19 _ikke_ gmail has increased there security policy
09:19 parasite_ joined #git
09:20 thesha _ikke_: i turned secure off
09:20 thesha s/secure/security/
09:21 jnavila joined #git
09:21 thesha but still getting error
09:23 Shentino joined #git
09:26 Lipp joined #git
09:29 Joost` joined #git
09:32 thebope joined #git
09:32 Oebele joined #git
09:33 shampine joined #git
09:33 jstimm joined #git
09:33 cagedwisdom joined #git
09:33 freimatz joined #git
09:33 adymitruk joined #git
09:33 Ankhers joined #git
09:37 iliv joined #git
09:41 mar77i_ joined #git
09:41 KevinDF joined #git
09:42 thesha joined #git
09:42 KevinDF joined #git
09:43 lindenle joined #git
09:43 xaa joined #git
09:44 [|SDK|] joined #git
09:46 YuGiOhJCJ joined #git
09:46 ahmedelgabri joined #git
09:48 Lipp joined #git
09:51 tvw joined #git
09:52 SteffanW joined #git
09:54 mischat joined #git
09:58 grawity joined #git
09:58 Shentino joined #git
10:01 drizbit joined #git
10:02 eizua joined #git
10:02 veverak joined #git
10:02 veverak hi folks, is it somehow possible to "pull" uncommited things ? and untracked things?
10:03 veverak I mean, I can do that with rsync. but that also copies files that should be ignored by git ;)
10:03 pks joined #git
10:05 thesha joined #git
10:05 rominronin joined #git
10:06 cyan__ joined #git
10:06 grawity joined #git
10:08 veverak hmm
10:08 veverak --filter=':- .gitignore' should work evidently
10:12 grawity joined #git
10:12 nivag joined #git
10:12 mda1 joined #git
10:17 _ikke_ No, you cannot
10:17 _ikke_ you can only fetch history, and everythin uncomitted or untracked is not part of history
10:19 veverak I mean, it looks like I can use .gitignore with rsync via arg I pasted
10:20 _ikke_ right
10:21 KevinDF joined #git
10:22 tarkus joined #git
10:23 acetakwas joined #git
10:25 robotroll joined #git
10:25 KevinDF joined #git
10:26 KevinDF joined #git
10:27 thesha joined #git
10:29 Jackneill_ joined #git
10:33 thebope joined #git
10:33 texinwien_ joined #git
10:39 mda1 joined #git
10:42 [0xAA] joined #git
10:48 derk0pf joined #git
10:50 elsevero joined #git
10:54 Orphis joined #git
10:55 satifant joined #git
10:55 oskarkv joined #git
10:57 pbrewczynski joined #git
10:59 thesha joined #git
10:59 iliv joined #git
11:03 buffal0 joined #git
11:06 miczac joined #git
11:06 WhiskerBiscuit joined #git
11:07 linux_dog2 joined #git
11:10 tarkus joined #git
11:13 venmx joined #git
11:13 Dazzyp joined #git
11:13 Darcidride joined #git
11:16 grawity joined #git
11:19 mikecmpbll joined #git
11:20 derk0pf joined #git
11:24 b_rare joined #git
11:24 rindolf joined #git
11:30 King_Hual joined #git
11:31 iliv joined #git
11:33 ac3takwas joined #git
11:34 thebope joined #git
11:42 derk0pf joined #git
11:45 Limes_ joined #git
11:50 Guest36_ joined #git
11:51 iliv joined #git
11:53 Xploit0 joined #git
11:55 Ediz joined #git
11:55 rominronin joined #git
11:57 elsevero joined #git
11:58 vdv joined #git
11:59 Xploit0 joined #git
12:02 mkoskar joined #git
12:04 WayToDoor joined #git
12:05 Xploit0 joined #git
12:07 ShekharReddy joined #git
12:12 venmx joined #git
12:14 flavius joined #git
12:20 finalbeta joined #git
12:21 Darcidride joined #git
12:24 NicoHood joined #git
12:24 HoierM joined #git
12:25 NicoHood I want to use git archive and create a tar of my project. However I need a root folder like "project" where all files are inside and this as tar, and not only the files directly as tar. Otherwise its a mess if you extract the files. Is there any way to do so?
12:25 moei joined #git
12:26 nettoweb joined #git
12:28 nanga joined #git
12:29 rindolf NicoHood: use --prefix
12:29 rindolf NicoHood: git help archive
12:30 NicoHood rindolf: aaah. I used it without a slash. now it works. if you dont use a slash its not created as folder
12:34 yohnnyjoe joined #git
12:35 rindolf NicoHood: nice. :-)
12:35 NicoHood rindolf: for .xz i need to use my own command i guess?
12:35 rindolf NicoHood: don't know
12:37 processkiller joined #git
12:38 treehug88 joined #git
12:44 inflames joined #git
12:44 _ikke_ rindolf: Yeah, just pipe a tar archive through something that creates an xz archive
12:47 vrlx joined #git
12:49 fracting joined #git
12:52 babilen joined #git
12:52 brokensyntax joined #git
12:52 relgar joined #git
12:52 Juri_Agarin joined #git
12:52 sunny256 joined #git
12:52 ignarps joined #git
12:52 __main__ joined #git
12:52 dmc joined #git
12:52 cyberz joined #git
12:52 Celelibi joined #git
12:52 invisbl joined #git
12:52 leprechau joined #git
12:52 lb1c joined #git
12:52 uranellus joined #git
12:52 jab416171 joined #git
12:52 likewhoa joined #git
12:52 tuor joined #git
12:52 texasmynsted joined #git
12:52 trondth joined #git
12:52 jesk joined #git
12:52 m1dnight_ joined #git
12:52 dooglius joined #git
12:52 glebihan_ joined #git
12:52 phroa joined #git
12:52 Guest46272 joined #git
12:52 mgoodwin joined #git
12:52 lamont joined #git
12:52 midgetspy joined #git
12:52 markovh joined #git
12:52 Spydar007 joined #git
12:52 jdiez joined #git
12:52 Remram joined #git
12:52 jamick joined #git
12:52 nephyrin` joined #git
12:53 Karazhan joined #git
12:53 dooglius joined #git
12:55 leeN joined #git
12:57 thinkpad joined #git
12:58 aiena joined #git
12:59 tmsmith joined #git
12:59 invisbl joined #git
13:02 pothepanda joined #git
13:05 ghostlight joined #git
13:07 manuels joined #git
13:09 cqi joined #git
13:10 tarkus joined #git
13:10 fmcgeough joined #git
13:10 cqi joined #git
13:14 jnavila joined #git
13:15 sdothum joined #git
13:20 systemovich joined #git
13:21 lucianangelus joined #git
13:21 SteveCharleston joined #git
13:22 systemovich joined #git
13:22 _Cyclone_ joined #git
13:23 fmcgeough joined #git
13:24 Nilesh_ joined #git
13:25 sdothum joined #git
13:25 _Cyclone_ joined #git
13:29 systemovich joined #git
13:31 d0nn1e joined #git
13:33 buffal0 joined #git
13:34 mentazoom joined #git
13:34 thesha joined #git
13:35 ace_33 joined #git
13:40 Backwards joined #git
13:41 jstein_ joined #git
13:41 ac3takwas joined #git
13:42 jooni joined #git
13:44 jnavila joined #git
13:44 nikivi joined #git
13:45 denisMone joined #git
13:46 yohnnyjoe joined #git
13:48 Ryanar joined #git
13:48 Tanfrieze joined #git
13:49 lindenle joined #git
13:49 shinnya joined #git
13:51 buffffal00 joined #git
13:52 misha joined #git
13:52 misha joined #git
13:52 serialoverflow joined #git
13:52 misha joined #git
13:53 misha joined #git
13:55 Endarked joined #git
13:58 misha joined #git
13:58 misha left #git
13:59 acln joined #git
14:03 Backwards left #git
14:05 mikecmpbll joined #git
14:06 romerocesar joined #git
14:07 byte512 joined #git
14:14 ac3takwas joined #git
14:15 Zamerick joined #git
14:15 robotroll joined #git
14:16 jost joined #git
14:17 tarkus joined #git
14:17 spr0tsuki joined #git
14:18 nwkj86 joined #git
14:21 ahmed_elgabri joined #git
14:30 jstein_ joined #git
14:31 pks joined #git
14:36 chele joined #git
14:36 thebope joined #git
14:40 ac3takwas joined #git
14:42 rominronin joined #git
14:44 balance joined #git
14:44 balance hi
14:45 converge joined #git
14:46 converge I deleted a file in my local repository, how to get the copy of this file that is in remote repos. ?
14:46 converge git status returns: deleted: README.md
14:47 dsdeiz joined #git
14:48 converge fetch / reset hard ?
14:48 jimi_ joined #git
14:50 ispn joined #git
14:52 f4 joined #git
14:52 _Cyclone_ joined #git
14:53 Dreadnaught joined #git
14:53 Dreadnaught joined #git
14:53 chele i am trying to pass a private key to git 1.7.9 and seems that using env var doesn't work. I tried ssh-agent way but as my make is invoked from dpkg-deb it fails "ERROR: ld.so: object 'libfakeroot-sysv.so' from LD_PRELOAD cannot be preloaded: ignored." and prompts me for a password. Any ideas how can I pass ssh key to git?
14:53 treehug88 converge I think you want: git checkout (LASTSHA) -- README.md; git add README.md
14:55 a_thakur joined #git
14:57 m0viefreak joined #git
14:59 converge treehug88: tks
15:00 johnmilton joined #git
15:05 nettoweb joined #git
15:05 [0xAA] joined #git
15:08 JamesBaxter joined #git
15:12 [0xAA] joined #git
15:13 cbegin joined #git
15:24 aca20031 joined #git
15:24 JamesBaxter joined #git
15:24 sea-gull_ joined #git
15:28 Lipp joined #git
15:30 ismaris joined #git
15:31 altendky joined #git
15:32 Lipp joined #git
15:32 mellernoia joined #git
15:39 meadmoon joined #git
15:39 ToBeCloud joined #git
15:42 overbyte joined #git
15:43 Cavallari joined #git
15:47 Learath2 joined #git
15:48 blackwind_123 joined #git
15:51 JamesBaxter joined #git
15:53 [0xAA] joined #git
15:54 menip joined #git
15:57 Khisanth joined #git
15:58 buffal0 joined #git
15:59 anonymuse joined #git
16:00 miczac joined #git
16:01 dreiss joined #git
16:02 re1 joined #git
16:03 Vortex34 joined #git
16:04 sq-one joined #git
16:07 JamesBaxter joined #git
16:09 anonymuse joined #git
16:13 DrRobotic joined #git
16:16 mizu_no_oto joined #git
16:21 GavinMagnus joined #git
16:23 DeltaHeavy joined #git
16:24 HM joined #git
16:27 denisMone joined #git
16:29 texinwien_ joined #git
16:31 PCatinean joined #git
16:37 watabou joined #git
16:41 derk0pf joined #git
16:41 b3kN left #git
16:43 GavinMagnus joined #git
16:45 ejb joined #git
16:46 SwiftMatt joined #git
16:46 WayToDoor joined #git
16:48 JamesBaxter joined #git
16:48 GavinMagnus left #git
16:50 red82 joined #git
16:53 function joined #git
16:54 czart joined #git
16:54 Limes_ joined #git
16:54 sirish joined #git
16:55 balance joined #git
16:55 Crell joined #git
16:56 sirish Is it possible to push a part of a repo to another remote?
16:56 kadoban sirish: Not really directly. You can split out parts using 'git subtree', but it's not the easiest thing in the world.
16:58 balance1 joined #git
16:59 miczac joined #git
17:00 rominron_ joined #git
17:02 niels_ joined #git
17:03 Jonuz Some time ago I merged branch to master and after that I reverted that merge. Now when I try to merge master to that branch files in that branch gets deleted. Is there solution to this?
17:05 balance2 joined #git
17:07 jnavila joined #git
17:09 rindolf Jonuz: can you start a new branch off master?
17:10 kadoban JelmerD: revert the revert of the merge
17:11 kadoban Wait ... I didn't really read the question fully, but that's probably part of it.
17:11 Jonuz rindolf: I tried that, git says Already up to date
17:13 rindolf Jonuz: how about applying a new diff?
17:14 niels_ joined #git
17:14 xlegoman joined #git
17:14 thebope joined #git
17:14 Jonuz rindolf: git diff shows the real diffs between branches. I assume that git thinks that those diffs doesnt belong to master since I reverted that merge and those diffs got removed from master
17:15 rindolf Jonuz: I don't follow
17:15 brent__ joined #git
17:21 fatalhalt joined #git
17:24 miczac joined #git
17:24 Sample joined #git
17:26 publio joined #git
17:29 ahmedelgabri joined #git
17:32 sirish joined #git
17:33 Lipp_ joined #git
17:34 ayogi joined #git
17:36 jason237 joined #git
17:38 Guest62340 joined #git
17:41 zzz__ joined #git
17:45 jason237 joined #git
17:46 YuGiOhJCJ joined #git
17:46 WayToDoor joined #git
17:47 menip joined #git
17:51 lindenle joined #git
17:52 mda joined #git
17:55 converge joined #git
17:58 function joined #git
17:58 SuperSeriousCat joined #git
17:58 denisMone joined #git
18:01 hhee joined #git
18:02 cagmz joined #git
18:02 Goplat joined #git
18:02 hhee guys, git stash - i know it save my working copy changes and create clean working directory, then i can git pull, for example. but when i do - git pull, and after - git stash apply, with same file - will it merged?
18:02 hhee dunno stack tech :)
18:03 hhee how often do you use it?
18:08 function joined #git
18:15 thebope joined #git
18:16 j416 hhee: it'll be merged, yes
18:16 j416 hhee: I rarely use it for the case you mention. I use separate branches instead.
18:16 dreiss joined #git
18:16 j416 hhee: I use git stash sometimes to very temporarily remove some changes to, for instance, run the test suite without some recent small addition that i intend to add later anyway
18:17 j416 I rarely keep a stash for longer than a few seconds
18:17 j416 but ymmv I suppose
18:18 dikiaap joined #git
18:18 processkiller joined #git
18:18 DeltaHeavy left #git
18:21 hhee j416, thx, got it
18:21 j416 o/
18:25 govg joined #git
18:29 dsdeiz joined #git
18:29 dsdeiz joined #git
18:31 nwkj86 joined #git
18:31 martman im trying to mirror a git repo. so i have my remote origin that i control, and another another official remote that i dont have any control over
18:32 martman im doing a get remote update and a git push origin --all
18:32 martman but that doesnt seem to actually mirror the 2 different sources
18:32 martman i dont even see all the official branches on my remote
18:32 martman how should i be going about this?
18:34 QualityAddict joined #git
18:36 rivarun joined #git
18:36 a3Dman joined #git
18:41 [0xAA] joined #git
18:41 rivarun joined #git
18:42 heftig joined #git
18:42 Lipp joined #git
18:45 fatalhalt joined #git
18:46 davimore joined #git
18:49 dirtyroshi joined #git
18:50 cagedwisdom joined #git
18:53 cbreak martman: git push --all only pushes local refs
18:54 cbreak martman: try git clone --mirror to get the local repo
18:56 Domhack_ joined #git
18:58 inovas joined #git
19:03 miczac joined #git
19:04 heftig joined #git
19:04 QualityAddict joined #git
19:05 SwingShock joined #git
19:05 kaldoran joined #git
19:06 Derderderd joined #git
19:07 Groscheri joined #git
19:07 LordRyan is it possible that git can't work with gpg if gpg needs a password to unlock the key?
19:07 Domhack joined #git
19:07 rivarun joined #git
19:10 _ikke_ Not certain but I think that's where you use a gpg agent
19:10 _ikke_ (Not certain if it's supposed to work or not)
19:11 LordRyan _ikke_: yes, i have to use a gpg agent. it works if i do `gpg --sign > /dev/null` with a blank message beforehnad
19:11 vdv joined #git
19:12 cagedwisdom joined #git
19:13 Domhack joined #git
19:13 grawity do you have $GPG_TTY set?
19:14 LordRyan no
19:15 LordRyan I should actually try outside of tmux because I also have an issue with $DISPLAY i just found
19:15 robotroll joined #git
19:16 LordRyan okay so it doesn't work outside of tmux either
19:16 thebope joined #git
19:20 mda1 joined #git
19:20 Akuli joined #git
19:20 Akuli does git convert line ends depending on which platform it's running on?
19:21 Akuli on windows it said it's going to convert my \n line ends to \r\n but when i pulled the file i edited to a non-windows there are no \r\n's in it
19:22 Seveas yes, on windows the default (which you had the option to change during install) is to mangle newlines
19:23 nwkj86 joined #git
19:23 m0viefreak joined #git
19:23 Akuli i just found it a bit confusing that it wanted to convert \n to \r\n just to be able to convert it back to \n
19:24 serialoverflow joined #git
19:24 meLon joined #git
19:24 Akuli and of course i had specifically made sure to produce \n's when working on windows :)
19:25 zzz joined #git
19:26 thiago some editors on windows require \r\n
19:26 thiago like, for example, notepad
19:27 Akuli but git's commit message file is still \n
19:27 Akuli so it doesn't work too well with notepad
19:27 thiago didn't know that
19:28 physikoi joined #git
19:29 iliv joined #git
19:29 physikoi Hello #git. I've subitted a PR that has a 'dist' file conflict. I haven't the foggiest idea how to resolve this. Thoughts? Also, is there someway for production files to be created automagically on github -- is that what travis is for?
19:30 LordRyan physikoi: travis is for automatically testing code; i don't believe it has the ability to push or make changes to your repository.
19:31 Lipp joined #git
19:31 sonOfRa joined #git
19:31 ojacobson generally, don't check in generated files
19:31 LordRyan physikoi: as for the `dist` file conflict, try https://www.git-tower.com/learn/git/ebook/en/​command-line/advanced-topics/merge-conflicts
19:31 LordRyan also, ^^
19:31 physikoi LordRyan: thanks. I was wondering if there were someway to ignore production files locally and have them built on the remoteside, thus avoiding conflict issues. Thing I dont understand is that this is the first time I've run into a conflict with dist files; I'm at a loss.
19:32 Poppa joined #git
19:32 LordRyan physikoi: you can use a git hook to automatically generate them when pulling the repository.
19:32 physikoi LordRyan: thank you, checking it out now.
19:32 physikoi interesting
19:33 LordRyan so that `git pull` triggers the generation.
19:33 b_rare joined #git
19:33 LordRyan You can put it up on your deployment server so that when the deployment server runs `git pull` it generates the file.
19:33 LordRyan http://stackoverflow.com/questions/41​85400/is-there-any-git-hook-for-pull
19:33 LordRyan guide there ^
19:33 dviola joined #git
19:34 the_cybersphinx joined #git
19:37 fahadash joined #git
19:38 watabou joined #git
19:39 madewokherd joined #git
19:40 dsdeiz joined #git
19:40 physikoi LordRyan: Ty. I was able to resolve the conflict as I normally do. I feel like it's odd to have to do that for production files, but maybe it's not.
19:43 pks joined #git
19:43 physikoi Someone at SO linked to this-- http://www.manpagez.com/man/5/githooks/ -- which is handy (though the page design is a bit poor).
19:45 Apteryx joined #git
19:45 Apteryx Is it safe to delete a corrupted *loose* object?
19:46 _ikke_ If it's not referenced, then yes, it's safe to remove
19:46 Apteryx And will it allow me to recover from Git always stopping on this error: fatal: loose object bbae1510169ceb4e6e1d653928b6bd8781c9575a (stored in .git/objects/bb/ae1510169ceb​4e6e1d653928b6bd8781c9575a) is corrupt
19:46 nikivi joined #git
19:46 ojacobson If it's used in your history somewhere, then "corrupt" and "absent" are only barely different broken states
19:46 Apteryx _ikke_: OK. I'll give it a shot.
19:48 Apteryx After deletion of the loose & corrupted object, "git fsck" now goes through, but reports I have a couple "dangling commits".
19:49 thiago dangling is fine
19:49 thiago having too much is not a problem; having too little is
19:50 Apteryx OK
19:50 Apteryx Thanks.
19:52 physikoi LordRyan: Thank you for your assistance :)
19:52 LordRyan np
19:52 kulelu88 joined #git
19:55 garethdaine joined #git
19:56 Doginal joined #git
19:58 kyan joined #git
19:58 nivag joined #git
19:59 Lipp_ joined #git
20:03 nikivi joined #git
20:03 Orion3k joined #git
20:03 Lipp joined #git
20:09 Akuli left #git
20:09 Ooe joined #git
20:10 Sample joined #git
20:12 glebihan joined #git
20:17 thebope joined #git
20:18 SteveCharleston joined #git
20:19 dreiss joined #git
20:19 jason237 joined #git
20:24 LordRyan grawity: http://superuser.com/questions/691395/gi​t-tag-with-gpg-agent-and-pinentry-curses <- trying this now
20:24 Teisei joined #git
20:25 LordRyan right, that works. looks like an issue when migrating WMs that i never had an issue with because i didn't restart my computer. great. :P
20:25 ncthom91 joined #git
20:26 breezy_ joined #git
20:27 mischat joined #git
20:27 yohnnyjoe joined #git
20:27 miczac joined #git
20:28 Teisei Anyone ever have trouble deleting a remote branch? It claims that I am trying to delete the current branch; it is not the current branch. This is on a bitbucket server.
20:28 thiago the server thinks it is
20:28 thiago therefore, for all intents and purposes, it is
20:29 thiago note: current branch on the remote, not on your local repository
20:29 thiago try changing the remote's current branch
20:29 Elaa joined #git
20:30 Teisei I see. It looks like someone changed our default branch to the branch I was attempting to delete. Thanks, I hadn't considered that.
20:31 troulouliou_div2 joined #git
20:32 ergzay joined #git
20:33 tnecniv joined #git
20:34 red82 joined #git
20:34 kfoonamalik joined #git
20:34 ac3takwas joined #git
20:37 denisMone joined #git
20:38 heftig joined #git
20:40 dmc joined #git
20:45 balance2 joined #git
20:46 daey_ joined #git
20:47 daey_ how do i exlude a whole subfolder from being tracked by git? /folder/subfolder/* takes care of the subfolders content. /folder/subfolder doesnt seem to work. at least the folder still shows up in 'git status'
20:50 daey_ nvm. writing mistake
20:51 nwkj86 joined #git
20:52 robattila256 joined #git
20:52 lindenle joined #git
20:53 harwood joined #git
20:55 dreampwnzor joined #git
20:56 ncbi joined #git
20:57 heftig joined #git
20:58 contracode joined #git
20:58 harwood joined #git
20:59 cdg joined #git
21:00 jlebar joined #git
21:02 Sample joined #git
21:04 harwood joined #git
21:04 SwingShock left #git
21:06 snowkidind joined #git
21:08 aidalgol joined #git
21:13 bmahe joined #git
21:17 heftig joined #git
21:18 sirish joined #git
21:19 slappymcfry joined #git
21:21 zzz joined #git
21:22 jdiez joined #git
21:24 WaReZ joined #git
21:24 nettoweb joined #git
21:27 Ediz joined #git
21:29 menip joined #git
21:29 emerson joined #git
21:31 NeverDie joined #git
21:38 heftig joined #git
21:38 Sample joined #git
21:40 msonntag joined #git
21:41 achlys joined #git
21:43 WayToDoor joined #git
21:44 thebope joined #git
21:46 SDK514 joined #git
21:46 baryon joined #git
21:47 wcpan joined #git
21:47 AfroThundr joined #git
21:49 AfroThundr joined #git
21:50 martman i am very confused, whats the correct way to mirror two remotes?
21:50 martman i have my remote, and a official upstream remote i do not have control of
21:50 martman i would like to mirror all branches
21:53 dreiss joined #git
21:54 nkouevda joined #git
21:55 alyptik joined #git
21:56 Goplat joined #git
22:02 davimore_ joined #git
22:02 miczac joined #git
22:04 mehola joined #git
22:06 Domhack joined #git
22:06 rivarun joined #git
22:08 DrRobotic joined #git
22:08 anonymuse joined #git
22:12 sirish joined #git
22:14 yohnnyjoe joined #git
22:18 steelsw0rd joined #git
22:22 Cassiopaya joined #git
22:25 IlNominePatre joined #git
22:26 lindenle joined #git
22:29 c1arknova joined #git
22:32 nkouevda joined #git
22:35 kfoonamalik joined #git
22:35 nikivi joined #git
22:36 publio joined #git
22:36 treehug88 martman how about   git pull {remotename} --all
22:37 physikoi left #git
22:38 BenderRodriguez joined #git
22:39 [|SDK|] joined #git
22:46 [|SDK|] joined #git
22:47 acetakwas joined #git
22:50 nettoweb joined #git
22:51 nidr0x joined #git
22:52 Gsham joined #git
22:55 QuestionTime joined #git
22:56 QuestionTime joined #git
22:57 steelsw0rd joined #git
22:57 webdev007 joined #git
22:58 fatalhalt joined #git
23:01 fmeerkoetter joined #git
23:05 r4nd0m0ne joined #git
23:08 r4nd0m-0ne joined #git
23:15 r4nd0m0ne joined #git
23:19 denisMone joined #git
23:21 robics joined #git
23:22 forrestv joined #git
23:26 r4nd0m-0ne joined #git
23:29 sbeller joined #git
23:32 eagle_mike joined #git
23:44 quetz joined #git
23:44 thebope joined #git
23:45 ReptilianBrain joined #git
23:46 rorro joined #git
23:49 dreiss joined #git
23:49 Levex joined #git
23:50 red82 joined #git
23:50 Levex joined #git
23:50 jonwil joined #git
23:51 timothy joined #git
23:53 cqx joined #git
23:55 t0by joined #git
23:55 RustySha1kleford left #git
23:55 kloff joined #git

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