From mboxrd@z Thu Jan 1 00:00:00 1970 From: Elijah Newren Subject: =?UTF-8?q?=5BPATCHv3=2000/16=5D=20Add=20missing=20=26=26=27s=20in=20the=20testsuite?= Date: Sat, 25 Sep 2010 13:06:51 -0600 Message-ID: <1285441627-28233-1-git-send-email-newren@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Elijah Newren To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Sep 25 21:05:39 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 1Oza3y-00051f-VF for gcvg-git-2@lo.gmane.org; Sat, 25 Sep 2010 21:05:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754267Ab0IYTF0 convert rfc822-to-quoted-printable (ORCPT ); Sat, 25 Sep 2010 15:05:26 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:41285 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752968Ab0IYTF0 (ORCPT ); Sat, 25 Sep 2010 15:05:26 -0400 Received: by pvg2 with SMTP id 2so931665pvg.19 for ; Sat, 25 Sep 2010 12:05:25 -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:mime-version:content-type :content-transfer-encoding; bh=kZ2SdcCS/ktq5mfsAaOMkPAmJAppSMt3/L/JCOcUwFM=; b=iWeoW17jWMN7iW+MpZ8dGbRbLRwYUDki/p7XdFHShSUHW7nVEBCeRXr6v60MrGqx7m Ad0qhPy9keVcQHVkM5s2wzL9HLbmCWL5Q6sbcz7sYOQn+o/uEO0Gq7fub9wFiFUTaGB7 ezZcCQapc3q4LFPRP95umQW9xIuRmiQVC1Iaw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; b=rwilVTXpwzLc0zi3a/HEsQ8E5g2DWTDMcOGssAhUcM+H/MLoAhxZ5kGvrt4p3Hjwjl uupYEq1cjecFYpZxsWC3vZju3YZ1jy9mVXbWZkPqOVw+qkgqpHu9vM1fSxrIqehEPFTK D0usRZcL7XOk016j8X549rpU3R029Rw+Kdrnc= Received: by 10.114.127.20 with SMTP id z20mr5630993wac.218.1285441525654; Sat, 25 Sep 2010 12:05:25 -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 o17sm6338669wal.21.2010.09.25.12.05.23 (version=SSLv3 cipher=RC4-MD5); Sat, 25 Sep 2010 12:05:24 -0700 (PDT) X-Mailer: git-send-email 1.7.3.95.g14291 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This patch series fixes many of the missing &&s in the testsuite. I'm certain there are still others I have missed. Comments on whether t6050 really intended to have the grep fail (see patch 11), and whether a portable_unset() helper function would make sense (see patch 16), would be appreciated. Changes since v2: * Squashed patches 3 & 4 of previous series together given their similarity. * Made several changes suggested by =C3=86var Arnfj=C3=B6r=C3=B0 Bjar= mason and Jeff King * Dropped the FIXME questions (and the "RFC" in the submission, thoug= h perhaps I should leave it based on my questions in patches 11 and 1= 6) * Created a new patch at the end of the series to deal with the unportability of unset's return value with already unset variables, following the guidelines in t/README Elijah Newren (16): t3020 (ls-files-error-unmatch): remove stray '1' from end of file t4017 (diff-retval): replace manual exit code check with test_expect_code t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing && t4002 (diff-basic): use test_might_fail for commands that might fail t4202 (log): Replace ' || :' with test_might_fail t3600 (rm): add lots of missing && t4019 (diff-wserror): add lots of missing && t4026 (color): add missing && t5602 (clone-remote-exec): add missing && t6016 (rev-list-graph-simplify-history): add missing && t6050 (replace): add missing && t7001 (mv): add missing && t7601 (merge-pull-config): add missing && t7800 (difftool): add missing && Add missing &&'s throughout the testsuite Replace "unset VAR" with "unset VAR;" in testsuite as per t/README t/t0001-init.sh | 30 ++++++++-------- t/t0003-attributes.sh | 41 ++++++++++---------= -- t/t0020-crlf.sh | 2 +- t/t0024-crlf-archive.sh | 4 +- t/t0026-eol-config.sh | 2 +- t/t0050-filesystem.sh | 6 ++-- t/t1000-read-tree-m-3way.sh | 2 +- t/t1001-read-tree-m-2way.sh | 18 +++++----- t/t1002-read-tree-m-u-2way.sh | 10 +++--- t/t1302-repo-version.sh | 2 +- t/t1401-symbolic-ref.sh | 2 +- t/t1402-check-ref-format.sh | 4 +- t/t1410-reflog.sh | 8 ++-- t/t1501-worktree.sh | 2 +- t/t1509-root-worktree.sh | 6 ++-- t/t2007-checkout-symlink.sh | 2 +- t/t2016-checkout-patch.sh | 2 +- t/t2050-git-dir-relative.sh | 4 +- t/t2103-update-index-ignore-missing.sh | 2 +- t/t2200-add-update.sh | 2 +- t/t3001-ls-files-others-exclude.sh | 2 +- t/t3020-ls-files-error-unmatch.sh | 1 - t/t3050-subprojects-fetch.sh | 4 +- t/t3203-branch-output.sh | 6 ++-- t/t3307-notes-man.sh | 2 +- t/t3406-rebase-message.sh | 6 ++-- t/t3408-rebase-multi-line.sh | 2 +- t/t3504-cherry-pick-rerere.sh | 4 +- t/t3600-rm.sh | 38 +++++++++----------= - t/t3903-stash.sh | 4 +- t/t3904-stash-patch.sh | 2 +- t/t4002-diff-basic.sh | 12 +++--- t/t4017-diff-retval.sh | 30 +++++---------- t/t4019-diff-wserror.sh | 52 +++++++++++++------= ------- t/t4021-format-patch-numbered.sh | 2 +- t/t4026-color.sh | 1 - t/t4027-diff-submodule.sh | 2 +- t/t4103-apply-binary.sh | 8 ++-- t/t4104-apply-boundary.sh | 4 +- t/t4111-apply-subdir.sh | 4 +- t/t4119-apply-config.sh | 2 +- t/t4124-apply-ws-rule.sh | 4 +- t/t4127-apply-same-fn.sh | 18 +++++----- t/t4130-apply-criss-cross-rename.sh | 2 +- t/t4133-apply-filenames.sh | 6 ++-- t/t4150-am.sh | 2 +- t/t4202-log.sh | 2 +- t/t5300-pack-object.sh | 4 +- t/t5301-sliding-window.sh | 2 +- t/t5302-pack-index.sh | 2 +- t/t5500-fetch-pack.sh | 2 +- t/t5502-quickfetch.sh | 2 +- t/t5503-tagfollow.sh | 4 +- t/t5510-fetch.sh | 2 +- t/t5516-fetch-push.sh | 20 +++++----- t/t5517-push-mirror.sh | 10 +++--- t/t5519-push-alternates.sh | 2 +- t/t5531-deep-submodule-push.sh | 2 +- t/t5541-http-push.sh | 2 +- t/t5550-http-fetch.sh | 6 ++-- t/t5601-clone.sh | 6 ++-- t/t5602-clone-remote-exec.sh | 14 ++++---- t/t5701-clone-local.sh | 8 ++-- t/t5705-clone-2gb.sh | 2 +- t/t6009-rev-list-parent.sh | 2 +- t/t6010-merge-base.sh | 2 +- t/t6016-rev-list-graph-simplify-history.sh | 24 +++--------- t/t6022-merge-rename.sh | 2 +- t/t6024-recursive-merge.sh | 2 +- t/t6030-bisect-porcelain.sh | 8 ++-- t/t6040-tracking-info.sh | 2 +- t/t6050-replace.sh | 5 ++- t/t7001-mv.sh | 2 +- t/t7004-tag.sh | 14 ++++---- t/t7105-reset-patch.sh | 6 ++-- t/t7300-clean.sh | 6 ++-- t/t7501-commit.sh | 2 +- t/t7502-commit.sh | 6 ++-- t/t7506-status-submodule.sh | 2 +- t/t7600-merge.sh | 2 +- t/t7601-merge-pull-config.sh | 12 +++--- t/t7610-mergetool.sh | 2 +- t/t7700-repack.sh | 2 +- t/t7800-difftool.sh | 11 +++--- t/t8003-blame.sh | 6 ++-- t/t9122-git-svn-author.sh | 4 +- t/t9123-git-svn-rebuild-with-rewriteroot.sh | 2 +- t/t9134-git-svn-ignore-paths.sh | 6 ++-- t/t9137-git-svn-dcommit-clobber-series.sh | 2 +- t/t9138-git-svn-authors-prog.sh | 6 ++-- t/t9146-git-svn-empty-dirs.sh | 6 ++-- t/t9151-svn-mergeinfo.sh | 22 ++++++------ t/t9200-git-cvsexportcommit.sh | 4 +- t/t9401-git-cvsserver-crlf.sh | 2 +- t/t9600-cvsimport.sh | 2 +- 95 files changed, 305 insertions(+), 334 deletions(-) --=20 1.7.3.95.g14291