free blog   apache   shopping directory   php powered
shruggarncopa, how about whenever a new tag is pushed, Have A Script check-out that tag, build it, etc? If you only want certain tags to be auto-built, then have a naming convention for tags
Ilarincopa: The script could also export a snapshot, unpack it somewhere and build.
ncopahum
ncopafor each git push i already git pull and build the changes
Ilarincopa: Using git pull in scripts is a bad idea.
shruggarncopa, so do it for tags as well. What's the actual issue you're having?
ncopadetect when there is new tag
ncopalunch. brb
shruggaras was said before, git-fetch will tell you about new tags it fetched
Ilarincopa: Also in post-update hook, updated/new tags are visible in list of refs updated.
IlariNew way to abuse remote helpers: As client-side "post-push" hooks. ):-)
shruggarI suppose having a real post-push makes as much sense if not more sense than post-commit
tasslehoffHow can I fetch objects from one local repo to another? Setup a remote? None of the repos are bare.
shruggartasslehoff, bare repositories are only a convenience and are not required. Just set up a remote
shruggargit remote add foo /path/to/repos
tasslehoffshruggar: thanks
tasslehoffwhen I add the remote I get a warning about "no common commits", is that very bad?
shruggarnot necessarily, but it's probably not what you want
shruggartasslehoff, how were these repos created?
tasslehoffshruggar: git svn clone :)
tasslehoffshruggar: we're moving to git, but I still have to work with the svn server
shruggartasslehoff, I'm guessing that the repos weren't created using the same "git svn clone" string. For example, one may have been created with "git svn clone svn+ssh://foo/bar/baz"  while another was created with "git svn clone file:///bar/baz"
tasslehoffshruggar: yeah. one is actually trunk, while the other one is branches/foo.
tasslehoffhmm, when I say it out loud, this sounds sketchy
ziro`what should i set my autocrlf to?
ziro`i want to only work with LF's but I want to ensure I don't accidently add CRLF's
shruggartasslehoff, there's the problem, then :)    svn branches don't translate neatly into git branches like that. In some situations, you can clone the entire svn repository (specifying where branches, tags, etc, go) and then treat them as normal git branches
shruggartasslehoff, I've yet to meet a mature svn repository (out of all three I've looked at, so my own experience is rather minimal) where git-svn could process that sort of thing sanely
tasslehoffshruggar: hm. I also want to add a remote to my colleagues checkout of the same branch, but I sense that will cause the same problem
shruggartasslehoff, if you both cloned using the same string, you should be able to pass commits back-and-forth no problem
Ilariziro`: input then
shruggartasslehoff, for example, I pass commits through a bare repository between work and home, since work and home both cloned via the same git-svn string
bob_fsitaram: Sorry, juggling a bunch of things at once here. When I try to "git clone git@server:gitolite" I get "fatal: 'gitolite' does not appear to be a git repository".
bob_fAnd same if I do "gitolite-admin", which is what the repo is called.
Ilaribob_f: Try 'gitolite:gitolite-admin'.
Ilaribob_f: (weird games gitolite plays with ssh).
tPl0chHi, I am trying to create a post-receive hook on our server. It is as simple as that: http://pastebin.com/hW0Ffq0T If I run it as the 'git' user, it works flawlessly, but when pushing via git+ssh from the local repo, it does not get executed.
bob_fIlari: Nope, same error.
IlaritPl0ch: 1) Don't run git as root. 2) Don't use pull in scripts, 3) if you cd in script, remember to unset $GIT_DIR.
bob_fThis is probably in the docs, let me check it up.
Ilaribob_f: 'git clone gitolite:gitolite-admin' (literally that way) says that it does not appear to be git repository?
bob_fOh, wait.
Ilaribob_f: As opposed to things like access denied, or host not found.
bob_fNope, that dosen't work either - yeah, says it's not a repo.
Ilaribob_f: What does 'ssh gitolite' (yes, 'gitolite' literally) say?
bob_fIlari: It says hello and lists repos and perms.
tasslehoffand the final straw. it's not possible to use git-svn to create a bare repo, with support for pushing changes back up?
tPl0chIlari, so, how do I update a clone in the post-receive hook?
tPl0chwithout pull?
Ilaribob_f: 'git ls-remote gitolite:gitolite-admin' (again, literally).
IlaritPl0ch: fetch + reset.
shruggartasslehoff, "not possible" is too strong a word.   "very inconvenient and annoying to set-up, and always requiring awareness of the set-up" is more accurate
tasslehoffshruggar: :)
bob_f git ls-remote gitolite:gitolite-admin
bob_ffatal: 'gitolite-admin' does not appear to be a git repository
bob_f(gitolite-admin is listed when I do "ssh gitolite" though).
bob_fAnd I have R W perms.
Ilaribob_f: Some very broken gitolite setup? If you didn't have permissions, it would print access DENIED message.
bob_fHrm.
Ilaribob_f: Try 'git ls-remote gitolite:does-not-exist'?
bob_f git ls-remote gitolite:does-not-exist
bob_ffatal: 'does-not-exist' does not appear to be a git repository
bob_ffatal: The remote end hung up unexpectedly
Ilaribob_f: Eeh... For me the error is: "fatal: remote error: R access for does-not-exist DENIED to Ilari".
bob_fHmmmm.
Ilaribob_f: Wonder what the heck is going on. Based on 'ssh', there's gitolite on other end, but git connections look like they bypass gitolite.
bob_fYeah, weird, huh ?
shruggartasslehoff, the most annoying part of it: commits will ALWAYS be re-written when you dcommit, so if you "git push" to such a repository, a "git pull" right afterwards will try to merge. "git pull --rebase" /might/ work, but something like "git push && git remote update && git reset --hard origin/master" is more what is required
shruggartasslehoff, (something like that, anyway)
Ilaribob_f: (ignore the "fatal: remote error " part, it is artefact of local setup).
bob_fAh okay.
Ilaribob_f: Because error messages from gitolite are converted into protocol errors, and client prints prints protocol errors with 'fatal: remote error: " prefixed...
sitarambob_f: putty?
bob_fsitaram: Nope.
Ilaribob_f: "ssh gitolite git-upload-pack does-not-exist". What does that complain about?
bob_fJust ssh -V
bob_fOpenSSH_5.1p1 Debian-5, OpenSSL 0.9.8g 19 Oct 2007
sitarambob_f: client OS and sever OS?  (shooting in the dark here...)
tasslehoffshruggar: hm. plan 1 is now to speed up the process towards !svn
bob_fubuntu-server and debian on my end.
bob_f ssh gitolite git-upload-pack does-not-exist
bob_ffatal: 'does-not-exist' does not appear to be a git repository
shruggartasslehoff, it is a good plan.    Note that a new interface to svn is being actively worked on at the moment. I don't know if it will solve any of these problems, but I hardly see the point if it doesn't :)
Ilaribob_f: So that looks like it bypasses gitolite (but 'ssh gitolite' doesn't...). Hmm...
Ilaribob_f: You ran 'ssh gitolite' and 'ssh gitolite git-upload-pack does-not-exist' from the same shell (just to rule out environment fscking things up?)
bob_fHere's my ~/.ssh/config just in case: http://bpaste.net/show/7307/
bob_fIlari: Yes, same shell, no env changes.
tasslehoffshruggar: is that interface mature enough for testing, or is it way-pre-alpha?
Ilaribob_f: Looks sane...
shruggartasslehoff, I think last I saw there were certain aspects of it for which testing was requested, but I wouldn't call it mature enough that it's worth testing for actual use yet
rajeshsrHow does git distinguish between tag name and a branch name, when you do git branch newName tagName etc..
rajeshsr?
sitarambob_f: run src/sshkeys-lint in your gitolite clone (prints USAGE message), then folow instructions, and report back
Ilaribob_f: Bit of brute-forceish, but: Do 'ssh -vvvv gitolite' and save the full output to file. Then do the same (saving to other file) for 'ssh -vvvv gitolite git-upload-pack does-not-exist' and then diff the two files.
Action: FauxFaux has managed to lose a commit from reflog. /o\
bob_fIlari: Sure.
Ilaribob_f: 'diff -u file1 file2' to diff them.
englagit diff --no-index file1 file2   and you can use a more familiar diff
bob_fIlari: I can pastebin this safely ?
Ilaribob_f: It shouldn't have any private information.
bob_fYeah, looks safe.
bob_fhttp://bpaste.net/show/7309/
ncopaback
ncopathanks all
Ilaribob_f: What the heck? Looks like 'ssh gitolite' did actual login?
Ilaribob_f: Do the sshkeys-lint stuff...
level09when using reflog to revert, do I use checkout ? or reset ? or revert ?
wereHamsterwhat do you mean by 'revert'?
level09like undo changes
level09i have merged some branches and did some cleaning that messed up everything
Ilarilevel09: 'reset --merge' probably then...
Ilarilevel09: Or --hard (dangerous).
wereHamsterwas the merge successful?
wereHamsteror did it fail because of conflicts?
level09failed
wereHamsterreset --hard
wereHamsteror checkout --merge -- .
level09but if I want to go back into a specific point in my reflog
wereHamsterreset --hard or checkout
level09okay thanks ! I'll try that
bob_fIlari: I'm gonna run to lunch, but this lint stuff should hopefully help me figure it out - thanks a lot for your help though, it's really appreciated.
bob_fI'll let you know how it goes.
sondrebwhen i type "git rm <filename>" it deletes the file but then sends the message "Deletion of directory 'ubs/common/composer' failed. Should I try again? (y/n)?"
sondrebwhy does it try to delete te folder?
mathepicWhats the filename?
sondrebC:\BuildSys\work\ubs\common\composer>git rm comp_resbuild.pm
sondrebrm 'ubs/common/composer/comp_resbuild.pm'
sondrebDeletion of directory 'ubs/common/composer' failed. Should I try again? (y/n)?
jupkohttp://pastie.org/1014987
jupkowhat's the problem with my local repository ?
jupkoHow can I correct it ? You can see the situation if you open the link I pasted.
mathepicsondreb: Thats odd.
wereHamsterjupko: git fsck --full
jupkookay
wereHamsterjupko: and before you do that, can you check if the file .git/objects/e1/17cf9010e5973e9d65139424bde2e27cf7389c exists and if it is zero bytes long?
jupkooops
jupkoI have run fsck before the checking
jupko4KB
jupkoand it exists
jupkohttp://pastie.org/1014995
jupkoyou can see the output of fsck operation and the size of that object file.
jupkothe question is still existing, how can I fix it ? :)
jupkoand what can cause such a problem at all ? This will be my other question.
wereHamsterdo you have a backup of that repo? or a clone that contains that object?
mathepicYou need to replace that object with one from a noncorrupt repo.
jupkoI can do a new clone because I have pushed the commits
jupkobut I would like to avoid it next time so I would like to know what can cause such a problem.
wereHamsterfilesystem corruption for example
jupkoonly in this small git repository and no corruption in another places ? :)
jastno corruption you have found so far
wereHamstera block on the disk is usually 512 bytes, well within the 4kb file that is corrupt
jastand it's actually quite likely to happen that way if, for example, you're working on that repository and you get a power failure in the middle of something
jupko4KB is the page size on i686
wereHamsterpage size, yes. But not block on the harddrive
jupkoah okay I see
jupkoI may know the problem.
jupkoI am developing a driver
jupkoand syscrash occured because of some bad lines.
jupkothat I inserted
jupkoand maybe it caused that.
jupkomeanwhile I was in this repository.
jupkoso it's definitely worth to make a backup directory then.
jupko:-)
jupkowereHamster: thank you.
jastin theory git syncs stuff before updating a branch, but perhaps your filesystem did something nasty and ignored it
jupkojast: no problem with filesystem at all
jastwell, the corruption has to have been caused by *something* :)
anebi1hi. i'm newbie in git and i want to ask if is possible to clone a repository under folder located in my current git repository. for example if my git repository is in this http path /git/php, i want to clone a repository under /git/php/vendor. is this possible somehow?
jastare you, perchance, talking about submodules?
anebi1jast: if you call this submodule, then it is. i'm looking it from http url side. vendor is a subfolder in my gitrepo and i want to clone all content of remote under this folder.
anebi1jast: i'm reading now for submodules :)
jastoh, you want to clone only part of a repository?
jastif so... well, tough luck. git doesn't support that.
anebi1jast: the people moved the project from svn to git, i think i will need the full cloning if their repo. i have not checked yet how they have done this.
anebi1but the content should go under vendor subfolder in my repo
jastsounds like a case for submodules all right... or the third-party git subtree tool, if you prefer that
Mpenzsitaram:  :)  Thanks.  I figured.
jastsome people don't like submodules very much, e.g. because you have to manually update the submodule and record the update whenever you need a newer version
anebi1jast: i see. i will learn how submodules work and probably will go that way. thanks
tPl0chHi, I am still trying to get a post-receive hook to run: http://pastebin.com/Bkj9ULm1. If I run that as the user 'git' on the server, it works flawlessly, but when I push from my local repository, the hook won't execute.
Last message repeated 1 time(s).
PerlJamtPl0ch: how did you run it from the command line?
PerlJamtPl0ch: you do have execute permission set, yes?
tPl0chPerlJam, yes, it's executable, and I did a su git && /path/to/hook/post-receive
tPl0chit did everything right
tPl0chbut whatever I do, it won't execute when pushing from my local repo
PerlJamAre you sure you're pushing to the right place?
tPl0chPerlJam, yes, since the hook does the fetch after I push from my local repo
tPl0chbut only if I run it by hand
tPl0chmy git version is 1.7.0.5
PerlJamwait ... that doesn't make sense.
PerlJamThe hook does not execute when you push, yes?
tPl0chindeed
PerlJamand how do you know you're pushing to the right remote?
tPl0chgit remote show origin
IlaritPl0ch: And how do you tell it doesn't execute?
tPl0chIlari, I added a 'touch PLEASE_RUN' to post-receive
PerlJamtPl0ch: hrm.  I think this is one of those "devil in the details" kind of things.  If you could generate a transcript of everything you did to make sure the script was executable, that you were pushign to the right remote, and that the remote isn't executing the post-receive, they might help
bob_fIlari: Hi, just got back from lunch and been poking a bit more.
bob_fIlari: If I unset ssh-agent env vars, doing "git clone git@gitolite:gitolite-admin" works - you see it is asking me for the passphrase for ~/.ssh/bob and not ~/.ssh/id_rsa
Popular searches: minion pro texworks mac   openttd roadtrain   Reconfiguring network interfaces   

Generated by irclog2html.pl 2.1mg by Jeff Waugh - return