Skip to content

Instantly share code, notes, and snippets.

View wpalmer's full-sized avatar

Will Palmer wpalmer

View GitHub Profile
BEFORE
error: inflate: data stream error (incorrect header check)
error: corrupt loose object '333c4768ce595793fdab1ef3a036413e2a883853'
fatal: failed to read object 333c4768ce595793fdab1ef3a036413e2a883853: Success
AFTER
error: inflate: data stream error (incorrect header check)
error: corrupt loose object '333c4768ce595793fdab1ef3a036413e2a883853'
diff --git a/web/js/game.js b/web/js/game.js
index ee569f7..aff43b3 100644
--- a/web/js/game.js
+++ b/web/js/game.js
@@ -169,7 +169,7 @@ $(function(){
.addSprite( "walk_left", {posx: 0, posy: 0, width: PLAYER_WIDTH, height: PLAYER_HEIGHT} )
.addSprite( "walk_right", {posx: 0, posy: 0, width: PLAYER_WIDTH, height: PLAYER_HEIGHT} );
-
+ var _handle;
@wpalmer
wpalmer / scankeys
Created January 27, 2011 00:09
set gitolite keys based on existing users
#!/bin/bash
dir="$(mktemp -t -d "vcs-keys.XXXXXXXXXX")"
function _cleanup(){
rm -rf "$dir"
}
trap _cleanup EXIT
while read passwd; do
user="$(printf "%s" "$passwd"|cut -d: -f1)"
home="$(printf "%s" "$passwd"|cut -d: -f6)"
@wpalmer
wpalmer / describe
Created February 9, 2011 16:34
adc/describe
#!/bin/bash
repo=
refs=()
args=()
did_set_repo=0
in_args=1
while [ $# -gt 0 ]; do
if [ $in_args -eq 0 ]; then
refs[${#refs[@]}]="$1"
@wpalmer
wpalmer / describe
Created February 9, 2011 16:48
adc/describe
#!/bin/bash
. $(dirname "$0")/adc.common-functions
repo=
refs=()
args=()
did_set_repo=0
in_args=1
while [ $# -gt 0 ]; do
if [ $in_args -eq 0 ]; then
[shruggar@walleee t]$ git init
Initialized empty Git repository in /home/shruggar/git/t/.git/
[shruggar@walleee t]$ mkdir -p foo/bar/baz
[shruggar@walleee t]$ cd foo/bar
[shruggar@walleee bar]$ ls
baz
[shruggar@walleee bar]$ touch baz/A
[shruggar@walleee bar]$ touch baz/B
[shruggar@walleee bar]$ git add baz/*
[shruggar@walleee bar]$ git commit -m A
My setup:
/home/vcs/.gitolite.rc # rc file
/home/vcs/gitolite-source # repository containing gitolite itself, I make tweaks and pull changes here
/home/vcs/bin # contains gl-* scripts, including gl-install
/var/vcs/admin # admin dir, I assume used by gitolite internally
/var/vcs/admin/hooks # other repositories symlink to hooks in here, under common/ and gitolite-admin/
/var/vcs/repos/gitolite-admin.git # I push to this when making changes
/var/vcs/repos/phpmyadmin.git # one of several repositories I update via cron (to make future pushes faster)
From Gitolite RC:
From cc44b6cf52d4fdb4341f18e29ee0244a222b8e3a Mon Sep 17 00:00:00 2001
From: Will Palmer <wmpalmer@gmail.com>
Date: Fri, 11 Feb 2011 08:30:23 +0000
Subject: [PATCH] add GL_POST_UPDATE_PRE_APPLY hook capability
One can use a "secondary" post-update hook to run additional tasks when
the gitolite-admin repository is updated. However, up until now there
was nowhere to prevent other, perhaps-dependent updates from running in
the event that those secondary tasks are known to be impossible or
undesired. This had the potential to leave the updates in a
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index d987102..28b9bb9 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -97,7 +97,13 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<
--------
+
-The placeholders are:
+The placeholders are divided into two categories, "short forms",
@wpalmer
wpalmer / gitolite.conf
Created September 6, 2011 14:24
gitolite by inheritence
@system = server1-git-unlocked server2-git-unlocked
@dev = foo bar baz
@admin = reallyneatguy
# All internal developers and system accounts can read any repo, and internal
# developers have free-reign over their own personal branches
repo @all
R = @system @dev @admin
RW+ dev/USER/ = @dev