From f138c7f4b56169361ffbc8494c1c057511140d2a Mon Sep 17 00:00:00 2001 From: "G.raud" Date: Sun, 1 Sep 2013 09:33:55 +0200 Subject: [PATCH] archives2git: let --keep-filter select files to keep in the repository and replace --filter-file that selected files not to add --- archives2git | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/archives2git b/archives2git index c927c84..a139afe 100755 --- a/archives2git +++ b/archives2git @@ -22,7 +22,7 @@ PROGRAM_VERSION="0" # parameters RENAME='echo "$file"' GIT_WORK_TREE=${GIT_WORK_TREE-.} -FILTER='true $file' +FILTER='false $file' DATE='' TITLE='echo "$arch"' BODY= @@ -34,7 +34,7 @@ do shift; RENAME=$1 ;; --repo) shift; GIT_WORK_TREE=$1 ;; - --filter-file) + --keep-filter) shift; FILTER=$1 ;; --date) shift; DATE=$1 ;; @@ -87,7 +87,7 @@ do do [ -e "$file" ] || continue [ "$file" = "." -o "$file" = ".." -o "$file" = ".git" ] && continue - git rm -r "$file" || rm -R "$file" + eval "$FILTER" || ( git rm -r "$file" || rm -R "$file" ) done for file in "$TMPDIR"/* "$TMPDIR"/.* do @@ -96,16 +96,14 @@ do [ "$file" = "." -o "$file" = ".." ] && continue name=$(eval "$RENAME") if [ -n "$name" ] - then mv "$TMPDIR"/"$file" ./"$name" - else rm "$TMPDIR"/"$file" + then + [ ! -e ./"$name" ] || rm -R ./"$name" + mv "$TMPDIR"/"$file" ./"$name" + git add ./"$name" + else + rm -R "$TMPDIR"/"$file" fi done - for file in * .* - do - [ -e "$file" ] || continue - [ "$file" = "." -o "$file" = ".." -o "$file" = ".git" ] && continue - eval "$FILTER" && git add "$file" - done git commit -m "$(eval "$TITLE")${BODY:+$NL$BODY}" \ ${DATE:+--date "$(eval "$DATE")"} $ARGS done -- 2.11.4.GIT