Question

我是OS X上的新手，我正在通过命令行使用它。我来自Tortoise SVN和Beyond Compare on Windows的世界。

我希望能够将差异发送到FileMerge。

我只需使用：

即可使用TextMate完成此操作

git diff | mate

但是我不确定如何设置这样我可以使用FileMerge？

Answer 1

虽然它与将stdin传递到脚本中的方式不完全相同，但您可以这样做：

git difftool -t opendiff -y

这将为每个文件启动一次FileMerge。立即执行整个项目树takes a little scripting。

另见this question。

Answer 2

创建可执行脚本git-diff-cmd.sh

#!/bin/bash

xattr -w com.apple.TextEncoding "UTF-8;134217984" "$2"
xattr -w com.apple.TextEncoding "UTF-8;134217984" "$5"

/usr/bin/opendiff "$2" "$5" -merge "$1"

现在编辑您的.gitconfig文件以包含行

[diff]
    external = <path-to>/git-diff-cmd.sh

...将<path-to>替换为git-diff-cmd.sh的路径。现在git diff将使用FileMerge，并正确显示UTF-8 Unicode字符。

Answer 3

这是一个脚本（最初由Toby White提供），我讨厌比较FileMerge中的整个目录结构，而不是单独打开每个文件。

#!/bin/sh
#
# This script was written by Toby White under an unknown license, and published
# on the Git mailing list:
#
#   http://kerneltrap.org/mailarchive/git/2007/11/21/435536
#
# Superficial changes were made by Nathan de Vries to allow the script to be
# run under Leopard.
#
# Adapted by Daniel Miller : http://stackoverflow.com/a/12957945/10840
# - allow changes to be saved back to the working copy when diffing against HEAD
# - work when FileMerge is already open
# - always compare archived copies so ignored files are excluded from the diff
# - allow diff of unstaged changes (no arguments); creates a dangling commit
# - allow diff of subdirectory within the repo
#
# Known issues:
# - Always uses the same two directories (/tmp/git-opendiff-old and
#   /tmp/git-opendiff-new); THEY WILL BE DELETED IF THEY ALREADY EXIST.
#   Ugly, I know, but it makes the script work even if FileMerge is open.

OLD=
NEW=
FILEPATH=
HAS_ARGS=no
IGNORE_TO_PATH=no

# loosely based on https://stackoverflow.com/a/14787208/10840
while [ "$#" -ge 1 ]; do
    HAS_ARGS=yes
    case "$1" in
        -h)
            echo "usage: $0 [--cached | <ref> [<ref>]] [-- <path>]"
            exit 0
            ;;
        --cached)
            # diff staged changes
            NEW=$(git write-tree)
            OLD=HEAD
            IGNORE_TO_PATH=yes
            shift
            ;;
        --)
            shift
            FILEPATH="$@"
            break
            ;;
        *)
            if [[ "$IGNORE_TO_PATH" == "no" ]]; then
                if [ -z "$OLD" ]; then
                    OLD="$1"
                else
                    NEW="$1"
                    IGNORE_TO_PATH=yes
                fi
            fi
            shift
            ;;
    esac
done
if [ -z "$OLD" ]; then
    OLD=HEAD
fi
if [[ "$HAS_ARGS" == "no" ]]; then
    # diff unstaged changes
    # http://stackoverflow.com/a/12010656/10840
    NEW=$(git stash create)
    echo "diff unstaged changes"
fi

TMP_OLD=/tmp/git-opendiff-old
TMP_NEW=/tmp/git-opendiff-new
test -d $TMP_OLD && rm -rf $TMP_OLD; mkdir $TMP_OLD
test -d $TMP_NEW && rm -rf $TMP_NEW; mkdir $TMP_NEW

TMP_OLD=$TMP_OLD/$OLD; mkdir -p $TMP_OLD
git archive --format=tar $OLD $FILEPATH | (cd $TMP_OLD; tar xf -)

if test -z "$NEW"; then
    SAVE_TO=$(git rev-parse --show-cdup)
    test -z "$cdup" && SAVE_TO=.
    git archive --format=tar HEAD $FILEPATH | (cd $TMP_NEW; tar xf -)
    opendiff $TMP_OLD/$FILEPATH $TMP_NEW/$FILEPATH -merge $SAVE_TO &> /dev/null &
else
    TMP_NEW=$TMP_NEW/$NEW; mkdir -p $TMP_NEW
    git archive --format=tar $NEW $FILEPATH | (cd $TMP_NEW; tar xf -)
    opendiff $TMP_OLD/$FILEPATH $TMP_NEW/$FILEPATH &> /dev/null &
fi

把它放在你路上的某个地方。我更喜欢~/bin/git-opendiff，这意味着git opendiff ...按预期工作。

更新：在没有参数的情况下调用时进行非分段更改，添加了-h（帮助）选项。

更新：带有-- <path>的diff子目录。也是更好的参数解析。

Answer 4

我不知道发生了什么事，因为我更新了OS X，现在opendiff无法像以前那样工作了。因此，我从here复制了此脚本，并成功了。

#!/bin/sh 
dir=$PWD
until [ -e "$dir/.git" ]; do
  if [ "$dir" == "/" ]; then
    echo "Not a git repository" >&2
    exit 1;
  fi
  dir=`dirname "$dir"`
done
open -a FileMerge -n -W --args -left "$dir/$1" -right "$2" -merge "$5"

如何在OS X中将FileMerge作为带有git的diff工具进行管道传输？

4 个答案: