From aca4f38d924e0e82f9870babe73c8ada63aadae3 Mon Sep 17 00:00:00 2001
From: Johannes Sixt <johannes.sixt@telecom.at>
Date: Thu, 7 Feb 2008 21:23:32 +0100
Subject: [PATCH] Revert "Implement a cpio emulation in git-merge.sh for
 Windows."

This reverts commit 8b9de093190e6b1d6066efaf4afd9dc988096987.
git-merge does not use cpio anymore.
---
 git-merge.sh | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/git-merge.sh b/git-merge.sh
index ca7cb30d6c..1c123a37e6 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -38,24 +38,6 @@ use_strategies=
 allow_fast_forward=t
 allow_trivial_merge=t
 
-# Fix some commands on Windows
-case $(uname -s) in
-*MINGW*)
-	# there's no cpio; emulate with tar
-	cpio () {
-		case "$*" in
-		"-0 -o")
-			tar --create --file=- --null --files-from=-
-			;;
-		"-iuv")
-			tar xvf -
-			;;
-		*)	die "internal error: unexpected cpio $*";;
-		esac
-	}
-	;;
-esac
-
 dropsave() {
 	rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" \
 		 "$GIT_DIR/MERGE_STASH" || exit 1