qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 19:18:07 +02:00
Code

replace the deprecated git-* command calls with git *

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12379 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2008-08-24 13:40:21 +00:00
parent 2bfa71f5d7
commit 56d7382fa8
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/download.mk
View File

@ -82,8 +82,8 @@ define DownloadMethod/git
cd $(TMP_DIR)/dl && \ cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \ rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \ [ \! -d $(SUBDIR) ] && \
git-clone $(URL) $(SUBDIR) && \ git clone $(URL) $(SUBDIR) && \
(cd $(SUBDIR) && git-checkout $(VERSION)) && \ (cd $(SUBDIR) && git checkout $(VERSION)) && \
echo "Packing checkout..." && \ echo "Packing checkout..." && \
rm -rf $(SUBDIR)/.git && \ rm -rf $(SUBDIR)/.git && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \

30
scripts/env
View File

@ -62,8 +62,8 @@ env_init() {
git init && git init &&
touch .config && touch .config &&
mkdir files && mkdir files &&
git-add . && git add . &&
git-commit -q -m "Initial import" git commit -q -m "Initial import"
} || { } || {
rm -rf .git rm -rf .git
error "Failed to initialize the environment directory" error "Failed to initialize the environment directory"
@ -72,14 +72,14 @@ env_init() {
env_sync_data() { env_sync_data() {
[ \! -L "$BASEDIR/.config" -a -f "$BASEDIR/.config" ] && mv "$BASEDIR/.config" "$ENVDIR" [ \! -L "$BASEDIR/.config" -a -f "$BASEDIR/.config" ] && mv "$BASEDIR/.config" "$ENVDIR"
git-add . git add .
git-add -u git add -u
} }
env_sync() { env_sync() {
local STR="$1" local STR="$1"
env_sync_data env_sync_data
git-commit -m "${STR:-Update} at $(date)" git commit -m "${STR:-Update} at $(date)"
} }
env_link_config() { env_link_config() {
@ -90,19 +90,19 @@ env_link_config() {
} }
env_do_reset() { env_do_reset() {
git-reset --hard HEAD git reset --hard HEAD
git-clean -d -f git clean -d -f
} }
env_list() { env_list() {
env_init env_init
git-branch | grep -vE '^. master$' git branch | grep -vE '^. master$'
} }
env_diff() { env_diff() {
env_init env_init
env_sync_data env_sync_data
git-diff --cached git diff --cached
} }
env_save() { env_save() {
@ -150,9 +150,9 @@ env_delete() {
local name="${1##*/}" local name="${1##*/}"
[ -z "$name" ] && usage [ -z "$name" ] && usage
[ -f "$envdir/.git/refs/heads/$name" ] || error "environment '$name' not found" [ -f "$envdir/.git/refs/heads/$name" ] || error "environment '$name' not found"
branch="$(git-branch | grep '^\* ' | awk '{print $2}')" branch="$(git branch | grep '^\* ' | awk '{print $2}')"
[ "$name" = "branch" ] && error "cannot delete the currently selected environment" [ "$name" = "branch" ] && error "cannot delete the currently selected environment"
git-branch -D "$name" git branch -D "$name"
} }
env_switch() { env_switch() {
@ -162,14 +162,14 @@ env_switch() {
env_init env_init
env_ask_sync env_ask_sync
git-checkout "$name" git checkout "$name"
env_link_config env_link_config
} }
env_rename() { env_rename() {
local NAME="${1##*/}" local NAME="${1##*/}"
env_init env_init
git-branch -m "$NAME" git branch -m "$NAME"
} }
env_new() { env_new() {
@ -180,7 +180,7 @@ env_new() {
[ -z "$NAME" ] && usage [ -z "$NAME" ] && usage
env_init 1 env_init 1
branch="$(git-branch | grep '^\* ' | awk '{print $2}')" branch="$(git branch | grep '^\* ' | awk '{print $2}')"
if [ -n "$branch" -a "$branch" != "master" ]; then if [ -n "$branch" -a "$branch" != "master" ]; then
env_ask_sync env_ask_sync
if ask_bool 0 "Do you want to clone the current environment?"; then if ask_bool 0 "Do you want to clone the current environment?"; then
@ -188,7 +188,7 @@ env_new() {
fi fi
rm -f "$BASEDIR/.config" "$BASEDIR/files" rm -f "$BASEDIR/.config" "$BASEDIR/files"
fi fi
git-checkout -b "$1" "$from" git checkout -b "$1" "$from"
if [ -f "$BASEDIR/.config" -o -d "$BASEDIR/files" ]; then if [ -f "$BASEDIR/.config" -o -d "$BASEDIR/files" ]; then
if ask_bool 1 "Do you want to keep your current config and files?"; then if ask_bool 1 "Do you want to keep your current config and files?"; then
[ -d "$BASEDIR/files" -a \! -L "$BASEDIR/files" ] && { [ -d "$BASEDIR/files" -a \! -L "$BASEDIR/files" ] && {

2
scripts/feeds
View File

@ -102,7 +102,7 @@ sub update_git($$) {
system("GIT_DIR=./feeds/$name/.git git pull") == 0 or return 1; system("GIT_DIR=./feeds/$name/.git git pull") == 0 or return 1;
} else { } else {
system("rm -rf \"./feeds/$name\""); system("rm -rf \"./feeds/$name\"");
system("git-clone --depth 1 $src ./feeds/$name") == 0 or return 1; system("git clone --depth 1 $src ./feeds/$name") == 0 or return 1;
} }
return 0; return 0;