Converted fast-import to accept standard command line parameters.

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 88a5da99f60895149b2e6bb4be85fbe7766b4ce1..fba4b0cb5fffbb1ad3f39c670c6364975c52186a 100755 (executable)
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -8,7 +8,7 @@
 #   $2 - file in branch1 SHA1 (or empty)
 #   $3 - file in branch2 SHA1 (or empty)
 #   $4 - pathname in repository
-#   $5 - orignal file mode (or empty)
+#   $5 - original file mode (or empty)
 #   $6 - file in branch1 mode (or empty)
 #   $7 - file in branch2 mode (or empty)
 #
@@ -16,14 +16,6 @@
 # been handled already by git-read-tree, but that one doesn't
 # do any merges that might change the tree layout.
 
-verify_path() {
-    file="$1"
-    dir=`dirname "$file"` &&
-    mkdir -p "$dir" &&
-    rm -f -- "$file" &&
-    : >"$file"
-}
-
 case "${1:-.}${2:-.}${3:-.}" in
 #
 # Deleted in both or deleted in one and unchanged in the other
@@ -34,7 +26,7 @@ case "${1:-.}${2:-.}${3:-.}" in
        fi
        if test -f "$4"; then
                rm -f -- "$4" &&
-               rmdir -p "$(expr "$4" : '\(.*\)/')" 2>/dev/null || :
+               rmdir -p "$(expr "z$4" : 'z\(.*\)/')" 2>/dev/null || :
        fi &&
                exec git-update-index --remove -- "$4"
        ;;
@@ -90,20 +82,21 @@ case "${1:-.}${2:-.}${3:-.}" in
                expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
                ;;
        *)
-               echo "Auto-merging $4."
+               echo "Auto-merging $4"
                orig=`git-unpack-file $1`
                ;;
        esac
 
-       # Create the working tree file, with the correct permission bits.
-       # we can not rely on the fact that our tree has the path, because
-       # we allow the merge to be done in an unchecked-out working tree.
-       verify_path "$4" &&
-               git-cat-file blob "$2" >"$4" &&
-               case "$6" in *7??) chmod +x -- "$4" ;; esac &&
-               merge "$4" "$orig" "$src2"
+       # Be careful for funny filename such as "-L" in "$4", which
+       # would confuse "merge" greatly.
+       src1=`git-unpack-file $2`
+       merge "$src1" "$orig" "$src2"
        ret=$?
-       rm -f -- "$orig" "$src2"
+
+       # Create the working tree file, using "our tree" version from the
+       # index, and then store the result of the merge.
+       git-checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4"
+       rm -f -- "$orig" "$src1" "$src2"
 
        if [ "$6" != "$7" ]; then
                echo "ERROR: Permissions conflict: $5->$6,$7."
@@ -114,7 +107,7 @@ case "${1:-.}${2:-.}${3:-.}" in
        fi
 
        if [ $ret -ne 0 ]; then
-               echo "ERROR: Merge conflict in $4."
+               echo "ERROR: Merge conflict in $4"
                exit 1
        fi
        exec git-update-index -- "$4"