Trivial git script fixups

Fix permissions, and add trivial "reset" and "add" scripts.

The "reset" script just resets the index back to head, while the "add"
script is just a crutch for people used to do "cvs add".

diff --git a/Makefile b/Makefile
index dd16385d1ab3c70db9ff48c2ea0b97b5eb590d00..bf63984bb96c3c1cf709179c4d823cd649842df8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,8 @@ INSTALL=install
 SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
        git-pull-script git-tag-script git-resolve-script git-whatchanged \
        git-deltafy-script git-fetch-script git-status-script git-commit-script \
 SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
        git-pull-script git-tag-script git-resolve-script git-whatchanged \
        git-deltafy-script git-fetch-script git-status-script git-commit-script \

-       git-log-script git-shortlog git-cvsimport-script git-diff-script
+       git-log-script git-shortlog git-cvsimport-script git-diff-script \
+       git-reset-script git-add-script

 
 PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \
 
 PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \

diff --git a/git-add-script b/git-add-script
new file mode 100755 (executable)
index 0000000..7726886
--- /dev/null
+++ b/git-add-script
@@ -0,0 +1,2 @@
+#!/bin/sh
+git-update-cache --add "$@"

diff --git a/git-diff-script b/git-diff-script
index d70e8b9f2961fb5cbe53d473af8f2c1c8c1024d4..ae1587121bcbf76be2ffc655580b4f24319f49cf 100755 (executable)
--- a/git-diff-script
+++ b/git-diff-script
@@ -3,13 +3,13 @@ rev=($(git-rev-parse --revs-only "$@"))
 flags=($(git-rev-parse --no-revs "$@"))
 case "${#rev[*]}" in
 0)
 flags=($(git-rev-parse --no-revs "$@"))
 case "${#rev[*]}" in
 0)

-       git-diff-files -p "$@";;
+       git-diff-files -p -C "$@";;

 1)
 1)

-       git-diff-cache -p "$@";;
+       git-diff-cache -p -C "$@";;

 2)
        begin=$(echo "${rev[1]}" | tr -d '^')
        end="${rev[0]}"
 2)
        begin=$(echo "${rev[1]}" | tr -d '^')
        end="${rev[0]}"

-       git-diff-tree -p $flags $begin $end;;
+       git-diff-tree -p -C $flags $begin $end;;

 *)
        echo "I don't understand"
        exit 1;;
 *)
        echo "I don't understand"
        exit 1;;

diff --git a/git-external-diff-script b/git-external-diff-script
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/git-reset-script b/git-reset-script
new file mode 100755 (executable)
index 0000000..eaefd00
--- /dev/null
+++ b/git-reset-script
@@ -0,0 +1,3 @@
+#!/bin/sh
+git-read-tree --reset HEAD
+git-update-cache --refresh

diff --git a/git-resolve-script b/git-resolve-script
old mode 100644 (file)
new mode 100755 (executable)