summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-05-31 09:37:27 +0200
committerJens Axboe <jaxboe@fusionio.com>2010-05-31 09:37:27 +0200
commit067e7cb58127eafd639224aa3778c9ad48596db2 (patch)
tree655f5d07b6a521e8c283b62ac858dc4b5b27de0c
parentc44123ea0f423d665205247567814fddd825801b (diff)
downloadag-067e7cb58127eafd639224aa3778c9ad48596db2.tar.gz
ag-067e7cb58127eafd639224aa3778c9ad48596db2.tar.bz2
UpdatesHEADmaster
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rwxr-xr-xag-apply-dir7
-rwxr-xr-xag-branch-ls4
-rwxr-xr-xag-checkout-head2
-rwxr-xr-xag-commit4
4 files changed, 6 insertions, 11 deletions
diff --git a/ag-apply-dir b/ag-apply-dir
index 54c4df3..0b36a95 100755
--- a/ag-apply-dir
+++ b/ag-apply-dir
@@ -7,11 +7,6 @@ check_git_dir
# Runs git-applymbox on the directory given as the first argument.
# If it breaks in the middle, specify a restart point as the 2nd arg.
-if [ ! -x $(which git-applymbox) ]; then
- echo "Can't find git-applymbox"
- exit 1
-fi
-
DIR=$1
if [ x$1 == "x" ]; then
echo Need directory with patches as argument
@@ -32,7 +27,7 @@ for num in `seq -w $RESTART 9999`; do
if [ ! -f "$PATCH" ]; then
break
fi
- git-applymbox "$PATCH"
+ git am "$PATCH"
r=$?
if [ $r != "0" ]; then
echo Apply failed at $PATCH
diff --git a/ag-branch-ls b/ag-branch-ls
index 96efeee..83f7d54 100755
--- a/ag-branch-ls
+++ b/ag-branch-ls
@@ -4,7 +4,7 @@
check_git_dir
-HEADS=$(cd .git/refs/heads && ls)
+HEADS=$(cd .git/logs/refs/heads && ls)
echo "Local branches:"
for i in $HEADS; do
@@ -12,7 +12,7 @@ for i in $HEADS; do
continue
fi
- SHA=$(cat .git/refs/heads/$i)
+ SHA=$(cat .git/logs/refs/heads/$i)
echo "$SHA $i"
done
diff --git a/ag-checkout-head b/ag-checkout-head
index a421407..f3132ec 100755
--- a/ag-checkout-head
+++ b/ag-checkout-head
@@ -4,4 +4,4 @@
check_git_dir
-git-read-tree -m HEAD && git checkout -f
+git read-tree -m HEAD && git checkout -f
diff --git a/ag-commit b/ag-commit
index 49c2f2d..39ae2dc 100755
--- a/ag-commit
+++ b/ag-commit
@@ -8,9 +8,9 @@ TEMP=`getopt -o a:c: --long a-long:,c-long:: -- "$@"`
eval set -- "$TEMP"
AUTHOR="Jens Axboe"
-AUTHOR_EMAIL="jens.axboe@oracle.com"
+AUTHOR_EMAIL="jaxboe@fusionio.com"
COMMITTER="Jens Axboe"
-COMMITTER_EMAIL="jens.axboe@oracle.com"
+COMMITTER_EMAIL="jaxboe@fusionio.com"
while true; do
case "$1" in