Big tool rename.

[thirdparty/git.git] / git-merge-one-file.sh

diff --git a/git-merge-one-file-script b/git-merge-one-file.sh
similarity index 81%
rename from git-merge-one-file-script
rename to git-merge-one-file.sh
index b791107fd73c87361f340fc1b0a43e53cecd2a8e..5419e598c52eec1b8e40b4179b0bd6ebae40b682 100755 (executable)
--- a/git-merge-one-file-script
+++ b/git-merge-one-file.sh
@@ -27,7 +27,7 @@ case "${1:-.}${2:-.}${3:-.}" in
        if test -f "$4"; then
                rm -f -- "$4"
        fi &&
-               exec git-update-cache --remove -- "$4"
+               exec git-update-index --remove -- "$4"
        ;;
 
 #
@@ -35,8 +35,8 @@ case "${1:-.}${2:-.}${3:-.}" in
 #
 ".$2." | "..$3" )
        echo "Adding $4"
-       git-update-cache --add --cacheinfo "$6$7" "$2$3" "$4" &&
-               exec git-checkout-cache -u -f -- "$4"
+       git-update-index --add --cacheinfo "$6$7" "$2$3" "$4" &&
+               exec git-checkout-index -u -f -- "$4"
        ;;
 
 #
@@ -49,8 +49,8 @@ case "${1:-.}${2:-.}${3:-.}" in
                exit 1
        fi
        echo "Adding $4"
-       git-update-cache --add --cacheinfo "$6" "$2" "$4" &&
-               exec git-checkout-cache -u -f -- "$4"
+       git-update-index --add --cacheinfo "$6" "$2" "$4" &&
+               exec git-checkout-index -u -f -- "$4"
        ;;
 
 #
@@ -63,8 +63,8 @@ case "${1:-.}${2:-.}${3:-.}" in
 
        # We reset the index to the first branch, making
        # git-diff-file useful
-       git-update-cache --add --cacheinfo "$6" "$2" "$4"
-               git-checkout-cache -u -f -- "$4" &&
+       git-update-index --add --cacheinfo "$6" "$2" "$4"
+               git-checkout-index -u -f -- "$4" &&
                merge "$4" "$orig" "$src2"
        ret=$?
        rm -f -- "$orig" "$src2"
@@ -78,7 +78,7 @@ case "${1:-.}${2:-.}${3:-.}" in
                echo "ERROR: Merge conflict in $4."
                exit 1
        fi
-       exec git-update-cache -- "$4"
+       exec git-update-index -- "$4"
        ;;
 
 *)