Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes for the new SDK #1

Merged
merged 4 commits into from
Sep 4, 2014
Merged

Fixes for the new SDK #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95b7175
MinGW: Use MakeMaker to build the Perl libraries
sschuberth Aug 29, 2013
145186a
Makefile: Set htmldir to match the default HTML docs location under MSYS
sschuberth Sep 4, 2013
9264b1f
t7800: Use "test_cmp_text" in all places where "echo" is used
sschuberth Mar 20, 2014
57a35fd
t0061: Work around a line endings issue with newer versions of cat on…
t-b Sep 4, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions config.mak.uname
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
NO_MKDTEMP = YesPlease
NO_MKSTEMPS = YesPlease
NO_SVN_TESTS = YesPlease
NO_PERL_MAKEMAKER = YesPlease
RUNTIME_PREFIX = YesPlease
NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
NO_NSEC = YesPlease
Expand Down Expand Up @@ -518,7 +517,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
X = .exe
SPARSE_FLAGS = -Wno-one-bit-signed-bitfield
ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
htmldir = doc/git/html/
htmldir = share/doc/git/$(firstword $(subst -, ,$(GIT_VERSION)))/html
prefix =
INSTALL = /bin/install
EXTLIBS += /mingw/lib/libz.a
Expand Down
2 changes: 1 addition & 1 deletion t/t0061-run-command.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ test_expect_success 'run_command can run a command' '
chmod +x hello.sh &&
test-run-command run-command ./hello.sh >actual 2>err &&

test_cmp hello-script actual &&
test_cmp_text hello-script actual &&
test_cmp empty err
'

Expand Down
42 changes: 21 additions & 21 deletions t/t7800-difftool.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@ test_expect_success PERL 'custom commands' '
test_config difftool.test-tool.cmd "cat \"\$REMOTE\"" &&
echo master >expect &&
git difftool --no-prompt branch >actual &&
test_cmp expect actual &&
test_cmp_text expect actual &&

test_config difftool.test-tool.cmd "cat \"\$LOCAL\"" &&
echo branch >expect &&
git difftool --no-prompt branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

test_expect_success PERL 'custom tool commands override built-ins' '
test_config difftool.vimdiff.cmd "cat \"\$REMOTE\"" &&
echo master >expect &&
git difftool --tool vimdiff --no-prompt branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

test_expect_success PERL 'difftool ignores bad --tool values' '
Expand Down Expand Up @@ -84,7 +84,7 @@ test_expect_success PERL 'difftool honors --gui' '

echo branch >expect &&
git difftool --no-prompt --gui branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

test_expect_success PERL 'difftool --gui last setting wins' '
Expand All @@ -98,14 +98,14 @@ test_expect_success PERL 'difftool --gui last setting wins' '
test_config diff.guitool test-tool &&
echo branch >expect &&
git difftool --no-prompt --no-gui --gui branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

test_expect_success PERL 'difftool --gui works without configured diff.guitool' '
difftool_test_setup &&
echo branch >expect &&
git difftool --no-prompt --gui branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

# Specify the diff tool using $GIT_DIFF_TOOL
Expand All @@ -114,7 +114,7 @@ test_expect_success PERL 'GIT_DIFF_TOOL variable' '
git config --unset diff.tool &&
echo branch >expect &&
GIT_DIFF_TOOL=test-tool git difftool --no-prompt branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

# Test the $GIT_*_TOOL variables and ensure
Expand All @@ -126,13 +126,13 @@ test_expect_success PERL 'GIT_DIFF_TOOL overrides' '

echo branch >expect &&
GIT_DIFF_TOOL=test-tool git difftool --no-prompt branch >actual &&
test_cmp expect actual &&
test_cmp_text expect actual &&

test_config diff.tool bogus-tool &&
test_config merge.tool bogus-tool &&
GIT_DIFF_TOOL=bogus-tool \
git difftool --no-prompt --tool=test-tool branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

# Test that we don't have to pass --no-prompt to difftool
Expand All @@ -141,7 +141,7 @@ test_expect_success PERL 'GIT_DIFFTOOL_NO_PROMPT variable' '
difftool_test_setup &&
echo branch >expect &&
GIT_DIFFTOOL_NO_PROMPT=true git difftool branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

# git-difftool supports the difftool.prompt variable.
Expand All @@ -161,7 +161,7 @@ test_expect_success PERL 'difftool.prompt config variable is false' '
test_config difftool.prompt false &&
echo branch >expect &&
git difftool branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

# Test that we don't have to pass --no-prompt when mergetool.prompt is false
Expand All @@ -171,7 +171,7 @@ test_expect_success PERL 'difftool merge.prompt = false' '
test_config mergetool.prompt false &&
echo branch >expect &&
git difftool branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

# Test that the -y flag can override difftool.prompt = true
Expand All @@ -180,7 +180,7 @@ test_expect_success PERL 'difftool.prompt can overridden with -y' '
test_config difftool.prompt true &&
echo branch >expect &&
git difftool -y branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

# Test that the --prompt flag can override difftool.prompt = false
Expand All @@ -198,7 +198,7 @@ test_expect_success PERL 'difftool last flag wins' '
difftool_test_setup &&
echo branch >expect &&
git difftool --prompt --no-prompt branch >actual &&
test_cmp expect actual &&
test_cmp_text expect actual &&
echo >input &&
git difftool --no-prompt --prompt branch <input >output &&
prompt=$(tail -1 <output) &&
Expand All @@ -212,13 +212,13 @@ test_expect_success PERL 'difftool + mergetool config variables' '
test_config mergetool.test-tool.cmd "cat \$LOCAL" &&
echo branch >expect &&
git difftool --no-prompt branch >actual &&
test_cmp expect actual &&
test_cmp_text expect actual &&

# set merge.tool to something bogus, diff.tool to test-tool
test_config merge.tool bogus-tool &&
test_config diff.tool test-tool &&
git difftool --no-prompt branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

test_expect_success PERL 'difftool.<tool>.path' '
Expand All @@ -232,21 +232,21 @@ test_expect_success PERL 'difftool --extcmd=cat' '
echo branch >expect &&
echo master >>expect &&
git difftool --no-prompt --extcmd=cat branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

test_expect_success PERL 'difftool --extcmd cat' '
echo branch >expect &&
echo master >>expect &&
git difftool --no-prompt --extcmd=cat branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

test_expect_success PERL 'difftool -x cat' '
echo branch >expect &&
echo master >>expect &&
git difftool --no-prompt -x cat branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

test_expect_success PERL 'difftool --extcmd echo arg1' '
Expand All @@ -260,14 +260,14 @@ test_expect_success PERL 'difftool --extcmd cat arg1' '
echo master >expect &&
git difftool --no-prompt \
--extcmd sh\ -c\ \"cat\ \$1\" branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

test_expect_success PERL 'difftool --extcmd cat arg2' '
echo branch >expect &&
git difftool --no-prompt \
--extcmd sh\ -c\ \"cat\ \$2\" branch >actual &&
test_cmp expect actual
test_cmp_text expect actual
'

# Create a second file on master and a different version on branch
Expand Down