From mboxrd@z Thu Jan 1 00:00:00 1970 From: Elijah Newren Subject: [PATCHv5 14/16] t7800 (difftool): add missing && Date: Sat, 2 Oct 2010 23:10:42 -0600 Message-ID: <1286082644-31595-15-git-send-email-newren@gmail.com> References: <1286082644-31595-1-git-send-email-newren@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: gitster@pobox.com, avarab@gmail.com, jrnieder@gmail.com, Elijah Newren To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Oct 03 07:10:13 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1P2Gpu-0001zH-Ic for gcvg-git-2@lo.gmane.org; Sun, 03 Oct 2010 07:10:10 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752589Ab0JCFJs convert rfc822-to-quoted-printable (ORCPT ); Sun, 3 Oct 2010 01:09:48 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:55800 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752512Ab0JCFJq (ORCPT ); Sun, 3 Oct 2010 01:09:46 -0400 Received: by mail-pv0-f174.google.com with SMTP id 2so1068412pvg.19 for ; Sat, 02 Oct 2010 22:09:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:mime-version :content-type:content-transfer-encoding; bh=3819UqAX3UqLI7vDcJwMHLDbBX/BBOqVZrxjCFy6Apw=; b=lnF9tJZvGsfcGF4JITXJSl6eHpJQrZ8oL1ryupzKDtt2r1fvo7XpDA3Jh+cH4eXeS6 Ujvtp7j+ezMSPX7X3yKwfX9sbt0X56q3bRMkxiAWwLEZqncZWlatPyhlt4gX1oq5BvoO v8snClMe95R9vKnuC4cp9FN6dM/1vMsIiajww= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=vp5Ci534bwN6D0XGDf59hKHCQEbOD4wBkQzcKCPk/fCVj6cXV4Rktjclll8ewVke4c WsZyG81pD/fQakBHriNlOdo8o2iBAYi/M5MPFiQe+lKb4ECKzr67XjiuwsWv0zTnre9S N4sXQcibEQafu2AWSADbnqmPFLqTfRjIA/8I0= Received: by 10.142.154.6 with SMTP id b6mr441123wfe.220.1286082586618; Sat, 02 Oct 2010 22:09:46 -0700 (PDT) Received: from Miney.hsd1.nm.comcast.net. (c-76-113-57-218.hsd1.nm.comcast.net [76.113.57.218]) by mx.google.com with ESMTPS id o16sm4140250wfh.19.2010.10.02.22.09.44 (version=SSLv3 cipher=RC4-MD5); Sat, 02 Oct 2010 22:09:45 -0700 (PDT) X-Mailer: git-send-email 1.7.3.1.66.gab790 In-Reply-To: <1286082644-31595-1-git-send-email-newren@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Also remove a call to 'git config --unset difftool.prompt', since that = is already unset by restore_test_defaults. Acked-by: =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason Acked-by: Jonathan Nieder Signed-off-by: Elijah Newren --- t/t7800-difftool.sh | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 58dc6f6..4048d10 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -98,7 +98,7 @@ test_expect_success PERL 'difftool --gui works withou= t configured diff.guitool' =20 # Specify the diff tool using $GIT_DIFF_TOOL test_expect_success PERL 'GIT_DIFF_TOOL variable' ' - git config --unset diff.tool + test_might_fail git config --unset diff.tool && GIT_DIFF_TOOL=3Dtest-tool && export GIT_DIFF_TOOL && =20 @@ -166,7 +166,7 @@ test_expect_success PERL 'difftool.prompt config va= riable is false' ' =20 # Test that we don't have to pass --no-prompt when mergetool.prompt is= false test_expect_success PERL 'difftool merge.prompt =3D false' ' - git config --unset difftool.prompt + test_might_fail git config --unset difftool.prompt && git config mergetool.prompt false && =20 diff=3D$(git difftool branch) && @@ -211,7 +211,7 @@ test_expect_success PERL 'difftool last flag wins' = ' # git-difftool falls back to git-mergetool config variables # so test that behavior here test_expect_success PERL 'difftool + mergetool config variables' ' - remove_config_vars + remove_config_vars && git config merge.tool test-tool && git config mergetool.test-tool.cmd "cat \$LOCAL" && =20 @@ -254,17 +254,17 @@ test_expect_success PERL 'difftool -x cat' ' ' =20 test_expect_success PERL 'difftool --extcmd echo arg1' ' - diff=3D$(git difftool --no-prompt --extcmd sh\ -c\ \"echo\ \$1\" bran= ch) + diff=3D$(git difftool --no-prompt --extcmd sh\ -c\ \"echo\ \$1\" bran= ch) && test "$diff" =3D file ' =20 test_expect_success PERL 'difftool --extcmd cat arg1' ' - diff=3D$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$1\" branc= h) + diff=3D$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$1\" branc= h) && test "$diff" =3D master ' =20 test_expect_success PERL 'difftool --extcmd cat arg2' ' - diff=3D$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$2\" branc= h) + diff=3D$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$2\" branc= h) && test "$diff" =3D branch ' =20 --=20 1.7.3.1.66.gab790