IRCloggy #git 2016-12-10

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2016-12-10

quetz joined00:00
oskarkv joined00:01
chadhinton left00:01
shgysk8zer0 joined00:02
HoierM left00:03
Lipp left00:03
Lipp joined00:03
fahadash left00:05
mizu_no_oto joined00:05
qpdb left00:06
moei joined00:06
chadhinton joined00:06
Dougie187 left00:07
railssmi_ joined00:07
ThomasLocke left00:07
chadhinton left00:07
fatalhalt left00:07
M-mistake left00:08
am2on left00:08
kineticrootkit[m left00:08
Dhanya[m] left00:08
Remramm left00:08
saintaquinas[m] left00:08
M-shine left00:08
unclechu left00:08
WillianPaiva[m] left00:08
Tiaan[m] left00:08
patrickr[m] left00:08
daopu[m] left00:08
scrambo[m] left00:08
musicmatze[m] left00:08
alaeri[m] left00:08
M-meznak left00:08
warrantyvoid left00:08
Mher[m] left00:08
eltopo[m] left00:08
mei[m] left00:08
samwise[m] left00:08
Sheogorath[m] left00:08
Ineentho[m] left00:08
mtso[m] left00:08
Carlos[m] left00:08
kjsage[m] left00:08
malo[m] left00:08
davix[matrix] left00:08
aviraldg left00:08
kikijiki[m] left00:08
M-nated left00:08
hallogallo[m] left00:08
timlyo[m] left00:08
Start[m] left00:08
monomon[m] left00:08
M64137[m] left00:08
srkrishna[m] left00:08
railssmith left00:09
ams__ left00:09
chadhinton joined00:09
finalbeta left00:10
anuxivm joined00:10
m0viefreak joined00:11
ghostlight left00:11
drochman joined00:11
chadhinton left00:11
r4nd0m0ne1 joined00:11
mizu_no_oto left00:12
Derderderd joined00:13
aarobc left00:13
Lipp left00:15
Joost joined00:15
ghostlight joined00:15
Lipp joined00:15
texinwien_ left00:15
r4nd0m0ne left00:15
texinwien_ joined00:15
chadhinton joined00:16
gitinfo set mode: +v00: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:16
Derderderd left00:18
corn13read joined00:18
Lipp left00:19
venmx joined00:21
thebope left00: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 joined00:23
LaydMonica joined00:23
thebope joined00:24
faux___ left00:25
kyan left00:25
chadhinton left00:27
thebope left00:28
mischat joined00:28
umpc joined00:30
Crell joined00:30
nwkj86 joined00:31
nikivi left00:32
madewokherd joined00:32
nikivi joined00: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:33
jottr left00:34
BlaXpirit joined00:34
jottr joined00:35
italoacasas joined00:36
mischat left00:36
corn13read left00:37
b3kN joined00:37
b3kN left00:37
b3kN joined00:37
HoierM left00:37
italoacasas left00:38
derk0pf left00:43
mizu_no_oto joined00:45
einnjo joined00:45
JamesBaxter joined00:46
Ryanar left00:49
Limes_ left00:51
ejb joined00:52
al-damiri left00:54
dsdeiz joined00:58
dsdeiz left00:58
dsdeiz joined00:58
cqi joined00:58
kyan joined00:58
Lipp joined00:58
spacelord_ left01:00
durham left01:00
durham joined01:01
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:02
dsdeiz left01: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
Hm. Drat.01:03
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" simultaneously01:04
eizua joined01:04
thiago you should introduce your own external locking01: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:04
git commit-tree is probably safe01:05
git update-ref takes the old SHA-1, so if it's been moved, it'll fail01:05
durham left01:05
thiago I just don't know if it copes with a race condition01:05
never mind, use a lock of your own01:05
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
But if another user simultaneously tries to write their own 2 blobs, they'll end up in the wrong commit.01:06
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:07
NeverTired left01:08
hfp joined01:08
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~501:10
That will let you rebase just the 5 most recent commits interactively.01:10
Emperor_Earth left01:10
Crell (Supply your own number as appropriate.)01:11
xall joined01:12
ColdKeyboard joined01:13
Derderderd joined01:14
thiago Crell: at least for the update-ref command01:17
hfp: git rebase -i --autosquash01:17
Crell thiago: At least which for the update-ref command?01:17
thiago Crell: the lock01:18
Crell: I think the other commands are safe to be run simultaneously01:18
asterismo_m joined01:18
Crell Really? I'd think update-ref is the least likely to be an issue.01:20
Derderderd left01:20
ajf- left01:20
xaa left01:20
Crell update-index being the most dangerous (as that's what builds the index before it gets committed).01:20
elsevero left01:21
cagedwisdom left01:21
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 call01:23
if you make more than one, it's non-atomic anymore01: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 joined01:24
dikiaap joined01: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 index01:25
so forget update-index01:25
Crell Because I want a single commit object that represents changing multiple files.01:25
Orly?01:25
Atrumx joined01:25
thiago that statement does not imply you need update-index01:26
anyway, you can use an index: one per line of work01: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 other01:26
Crell OK, I'm confused now.01:26
thiago forget the index01:27
that's the easiest way01:27
Crell Hm. OK...01:27
grawity joined01:27
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-tree01:28
and git update-ref01:29
thebope left01:29
Crell hasn't gotten to git mktree yet. What's that do?01:29
grawity left01:29
thiago makes at ree01: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 underneath01: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:30
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 ref01:31
peeps[lappy] left01:31
thiago you list all objects you want in the tree, regardless of whether they're old or new01:31
dreiss left01:32
Crell So the resulting command could be quite large.01:32
thiago no, because mktree reads from stdin :-)01:32
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
correct01:33
Crell Currently the application doesn't prevent anything. It's early enough that I can do what I want with it.01:33
(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-import01: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 one01:34
Crell That sounds yummy.01:34
thiago but it will not cope with two instances trying to update the same ref at the same time01:35
Crell If I need an application-level lock anyway, that's fine.01:35
I take it that means that command is not atomic, just a convenient shorthand for what we described above?01:35
thiago kinda01:36
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" command01:36
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 memory01:37
Crell: if you tell it to commit a removed file, it will do the same as git rm did01:38
Crell: that's what the -a does to git commit01:38
Crell Hm. So, it's sort of the plumbing version of commit -Am "foo" ?01:38
nwkj86 left01:38
thiago Crell: more, because you can stage multiple commits before saving01:38
Crell O_o01:39
thiago czart: sorry, the two lines above "if you tell" and "that's what the -a does" are for you01:39
czart thiago: Thanks.01:40
thiago Crell: not for you. The "more, because" is for you.01:40
Crell Race conditions! :-)01:40
joshszep left01:40
thiago yeah, because you've both got nicknames starting with c01:40
czart Hehe01:40
lxnch left01:40
railssmi_ left01:41
Crell fast-import is what push/pull use then, I presume?01:42
thiago no01:42
push and pull use send-pack and receive-pack01:42
Anja_ joined01:42
Crell Oh. Which I'm totally not going anywhere near at this point. :-)01:42
thiago I mean, upload-pack01:42
fast-import *creates* packs01:42
Crell You mean packfiles? Or by pack do you mean "set of commits and their data"?01:43
thiago packfiles01:43
shgysk8zer0 left01:43
thiago fast-import was created to make it easy to import from other version control systems01:43
Crell Ahhh...01:44
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 commands01:44
svm_invictvs left01:44
thiago it could be01:44
just remember that fast-import creates inefficient packfiles, trading off compression for time01:44
you'll want to repack the repository frequently after using it01:45
Crell Hm, OK.01:45
GC is also a task I'd want to lock, yes?01:45
thiago you can also look at libgit01:45
or libgit2, whatever it's called01:45
Anja left01:45
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
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 objects01:46
asterismo joined01:46
mischat joined01:47
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 yes01:48
unless you use subdirectories01: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:48
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
(including the :)01:49
ome joined01:49
thiago that's what gets stored, though in binary form. That's one tree object.01:49
Crell Hm.01:50
garethdaine left01: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:50
jon-mac joined01:51
thiago now you know why the index exists01:51
Crell How does the index help?01:51
Joost left01:51
thiago not in your case, the index per se01:52
but its purpose: keep a flat list of the contents of the next commit, ready to be sent01:52
mischat left01: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 trees01:52
and the root tree, of course01:52
Crell Right.01:53
breezy_ joined01:53
polyrob left01:53
thiago if you use mktree directly, you must to that dance yourself01:53
if you use fast-import, it'll do it for you01:53
Crell Ahhh...01:53
^7heo s/to/do/01:54
thiago ^7heo: yes01:54
^7heo I know :)01:54
polyrob joined01:55
Crell is reading through the man page for fast-import now, still looking for the how-to-use.01:55
grawity joined01:56
ejb left01:56
jottr_ joined01:57
jottr_ left01:58
grawity left01:59
Joost joined02:00
jottr left02:00
Ediz left02:04
svm_invictvs joined02:04
mizu_no_oto left02:04
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 shell02:05
ToBeCloud left02:06
preaction the book is telling you to let git handle the *, i suspect in case you already deleted the files themselves02:06
finalbeta joined02:06
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:08
Anja__ joined02:09
dsantiago left02:09
preaction .\*.txt is completely different, and like i said, 2 is your shell handling the *, and 3 is git handling the *02:09
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 git02:10
czart OK, I see, many thanks :)02:11
Anja_ left02:11
madewokherd left02: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:11
Does that sound like I'm on the right track?02:12
And then wrap that in a lockfile check to ensure atomicity.02:12
menip joined02:12
madewokherd joined02:13
Derderderd joined02:14
Jameser joined02:14
YuGiOhJCJ left02:17
Limes_ joined02:23
Ryanar joined02:23
Joost left02:24
Jameser left02:24
thebope joined02:25
grawity joined02:28
Limes_ left02:29
thebope left02:29
rorro left02:31
navidr left02:31
manuels left02:31
CEnnis91 joined02:34
grawity left02:34
cqi left02:37
a3Dman joined02:38
peeps[lappy] joined02:38
ojdo left02:39
King_Hual left02:39
baryon joined02:43
thiago Crell: not cat02:43
Crell: I recommend you open a pipe to fast-import02:44
popen() or similar02:44
star_prone joined02:44
Crell Ah, OK.02:44
Anja__ left02:45
Crell Hm, I hope that works in PHP in a non-CLI SAPI... :-)02:45
Anja joined02:45
ojdo joined02:46
ilbot3 left02:46
arman joined02:46
Sample left02:46
madebymarkca joined02:47
novas0x2a|laptop left02:48
mischat joined02:48
ilbot3 joined02:49
star_prone left02:49
arman left02:52
mischat left02:53
jimi_ left02:53
ColdKeyboardColdKeyboard_a02:54
rwb left02:56
arman joined02:56
ColdKeyboard joined02:56
arman left02:57
cdg_ joined02:57
pks left02:57
NeverTired joined02:58
geoid left02:58
Joost joined02:59
pks joined02:59
cdg left02:59
breezy_ left03:01
quetz left03:03
publio left03:03
ColdKeyboard_a left03:03
Sasazuka left03:04
joshszep joined03:07
Joost left03:09
dsantiago joined03:12
sdothum left03:13
LaydMonica left03:13
ColdKeyboard left03:14
ColdKeyboard joined03:14
unreal_unreal03:16
Derderderd left03:16
sdothum joined03:17
DeltaHeavy joined03:18
holgersson left03:20
Joost joined03:20
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 appropriate03:21
directory:03:21
COMMIT_EDITMSG FETCH_HEAD HEAD ORIG_HEAD branches config description hooks index index.lock info logs objects packed-refs refs03:21
arescorpio joined03:21
snowkidind left03:21
[cust] left03: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 joined03:22
nettoweb joined03:22
DeltaHeavy 'git checkout' resets none of it.03:22
Running this from cmd does the same thing...03:23
chachasmooth left03:24
DeltaHeavy I've tried rebooting. It's Windows 703:25
chachasmooth joined03:26
grawity joined03:26
thebope joined03:26
dreiss left03:26
anuxivm left03:29
nettoweb left03:29
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
I mean 'build-git.html', not 'thing.html'03:31
thebope left03:32
LordRyan left03:33
r4nd0m0ne1 left03:35
r4nd0m0ne1 joined03:35
_jmleo joined03:35
LordRyan joined03:35
ignarps left03:35
cdown left03:35
jmleo left03:35
zyxep joined03:36
grawity left03:36
Joost left03:36
DeltaHeavy I hope it's not this: http://stackoverflow.com/questions/2016404/git-status-shows-modifications-git-checkout-file-doesnt-remove-them03:36
ignarps joined03:36
ketas joined03:36
cdown joined03:36
fatalhalt joined03:36
sunri5e left03:37
buffal0 joined03:37
sunny256_ joined03:37
epist3me_ joined03:37
cite joined03:37
cagedwisdom joined03:37
spb_ joined03:37
misha_ joined03:37
BlessJah_ joined03:37
Juri_Agarin joined03:37
RustySha1kleford joined03:37
FilipNor1ic joined03:37
doppo_ joined03:37
colona_ joined03:37
xkr47_ joined03:37
ixian8 joined03:37
jj-_ joined03:37
rudi_s_ joined03:38
vmiklos joined03:38
thiago DeltaHeavy: you're in the wrong dir03:38
wtfova joined03:38
Gaga left03:38
Slush-_ left03:38
doppo left03:38
meZee left03:38
doppo_doppo03:38
ixian left03:38
spb left03:38
BlessJah left03:38
spb_spb03:38
Hello71 joined03:38
meZee- joined03:38
mrnuke joined03:38
eagle_mike joined03:39
meZee-meZee03:39
sunri5e joined03:39
grawity joined03:39
DeltaHeavy thiago Nope, pwd says I'm in the right one03:39
And I see all the files after doing 'cd .. && cd ~-'03:39
Which is weird03:40
thiago there you go03:40
you were in the wrong dir03:40
DeltaHeavy No, ~- is an alias to your last dir03:40
But 'git checkout' still shows everything as deleted and I can't seem to change that.03:40
Only the few files modified stay modified03:40
thiago do you have the files: config, index, packed-refs?03:41
cmn joined03:41
DeltaHeavy Inside ./.git03:41
thiago right, that's the *wrong* dir03:42
nopf joined03:42
thiago don't go inside .git03:42
styx_ joined03:42
DeltaHeavy ./.git meaning I'm inside ., and looking inside .git from .03:42
thiago are you outside .git?03:42
jimi_ joined03:42
thiago ok03:42
DeltaHeavy ./.git, not .03:42
Slush- joined03:42
thiago pastebin the output of git status, please03:42
ghostlight left03:43
Lope joined03:43
DeltaHeavy It's thousands of lines long and contains the entire map of all of our files which is confidential03:43
grawity left03: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 green03:43
?03:43
DeltaHeavy Yep, they're staged.03:43
thiago ok03:43
and you want to restore them?03:43
DeltaHeavy They're not actually deleted though03:44
thiago ok, pick one file. Does it:03:45
a) appear in the "staged" list?03:45
b) appear in the "not staged" list03:45
DeltaHeavy a) Yes03:45
dreiss joined03:45
thiago c) exist?03:45
DeltaHeavy b) None03:45
cagedwisdom left03:46
thiago yes or no?03:47
DeltaHeavy b) They all exist03:47
c*03:47
Sorry, was double checking a bunch of files to make sure03:47
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 Yes03:47
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 --hard03:48
thiago None03:48
thiago nothing?03:48
ghostlight joined03:48
thiago do you have a .gitignore file?03:48
DeltaHeavy Yep03:48
thiago could it be ignoring everything?03:48
mischat joined03:49
grawity joined03: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:49
thiago do you have an environment variable whose name starts with GIT set?03:50
Joost` joined03:50
madebymarkca left03:51
eagle_mike left03:52
jimi_ left03:52
novas0x2a|laptop joined03:53
grawity left03:53
mischat left03:54
nikivi left03:54
DeltaHeavy How can I check that?03:54
~/.zshrc and the global one?03:54
thiago env | grep GIT03:54
DeltaHeavy Nope03:54
Nothing03:54
thiago ok03:55
try to git add one of the files listed as deleted03:55
what does git add tell you?03:55
astrofog left03:55
dreiss left03:55
DeltaHeavy deleted >:03:55
thiago huh?03:55
bruce_lee left03:56
bruce_lee joined03:56
asterismo left03:56
DeltaHeavy Makes no difference to the output of 'git status'03:56
sdothum left03:57
hexagoxel left03:57
thiago did git add say anything? or did it exit with no output?03:57
hexagoxel joined03:57
DeltaHeavy exit with no output03:58
fatalhalt left03:58
thiago was it an exit with success?03:58
was $? zero?03:58
cagedwisdom joined03:58
DeltaHeavy Success yes04:00
dsdeiz joined04:00
grawity joined04:00
thiago run git status again. Is the file still listed as deleted?04:00
Joost` left04:01
DeltaHeavy one momenat04:03
sdothum joined04:04
grawity left04:05
ahmed_elgabri left04:06
[cust] joined04:06
DeltaHeavy Back, the file is still lited04:06
listed as deleted*04:07
star_prone joined04:07
dsdeiz left04:08
thiago this is really weird04:08
to confirm: you want to discard whatever git things you had staged, right?04:08
just go back to the original state04:08
DeltaHeavy I just finished saving all of my files04:09
grawity joined04:09
DeltaHeavy Out of the repo04:09
texinwien_ left04:09
DeltaHeavy Trying: git rm --cached -r . && git reset --hard HEAD04:09
cagmz_ joined04:10
DeltaHeavy Seems like it's rechecking out all the files now it thinks are deleted04:10
Which will take a while04:11
star_prone left04:11
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
buffal0 left04:13
grawity left04:13
Derderderd joined04:13
cagmz left04:13
Joost` joined04:13
Vortex35 joined04:14
dsdeiz joined04:14
mentazoom left04:14
DeltaHeavy Fantastic! It worked. Thanks for your help thiago04:15
cagmz_ left04:15
Zamerick left04:16
Vortex34 left04:16
grawity joined04:17
Derderderd left04:18
buffal0 joined04:18
ismithers joined04:20
grawity left04:21
fstd_ joined04:22
fstd left04:22
fstd_fstd04:22
grawity joined04:23
NeonSynth left04:25
Joost` left04:26
hanetzer left04:26
grawity left04:27
geoid joined04:28
di0_ left04:29
bocaneri joined04:31
grawity joined04:32
geoid left04:34
cyan__ joined04:35
buffffal00 joined04:35
buffal0 left04:35
grawity left04:36
Joost` joined04:40
cagmz joined04:40
dodobrain joined04:43
dodobrain left04:44
dreiss joined04:44
grawity joined04:45
di0_ joined04:45
dodobrain joined04:46
[Saint] left04:47
sdothum left04:48
[Saint] joined04:48
grawity left04:49
mischat joined04:50
t-mart left04:50
grawity joined04:52
dreiss left04:53
DeltaHeavy left04:53
tmsmith left04:54
Joost` left04:54
t-mart joined04:54
buffffal00 left04:54
mischat left04:54
breezy_ joined04:55
xlegoman left04:56
grawity left04:56
menip left04:57
JamesBaxter left04:58
qqx left04:59
grawity joined05:00
qqx joined05:01
skirk left05:01
TikityTik joined05:02
TikityTik How do I fork my own repo?05:02
Jameser joined05:02
cagmz_ joined05:03
Lyqyd joined05:03
grawity left05:04
preaction TikityTik: do you mean on github?05:04
TikityTik preaction: yes05:04
preaction you don't05:05
what are you trying to achieve with this?05:05
TikityTik preaction: just backing everything up before I make my stuff public05:06
cagmz left05:06
preaction what?05:06
how is forking your own project going to do that?05:06
grawity joined05:07
TikityTik ah I got it working, I had to actually make the repo on the website itself05:08
tnecniv left05:08
Joost` joined05:09
preaction i'm still not sure how this is going to achieve what you want05:09
arescorpio left05:10
tnecniv joined05:10
tnecniv left05:11
Derderderd joined05:13
GT4066 joined05:15
grawity left05:15
grawity joined05:17
Derderderd left05:18
cdg_ left05:21
[Saint] thiago: you still around?05:22
thiago [Saint]: yes05:22
[Saint] Is the behavior you mentioned with gitconfig location version specific?05:23
thiago not that I know of05:23
it must have been supported for at least a couple of years05:23
[Saint] My system seems to gleefully disregard both ~/.config/git/config and /etc/*05:24
saint@saint-gittest:~$ git config --global --list05:24
fatal: unable to read config file '/home/saint/.gitconfig': No such file or directory05:24
aruns joined05:25
subhojit777 joined05:25
thiago what version is that?05:25
[Saint] kinda old-ish:05:26
saint@saint-gittest:~$ git --version05:26
git version 1.7.9.505:26
Joost` left05:26
thiago 1.7 is ancient05:26
try something from the last year or two05:26
[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:27
something something, don'05:28
t touch a running system05:28
grawity left05:28
thebope joined05:29
grawity joined05:30
QualityAddict joined05:31
Lyqyd left05:31
geoid joined05:31
lindenle left05:32
lindenle joined05:32
pks left05:32
pks joined05:33
BlessJah_BlessJah05:33
thebope left05:33
zerozero joined05:34
Sample joined05:34
sssilver joined05:34
geoid left05:35
sssilver left05:36
Lope left05:37
dikiaap left05:38
dsdeiz left05:39
lindenle left05:39
lindenle joined05:40
Joost` joined05:40
xall left05:41
aruns left05:44
vdv joined05:46
mischat joined05:51
Joost` left05:51
Cabanossi left05:52
Cabanossi joined05:52
grawity left05:52
mischat left05:55
ome left05:55
Goplat joined05:57
grawity joined05:58
dikiaap joined05:58
cyan__ left05:58
menip joined06:00
aruns joined06:00
Joost` joined06:01
grawity left06:02
grawity joined06:06
Sample left06:10
grawity left06:11
Derderderd joined06:14
Joost` left06:17
Derderderd left06:19
lindenle left06:19
lindenle joined06:20
lindenle left06:24
Joost` joined06:25
murgi joined06:25
madewokherd left06:26
menip left06:26
jstimm joined06:26
Anthaas joined06:28
murgi left06:30
lindenle joined06:31
geoid joined06:32
subhojit777 left06:32
yaewa joined06:32
donught joined06:33
moei left06:34
grawity joined06:35
geoid left06:36
Joost` left06:37
[0xAA] joined06:39
romerocesar joined06:39
[0xAA] left06:39
grawity left06:39
fatalhalt joined06:40
grawity joined06:41
svm_invictvs left06:42
svm_invictvs joined06:43
baryon left06:43
Joost` joined06:47
mischat joined06:51
grawity left06:51
baobao left06:53
grawity joined06:53
cagmz_ left06:53
Nilesh_ joined06:53
dsdeiz joined06:54
dsdeiz left06:54
dsdeiz joined06:54
svm_invictvs left06:55
kyan left06:55
Ryanar left06:55
mischat left06:56
[0xAA] joined06:56
kumarsuraj joined06:57
einnjo left06:58
grawity left06:59
grawity joined07:01
altendky left07:01
Sample joined07:01
iamtakingiteasy left07:01
boombatower left07:02
Joost` left07:02
romerocesar left07:04
relgar left07:05
Lipp left07:07
Bigcheese joined07:08
grawity left07:08
donught left07:09
relgar joined07:09
martman joined07:11
red82 joined07:13
Anja left07:13
grawity joined07:14
Derderderd joined07:15
Joost` joined07:16
grawity left07:19
[Saint] left07:21
navidr joined07:21
ToBeFree left07:22
iliv joined07:22
Derderderd left07:22
brokensyntax joined07:22
grawity joined07:23
swalladge joined07:24
Sample left07:24
[Saint] joined07:24
Lipp joined07:27
mmattice left07:27
mmattice joined07:27
AustinMatherne left07:28
AustinMatherne joined07:28
grawity left07:28
Joost` left07:30
quetz joined07:30
geoid joined07:33
Lipp left07:33
Lipp joined07:35
geoid left07:37
ToBeFree joined07:38
Joost` joined07:40
nivag left07:41
sunny256_sunny25607:42
lindenle left07:42
TikityTik left07:43
grawity joined07:43
Joost` left07:52
mischat joined07:52
eizua left07:52
grawity left07:52
zerozero[bite]07:53
fatalhalt left07:55
[bite][tag]07:55
grawity joined07:55
Goplat left07:55
vuoto joined07:55
GodEater` joined07:56
[tag]zerozero07:56
zerozero[bite]07:56
mischat left07:56
grawity left07:59
fearless_man left08:00
jknetl joined08:01
fearless_man joined08:01
Joost` joined08:05
Lipp left08:06
rominronin joined08:06
grawity joined08:07
vuoto left08:08
GodEater` left08:08
GodEater joined08:09
GodEater left08:09
GodEater joined08:09
kumarsuraj left08:09
Lipp joined08:12
grawity left08:13
Derderderd joined08:15
grawity joined08:15
[bite] left08:15
Joost` left08:15
thesha joined08:17
zzz_ joined08:18
grawity left08:19
jmleo joined08:20
GenteelBen joined08:20
vdv left08: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
Orion3k left08:20
GenteelBen Is this channel +r?08:20
Lipp_ joined08:21
mar77i_ joined08:21
Electrom_ joined08:21
bronson_ joined08:21
peepsalot left08:21
_jmleo left08:21
Electrometro left08:21
Lipp left08:21
DonRichie left08:21
noodle left08:22
thesha hi08:22
blahdodo left08:22
m___ left08:22
thesha I am getting this error while using git send-email command08:23
brokensyntax left08:23
mar77i left08: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` joined08:23
brokensyntax joined08:23
bronson left08:23
DonRichie joined08:23
Karazhan left08:24
blahdodo joined08:24
chridal joined08:24
Karazhan joined08:24
GenteelBen left08:24
noodle joined08:25
geoid joined08:25
thesha anyone knows here?08:26
grawity joined08:28
m___ joined08:29
zzz_ left08:29
peepsalot joined08:30
holgersson joined08:30
thebope joined08:31
mellernoia joined08:32
grawity left08:33
vuoto joined08:33
InfoTest joined08:33
dreiss joined08:33
subhojit777 joined08:34
thesha left08:35
irqq left08:36
thebope left08:36
grawity joined08:36
m___ left08:36
rominronin left08:36
kumarsuraj joined08:38
thesha joined08:38
Joost` left08:38
mar77i_mar77i08:39
mellernoia left08:39
shampine joined08: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:40
iliv left08:42
[0xAA] left08:42
ayogi joined08:42
iliv joined08:43
grawity left08:43
mahendratech joined08:45
fcrick_ joined08:45
edaught left08:46
fcrick_fcrick08:46
grawity joined08:46
jrnieder left08:47
derk0pf joined08:47
jrnieder joined08:47
andschwa joined08:48
grawity left08:50
ski7777 left08:51
thesha Is this channel is active?08:52
mischat joined08:53
breezy_ left08:53
grawity joined08:53
Shentino left08:54
meZee left08:54
mattcen left08:54
asd5a joined08:56
Joost` joined08:56
grawity left08:57
mischat left08:58
rominronin joined08:58
ski7777 joined08:58
zzz_ joined08:58
meZee joined08:59
mattcen joined09:00
warthog19 joined09:00
QuestionTime joined09:02
grawity joined09:02
dreiss left09:02
_ikke_ thesha: it sure is09:03
oskarkv: is there a .gitattributes file?09:04
Nilesh_ left09:04
Oebele joined09:04
oskarkv _ikke_: no, but apparently autocrlf is for if you want CRLF in working directory09:05
So I turned that off09:05
shampine left09:05
jstimm left09:05
cagedwisdom left09:05
parasite_ left09:05
freimatz left09:05
adymitruk left09:05
runlevl4 left09:05
warthog19warthog909:05
babilen left09:06
babilen joined09:06
jknetl left09:06
Shentino joined09:06
Shentino left09:07
_ikke_ ok09:07
runlevl4 joined09:07
thesha _ikke_: i thought its dead09:08
Joost` left09:08
grawity left09:09
shampine joined09:11
jstimm joined09:11
cagedwisdom joined09:11
parasite_ joined09:11
freimatz joined09:11
adymitruk joined09:11
Ankhers joined09:11
wtfova left09:11
Crell left09:13
_ikke_ nah09:13
overlord_tm joined09:13
_ikke_ there are 1133 people in this channel now (not that they are all active :P)09:13
mahendratech left09:14
parasite_ left09:16
grawity joined09:16
thesha _ikke_: nobody is replying thats why i said this.09:17
zzz_ left09:17
_ikke_ It's weekend09:18
It's early morning in europe and late night in the US09:18
So yeah, less people are active now09:18
To answer your question:09:19
gmail has increased there security policy09:19
parasite_ joined09:19
thesha _ikke_: i turned secure off09:20
s/secure/security/09:20
jnavila joined09:21
thesha but still getting error09:21
Shentino joined09:23
Jameser left09:23
Lipp_ left09:24
iliv left09:24
Lipp joined09:26
thesha left09:26
Joost` joined09:29
Oebele left09:32
thebope joined09:32
Oebele joined09:32
shampine left09:32
jstimm left09:32
cagedwisdom left09:32
freimatz left09:32
adymitruk left09:32
Ankhers left09:32
shampine joined09:33
jstimm joined09:33
cagedwisdom joined09:33
freimatz joined09:33
adymitruk joined09:33
Ankhers joined09:33
jnavila left09:34
thebope left09:36
iliv joined09:37
Joost` left09:40
mar77i_ joined09:41
KevinDF joined09:41
thesha joined09:42
watabou left09:42
KevinDF left09:42
KevinDF joined09:42
lindenle joined09:43
thesha left09:43
mar77i left09:43
xaa joined09:43
[|SDK|] joined09:44
YuGiOhJCJ joined09:46
ahmedelgabri joined09:46
mar77i_mar77i09:46
Lipp left09:48
Lipp joined09:48
Oebele left09:51
rominronin left09:51
tvw joined09:51
lindenle left09:51
SteffanW joined09:52
mischat joined09:54
Shentino left09:55
grawity left09:56
grawity joined09:58
Shentino joined09:58
mischat left09:59
drizbit joined10:01
eizua joined10:02
veverak joined10:02
pks left10:02
veverak hi folks, is it somehow possible to "pull" uncommited things ? and untracked things?10:02
I mean, I can do that with rsync. but that also copies files that should be ignored by git ;)10:03
pks joined10:03
grawity left10:04
MrWoohoo left10:04
thesha joined10:05
rominronin joined10:05
cyan__ joined10:06
grawity joined10:06
veverak hmm10:08
--filter=':- .gitignore' should work evidently10:08
adymitruk left10:10
grawity left10:10
grawity joined10:12
nivag joined10:12
mda1 joined10:12
venmx left10:14
tvw left10:14
thesha left10:15
_ikke_ No, you cannot10:17
you can only fetch history, and everythin uncomitted or untracked is not part of history10:17
vuoto left10:17
InfoTest left10:19
veverak I mean, it looks like I can use .gitignore with rsync via arg I pasted10:19
_ikke_ right10:20
KevinDF left10:21
KevinDF joined10:21
tarkus joined10:22
mda1 left10:23
ismithers left10:23
acetakwas joined10:23
robotroll joined10:25
KevinDF left10:25
KevinDF joined10:25
KevinDF left10:26
KevinDF joined10:26
KevinDF left10:26
thesha joined10:27
Jackneill_ joined10:29
GT4066 left10:31
red82 left10:32
thebope joined10:33
texinwien_ joined10:33
thesha left10:34
quetz left10:34
cagedwisdom left10:34
ayogi left10:35
thebope left10:37
derk0pf left10:38
mda1 joined10:39
[0xAA] joined10:42
Vortex35 left10:45
derk0pf joined10:48
elsevero joined10:50
oskarkv left10:54
Orphis joined10:54
satifant joined10:55
oskarkv joined10:55
pbrewczynski joined10:57
iliv left10:57
thesha joined10:59
iliv joined10:59
buffal0 joined11:03
tarkus left11:05
miczac joined11:06
gitinfo set mode: +v11:06
WhiskerBiscuit joined11:06
linux_dog2 joined11:07
derk0pf left11:09
tarkus joined11:10
iliv left11:10
venmx joined11:13
buffal0 left11:13
Dazzyp joined11:13
Darcidride joined11:13
grawity left11:15
grawity joined11:16
NeverDie left11:17
mikecmpbll joined11:19
derk0pf joined11:20
joshszep left11:20
geoid left11:20
derk0pf left11:22
elsevero left11:24
b_rare joined11:24
rindolf joined11:24
b_rare left11:25
f4 left11:30
King_Hual joined11:30
iliv joined11:31
acetakwas left11:32
ac3takwas joined11:33
SteffanW left11:33
thebope joined11:34
rominronin left11:37
thebope left11:38
venmx left11:41
derk0pf joined11:42
Limes_ joined11:45
iliv left11:47
Guest36_ joined11:50
iliv joined11:51
Guest36_ left11:52
Xploit0 joined11:53
Ediz joined11:55
rominronin joined11:55
elsevero joined11:57
elsevero left11:58
Xploit0 left11:58
vdv joined11:58
vdv left11:58
Xploit0 joined11:59
robattila256 left11:59
mkoskar left12:00
treehug88 left12:00
mkoskar joined12:02
alex1a_ left12:03
iliv left12:03
Xploit0 left12:03
WayToDoor joined12:04
Xploit0 joined12:05
ShekharReddy joined12:07
tarkus left12:07
Xploit0 left12:07
ShekharReddy left12:10
venmx joined12:12
flavius joined12:14
mikecmpbll left12:17
finalbeta left12:20
finalbeta joined12:20
Darcidride left12:21
yaewa left12:21
Darcidride joined12:22
NicoHood joined12:24
asterismo_m left12:24
HoierM joined12:24
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 joined12:25
nettoweb joined12:26
rominronin left12:28
nanga joined12:28
rindolf NicoHood: use --prefix12:29
NicoHood: git help archive12:29
NicoHood rindolf: aaah. I used it without a slash. now it works. if you dont use a slash its not created as folder12:30
yohnnyjoe joined12:34
inflames left12:34
rindolf NicoHood: nice. :-)12:35
NicoHood rindolf: for .xz i need to use my own command i guess?12:35
rindolf NicoHood: don't know12:35
processkiller joined12:37
treehug88 joined12:38
inflames joined12:44
_ikke_ rindolf: Yeah, just pipe a tar archive through something that creates an xz archive12:44
kumarsuraj left12:47
vrlx joined12:47
Ediz left12:49
fracting joined12:49
babilen left12:51
brokensyntax left12:51
relgar left12:51
Juri_Agarin left12:51
sunny256 left12:51
ignarps left12:51
__main__ left12:51
dmc left12:51
cyberz left12:51
Celelibi left12:51
invisbl left12:51
leprechau left12:51
lb1c left12:51
uranellus left12:51
jab416171 left12:51
likewhoa left12:51
tuor left12:51
texasmynsted left12:51
trondth left12:51
jesk left12:51
m1dnight_ left12:51
babilen joined12:52
brokensyntax joined12:52
relgar joined12:52
Juri_Agarin joined12:52
sunny256 joined12:52
ignarps joined12:52
__main__ joined12:52
dmc joined12:52
cyberz joined12:52
Celelibi joined12:52
invisbl joined12:52
leprechau joined12:52
lb1c joined12:52
uranellus joined12:52
jab416171 joined12:52
likewhoa joined12:52
tuor joined12:52
texasmynsted joined12:52
trondth joined12:52
jesk joined12:52
m1dnight_ joined12:52
dooglius joined12:52
glebihan_ joined12:52
phroa joined12:52
Guest46272 joined12:52
mgoodwin joined12:52
lamont joined12:52
midgetspy joined12:52
markovh joined12:52
Spydar007 joined12:52
jdiez joined12:52
Remram joined12:52
jamick joined12:52
nephyrin` joined12:52
verne.freenode.net set mode: +v12:52
Karazhan left12:52
dooglius left12:52
Karazhan joined12:53
dooglius joined12:53
leeN left12:53
thinkpad left12:54
processkiller left12:54
leeN joined12:55
ghostlight left12:55
invisbl left12:57
thinkpad joined12:57
aiena joined12:58
tmsmith joined12:59
invisbl joined12:59
aca20031 left13:00
QualityAddict left13:00
pothepanda joined13:02
ghostlight joined13:05
manuels joined13:07
cqi joined13:09
tarkus joined13:10
cqi left13:10
fmcgeough joined13:10
cqi joined13:10
linux_dog2 left13:14
jnavila joined13:14
sdothum joined13:15
thesha left13:18
YuGiOhJCJ left13:18
systemovich joined13:20
systemovich left13:21
lucianangelus joined13:21
_Cyclone_ left13:21
SteveCharleston joined13:21
systemovich joined13:22
fmcgeough left13:22
sdothum left13:22
_Cyclone_ joined13:22
fmcgeough joined13:23
Nilesh_ joined13:24
_Cyclone_ left13:24
sdothum joined13:25
_Cyclone_ joined13:25
yohnnyjoe left13:28
ac3takwas left13:28
d0nn1e left13:28
systemovich left13:28
systemovich joined13:29
SteveCharleston left13:31
d0nn1e joined13:31
finalbeta left13:33
buffal0 joined13:33
mentazoom joined13:34
thesha joined13:34
jnavila left13:34
ace_33 joined13:35
mentazoom left13:38
Backwards joined13:40
rudi_s_rudi_s13:40
_Cyclone_ left13:41
jstein_ joined13:41
ac3takwas joined13:41
jooni joined13:42
jstein_jstein13:43
jnavila joined13:44
nikivi joined13:44
thesha left13:45
denisMone joined13:45
yohnnyjoe joined13:46
dikiaap left13:48
Ryanar joined13:48
Tanfrieze joined13:48
lindenle joined13:49
misha_ left13:49
shinnya joined13:49
serialoverflow left13:50
buffffal00 joined13:51
misha joined13:52
misha left13:52
misha joined13:52
nikivi left13:52
serialoverflow joined13:52
misha left13:52
misha joined13:52
misha left13:52
dsdeiz left13:53
lindenle left13:53
misha joined13:53
buffal0 left13:54
Endarked joined13:55
misha left13:58
misha joined13:58
misha left13:58
acln joined13:59
ac3takwas left14:02
Backwards left14:03
m0viefreak left14:03
mikecmpbll joined14:05
romerocesar joined14:06
Endarked left14:06
byte512 joined14:07
romerocesar left14:10
tarkus left14:10
robotroll left14:11
gitinfo set mode: +v14:12
fmcgeough left14:12
ac3takwas joined14:14
Zamerick joined14:15
robotroll joined14:15
jost joined14:16
jnavila left14:17
tarkus joined14:17
spr0tsuki left14:17
spr0tsuki joined14:18
buffffal00 left14:18
nwkj86 joined14:18
Limes_ left14:20
ahmed_elgabri joined14:21
spr0tsuki left14:23
ahmedelgabri left14:23
texinwien_ left14:27
jstein left14:29
denisMone left14:30
pks left14:30
jstein_ joined14:30
pks joined14:31
jstein_jstein14:32
chele joined14:36
thebope joined14:36
ac3takwas left14:36
aruns left14:37
eizua left14:38
aiena left14:40
ac3takwas joined14:40
Learath2 left14:40
thebope left14:41
rominronin joined14:42
miczac left14:43
balance joined14:44
balance hi14:44
ac3takwas left14:45
subhojit777 left14:45
converge joined14:45
converge I deleted a file in my local repository, how to get the copy of this file that is in remote repos. ?14:46
git status returns: deleted: README.md14:46
dsdeiz joined14:47
converge fetch / reset hard ?14:48
jimi_ joined14:48
ispn joined14:50
nettoweb left14:52
f4 joined14:52
_Cyclone_ joined14:52
Dreadnaught joined14:53
Dreadnaught left14:53
Dreadnaught joined14: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.md14:54
jimi_ left14:55
a_thakur joined14:55
QuestionTime left14:56
czart left14:57
m0viefreak joined14:57
converge treehug88: tks14:59
tarkus left15:00
johnmilton joined15:00
pbrewczynski left15:00
[0xAA] left15:03
nwkj86 left15:05
nettoweb joined15:05
[0xAA] joined15:05
ace_33 left15:05
dsdeiz left15:06
[0xAA] left15:07
JamesBaxter joined15:08
[0xAA] joined15:12
cbegin joined15:13
johnmilton left15:16
JamesBaxter left15:18
aca20031 joined15:24
JamesBaxter joined15:24
sea-gull_ joined15:24
blackwind_123 left15:26
Lipp left15:28
Lipp joined15:28
ismaris joined15:30
Lipp left15:31
altendky joined15:31
Lipp joined15:32
mellernoia joined15:32
manuels left15:36
meadmoon joined15:39
ToBeCloud joined15:39
gitinfo set mode: +v15:39
balance left15:39
JamesBaxter left15:40
AfroThundr left15:41
overbyte joined15:42
Cavallari joined15:43
Khisanth left15:44
meadmoon left15:46
Learath2 joined15:47
blackwind_123 joined15:48
whitby left15:48
[0xAA] left15:51
JamesBaxter joined15:51
davimore left15:53
[0xAA] joined15:53
menip joined15:54
Khisanth joined15:57
buffal0 joined15:58
anonymuse joined15:59
miczac joined16:00
gitinfo set mode: +v16:00
dreiss joined16:01
re1 joined16:02
Vortex34 joined16:03
JamesBaxter left16:03
sq-one joined16:04
dodobrain left16:04
jost left16:05
buffal0 left16:06
cbegin left16:07
JamesBaxter joined16:07
anonymuse left16:07
anonymuse joined16:09
a_thakur left16:11
anonymuse left16:12
DrRobotic joined16:13
miczac left16:16
mizu_no_oto joined16:16
converge left16:19
GavinMagnus joined16:21
DeltaHeavy joined16:23
HM joined16:24
nivag left16:27
GavinMagnus left16:27
chele left16:27
WayToDoor left16:27
denisMone joined16:27
texinwien_ joined16:29
shinnya left16:30
cqi left16:30
PCatinean joined16:31
watabou joined16:37
derk0pf left16:38
robotroll left16:39
JamesBaxter left16:41
derk0pf joined16:41
b3kN left16:41
GavinMagnus joined16:43
ejb joined16:45
SwiftMatt joined16:46
WayToDoor joined16:46
JamesBaxter joined16:48
GavinMagnus left16:48
mizu_no_oto left16:48
red82 joined16:50
SwiftMatt left16:51
fracting left16:52
[0xAA] left16:53
function joined16:54
czart joined16:54
Limes_ joined16:54
sirish joined16:54
balance joined16:55
Crell joined16:55
Crell left16: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:56
balance1 joined16:58
miczac joined16:59
gitinfo set mode: +v16:59
rominron_ joined17:00
balance left17:01
JamesBaxter left17:01
niels_ joined17:02
ismaris left17:02
m0viefreak left17: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:03
rominronin left17:03
miczac left17:04
balance2 joined17:05
niels_ left17:06
jnavila joined17:07
balance1 left17:09
rindolf Jonuz: can you start a new branch off master?17:09
DrRobotic left17:10
yohnnyjoe left17:10
kadoban JelmerD: revert the revert of the merge17:10
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 date17:11
rindolf Jonuz: how about applying a new diff?17:13
niels_ joined17:14
xlegoman joined17:14
thebope joined17: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 master17:14
menip left17:15
rindolf Jonuz: I don't follow17:15
brent__ joined17:15
thebope left17:19
denisMone left17:20
fatalhalt joined17:21
miczac joined17:24
gitinfo set mode: +v17:24
Sample joined17:25
publio joined17:26
niels_ left17:26
publio left17:27
ahmedelgabri joined17:29
watabou left17:29
ahmed_elgabri left17:30
sirish left17:32
sirish joined17:32
Lipp_ joined17:33
ayogi joined17:34
Lipp left17:34
jason237 joined17:36
Guest62340 joined17:38
fatalhalt left17:38
cyan__ left17:39
navidr left17:41
function left17:41
zzz__ joined17:41
xaa left17:42
jason237 left17:42
jason237 joined17:45
WayToDoor left17:45
YuGiOhJCJ joined17:46
WayToDoor joined17:46
Cavallari left17:47
Sample left17:47
menip joined17:47
lindenle joined17:51
red82 left17:52
mda joined17:52
lindenle left17:55
converge joined17:55
mda1 left17:55
SuperSeriousCat left17:58
function joined17:58
SuperSeriousCat joined17:58
denisMone joined17:58
ejb left17:59
lucianangelus left18:00
hhee joined18:01
cagmz joined18:02
Guest62340 left18:02
Goplat joined18: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
dunno stack tech :)18:02
how often do you use it?18:03
dreiss left18:03
texinwien_ left18:03
jason237 left18:03
umpc left18:05
ToBeCloud left18:06
function left18:06
function joined18:08
sirish left18:12
functiontrout18:15
thebope joined18:15
j416 hhee: it'll be merged, yes18:16
hhee: I rarely use it for the case you mention. I use separate branches instead.18:16
dreiss joined18: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 anyway18:17
I rarely keep a stash for longer than a few seconds18:17
but ymmv I suppose18:17
dikiaap joined18:18
processkiller joined18:18
DeltaHeavy left18:18
mellernoia left18:19
cagmz left18:20
thebope left18:20
trout left18:21
hhee j416, thx, got it18:21
j416 o/18:21
a3Dman left18:22
govg joined18:25
dsdeiz joined18:29
dsdeiz left18:29
dsdeiz joined18:29
nwkj86 joined18: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 over18:31
im doing a get remote update and a git push origin --all18:32
but that doesnt seem to actually mirror the 2 different sources18:32
i dont even see all the official branches on my remote18:32
how should i be going about this?18:32
dsdeiz left18:34
QualityAddict joined18:34
rivarun left18:35
rivarun joined18:36
a3Dman joined18:36
ayogi left18:37
kfoonamalik left18:38
rivarun left18:38
byte512 left18:39
heftig left18:39
denisMone left18:40
[0xAA] joined18:41
Lipp_ left18:41
rivarun joined18:41
heftig joined18:42
Lipp joined18:42
zzz__zzz18:44
Nilesh_ left18:44
QualityAddict left18:45
fatalhalt joined18:45
davimore joined18:46
Lipp left18:47
Goplat left18:49
dirtyroshi joined18:49
cagedwisdom joined18:50
rominron_ left18:50
inovas left18:51
Derderderd left18:52
cbreak martman: git push --all only pushes local refs18:53
martman: try git clone --mirror to get the local repo18:54
Domhack_ left18:56
Domhack_ joined18:56
inovas joined18:58
cagedwisdom left18:59
miczac left18:59
heftig left19:03
miczac joined19:03
gitinfo set mode: +v19:03
heftig joined19:04
QualityAddict joined19:04
SwingShock joined19:05
kaldoran joined19:05
rivarun left19:05
Derderderd joined19:06
Domhack_ left19:07
Groscheri joined19:07
LordRyan is it possible that git can't work with gpg if gpg needs a password to unlock the key?19:07
Domhack joined19:07
rivarun joined19:07
_ikke_ Not certain but I think that's where you use a gpg agent19:10
(Not certain if it's supposed to work or not)19:10
Domhack left19:10
LordRyan _ikke_: yes, i have to use a gpg agent. it works if i do `gpg --sign > /dev/null` with a blank message beforehnad19:11
vdv joined19:11
cagedwisdom joined19:12
Domhack joined19:13
grawity do you have $GPG_TTY set?19:13
LordRyan no19:14
I should actually try outside of tmux because I also have an issue with $DISPLAY i just found19:15
robotroll joined19:15
LordRyan okay so it doesn't work outside of tmux either19:16
thebope joined19:16
nwkj86 left19:17
meLon left19:18
zzz left19:20
mda1 joined19:20
Akuli joined19:20
Akuli does git convert line ends depending on which platform it's running on?19:20
thebope left19:20
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 it19:21
mda left19:21
serialoverflow left19:22
Seveas yes, on windows the default (which you had the option to change during install) is to mangle newlines19:22
nwkj86 joined19:23
m0viefreak joined19: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 \n19:23
serialoverflow joined19:24
meLon joined19:24
Akuli and of course i had specifically made sure to produce \n's when working on windows :)19:24
zzz joined19:25
thiago some editors on windows require \r\n19:26
like, for example, notepad19:26
Akuli but git's commit message file is still \n19:27
so it doesn't work too well with notepad19:27
thiago didn't know that19:27
oskarkv left19:27
govg left19:27
physikoi joined19:28
miczac left19:28
iliv joined19: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:29
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:30
Lipp joined19:31
sonOfRa joined19:31
ojacobson generally, don't check in generated files19:31
LordRyan physikoi: as for the `dist` file conflict, try https://www.git-tower.com/learn/git/ebook/en/command-line/advanced-topics/merge-conflicts19:31
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:31
Poppa joined19: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
interesting19:32
converge left19:32
LordRyan so that `git pull` triggers the generation.19:33
b_rare joined19: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
http://stackoverflow.com/questions/4185400/is-there-any-git-hook-for-pull19:33
guide there ^19:33
dviola joined19:33
the_cybersphinx joined19:34
fahadash joined19:37
watabou joined19:38
madewokherd joined19:39
dsdeiz joined19: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:40
pks left19:42
pks joined19: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:43
Apteryx joined19:45
Apteryx Is it safe to delete a corrupted *loose* object?19:45
_ikke_ If it's not referenced, then yes, it's safe to remove19: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/ae1510169ceb4e6e1d653928b6bd8781c9575a) is corrupt19:46
nikivi joined19:46
ojacobson If it's used in your history somewhere, then "corrupt" and "absent" are only barely different broken states19:46
Apteryx _ikke_: OK. I'll give it a shot.19:46
ergzay left19:48
Apteryx After deletion of the loose & corrupted object, "git fsck" now goes through, but reports I have a couple "dangling commits".19:48
thiago dangling is fine19:49
having too much is not a problem; having too little is19:49
Apteryx OK19:50
Thanks.19:50
physikoi LordRyan: Thank you for your assistance :)19:52
LordRyan np19:52
kulelu88 joined19:52
processkiller left19:53
garethdaine joined19:55
iliv left19:55
Doginal joined19:56
robotroll left19:56
kyan joined19:58
nivag joined19:58
Lipp_ joined19:59
dreiss left19:59
Lipp left20:00
nikivi left20:01
Lipp_ left20:03
nikivi joined20:03
Orion3k joined20:03
Lipp joined20:03
jstein left20:03
glebihan left20:07
heroux left20:08
Akuli left20:09
Ooe joined20:09
nikivi left20:09
Sample joined20:10
WayToDoor left20:11
glebihan joined20:12
fatalhalt left20:13
thebope joined20:17
SteveCharleston joined20:18
dreiss joined20:19
jason237 joined20:19
thebope left20:21
balance2 left20:21
HoierM left20:21
Ooe left20:22
LordRyan grawity: http://superuser.com/questions/691395/git-tag-with-gpg-agent-and-pinentry-curses <- trying this now20:24
heftig left20:24
Teisei joined20:24
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. :P20:25
ncthom91 joined20:26
breezy_ joined20:26
mischat joined20:27
yohnnyjoe joined20:27
gitinfo set mode: +v20:27
miczac joined20:27
gitinfo set mode: +v20:27
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
SteveCharleston left20:28
thiago the server thinks it is20:28
hhee left20:28
thiago therefore, for all intents and purposes, it is20:28
note: current branch on the remote, not on your local repository20:29
try changing the remote's current branch20:29
Elaa joined20:30
Sample left20: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:30
troulouliou_div2 joined20:31
ergzay joined20:32
ergzayGuest2832920:32
tnecniv joined20:33
red82 joined20:34
kfoonamalik joined20:34
ac3takwas joined20:34
red82 left20:35
nettoweb left20:36
denisMone joined20:37
heftig joined20:38
dmc left20:39
kfoonamalik left20:39
dmc joined20:40
troulouliou_div2 left20:43
denisMone left20:44
Darcidride left20:44
balance2 joined20:45
daey_ joined20:46
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:47
nwkj86 left20:48
daey_ nvm. writing mistake20:50
daey_daey20:51
nwkj86 joined20:51
robattila256 joined20:52
Elaa left20:52
lindenle joined20:52
harwood joined20:53
dreampwnzor joined20:55
heftig left20:55
vdv left20:55
ncbi joined20:56
heftig joined20:57
lindenle left20:57
breezy_ left20:57
harwood left20:58
contracode joined20:58
harwood joined20:58
cdg joined20:59
jlebar joined21:00
harwood left21:01
Sample joined21:02
harwood joined21:04
SwingShock left21:04
snowkidind joined21:06
dreiss left21:08
aidalgol joined21:08
Sample left21:10
bmahe joined21:13
ncthom91 left21:14
Atrumx left21:15
heftig left21:16
heftig joined21:17
sirish joined21:18
alyptik left21:18
slappymcfry joined21:19
Lipp left21:19
Guest28329 left21:19
jdiez left21:20
zzz left21:21
zzz joined21:21
jdiez joined21:22
WaReZ joined21:24
nettoweb joined21:24
Ediz joined21:27
menip left21:28
menip joined21:29
bmahe left21:29
emerson joined21:29
tmsmith left21:30
NeverDie joined21:31
sq-one left21:36
heftig left21:36
[0xAA] left21:37
heftig joined21:38
msonntag left21:38
Sample joined21:38
ac3takwas left21:39
msonntag joined21:40
achlys joined21:41
WayToDoor joined21:43
thebope joined21:44
SDK514 joined21:46
[|SDK|] left21:46
baryon joined21:46
wcpan left21:47
wcpan joined21:47
AfroThundr joined21:47
miczac left21:47
thebope left21:48
AfroThundr left21:49
AfroThundr joined21:49
martman i am very confused, whats the correct way to mirror two remotes?21:50
i have my remote, and a official upstream remote i do not have control of21:50
i would like to mirror all branches21:50
dreiss joined21:53
Domhack left21:53
nkouevda joined21:54
alyptik joined21:55
Goplat joined21:56
Sample left21:58
davimore_ joined22:02
miczac joined22:02
gitinfo set mode: +v22:03
mehola joined22:04
Teisei left22:04
rivarun left22:04
davimore left22:06
Domhack joined22:06
rivarun joined22:06
DrRobotic joined22:08
anonymuse joined22:08
sirish left22:11
sirish joined22:12
Domhack left22:12
yohnnyjoe left22:13
yohnnyjoe joined22:14
cdg left22:16
PCatinean left22:16
steelsw0rd joined22:18
Cassiopaya joined22:22
IlNominePatre joined22:25
lindenle joined22:26
jnavila left22:26
anonymuse left22:27
dikiaap left22:28
c1arknova joined22:29
zzz left22:29
baryon left22:30
nkouevda left22:30
SDK514 left22:32
nkouevda joined22:32
kfoonamalik joined22:35
nikivi joined22:35
publio joined22:36
treehug88 martman how about git pull {remotename} --all22:36
physikoi left22:37
BenderRodriguez joined22:38
[|SDK|] joined22:39
[|SDK|] left22:40
kfoonamalik left22:40
steelsw0rd left22:40
WayToDoor left22:41
nettoweb left22:43
[|SDK|] joined22:46
acetakwas joined22:47
[|SDK|] left22:47
nettoweb joined22:50
nidr0x joined22:51
Gsham joined22:52
nikivi left22:53
fahadash left22:55
QuestionTime joined22:55
QuestionTime left22:55
QuestionTime joined22:56
steelsw0rd joined22:57
webdev007 joined22:57
miczac left22:58
fatalhalt joined22:58
c1arknova left22:59
fmeerkoetter left23:01
fmeerkoetter joined23:01
Jackneill_ left23:03
timothy left23:04
dreampwnzor left23:05
satifant left23:05
r4nd0m0ne joined23:05
achlys left23:07
r4nd0m-0ne joined23:08
r4nd0m0ne1 left23:08
ahmedelgabri left23:08
nettoweb left23:09
r4nd0m0ne left23:11
vrlx left23:11
r4nd0m0ne joined23:15
WaReZ left23:16
sea-gull_ left23:17
DrRobotic left23:18
r4nd0m-0ne left23:18
denisMone joined23:19
bruce_lee left23:19
robics joined23:21
forrestv joined23:22
r4nd0m0ne left23:23
r4nd0m-0ne joined23:26
sbeller_ left23:26
sbeller joined23:29
drochman left23:31
treehug88 left23:31
eagle_mike joined23:32
Tanfrieze left23:42
dreiss left23:44
quetz joined23:44
thebope joined23:44
ReptilianBrain joined23:45
rorro joined23:46
YuGiOhJCJ left23:47
thebope left23:48
dreiss joined23:49
Levex left23:49
Levex joined23:49
red82 joined23:50
Levex left23:50
Levex joined23:50
jonwil joined23:50
rorro left23:51
ncbi left23:51
gitinfo set mode: +v23:51
flavius left23:51
timothy joined23:51
hue left23:52
cqx joined23:53
t0by joined23:55
RustySha1kleford left23:55
kloff joined23:55
venmx left23:57
sirish left23:57

Logs Search ←Prev date Next date→ Channels Documentation