* Re: [PATCH 00/40] test whitespace - perform trivial whitespace clean ups of test scripts.
From: Jeff King @ 2011-08-06 9:20 UTC (permalink / raw)
To: Jon Seymour; +Cc: git
In-Reply-To: <1312620119-18369-1-git-send-email-jon.seymour@gmail.com>
On Sat, Aug 06, 2011 at 06:41:59PM +1000, Jon Seymour wrote:
> The series applies cleanly to both master and pu.
>
> The first patch contains a script, t/test-cleaner.sh, that can
> automate whitespace cleanup of tests.
Hmm. Can't we do something similar using git itself, and clean up all
sorts of whitespace errors?
I tried:
rm t/t1006-cat-file.sh
git diff -R | git apply --whitespace=fix
and ended up with the same blob as your script.
In theory you could do the whole tree:
git ls-files -z | xargs -0 rm
git diff -R --binary | git apply --whitespace=fix
though it reports 604 whitespace errors, but only 489 lines fixed. And
t1006 is not among the modified files. So I wonder if this is a bug in
git-apply, or am I missing something.
-Peff
^ permalink raw reply
* Re: [PATCH 01/40] test-cleaner: automate whitespace cleaning of test scripts
From: Jon Seymour @ 2011-08-06 9:17 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
On Sat, Aug 6, 2011 at 6:44 PM, Jon Seymour <jon.seymour@gmail.com> wrote:
> This script allows the automated cleaning of test scripts.
>
> Any whitespace fixups of a test script that do not effect the
> exit status or output of the test are assumed to be safe
> and are automatically committed.
Actually, this is not true - commits are generated, if the file
matches the filtering criteria for the fix subcommand specified.
> If no arguments are supplied, file arguments are read from stdin.
Should I use - for instead?
> +
> +fix_whitespace_auto()
> +{
> + check_whitespace "$@" 2>/dev/null | grep "^AUTO" | fix_whitespace
> +}
> +
> +fix_whitespace_auto()
> +{
> + check_whitespace "$@" 2>/dev/null | grep "^MANUAL" | fix_whitespace
> +}
Both these need cut -f1 before the fix_whitespace stage.
jon.
^ permalink raw reply
* Re: [PATCH 00/40] test whitespace - perform trivial whitespace clean ups of test scripts.
From: Jon Seymour @ 2011-08-06 9:03 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620119-18369-1-git-send-email-jon.seymour@gmail.com>
On Sat, Aug 6, 2011 at 6:41 PM, Jon Seymour <jon.seymour@gmail.com> wrote:
>
>...
One can imagine generalising test-cleaner.sh to things that aren't tests.
So, something like:
git whitespace-cleaner --test "make test" *.c *.h
would do whitespace cleaning on all .c and .h files and then use a
bisection process to find the edits that cause a break in the test
suite. Then rewrite the history and iterate the process to find the
maximal series of whitespace fixups that does not break the test
suite.
jon.
^ permalink raw reply
* [PATCH 07/40] whitespace: remediate t3200-branch.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t3200-branch.sh | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 9e69c8c..67d683d 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -65,30 +65,30 @@ test_expect_success \
test_expect_success \
'git branch j/k should work after branch j has been deleted' \
'git branch j &&
- git branch -d j &&
- git branch j/k'
+ git branch -d j &&
+ git branch j/k'
test_expect_success \
'git branch l should work after branch l/m has been deleted' \
'git branch l/m &&
- git branch -d l/m &&
- git branch l'
+ git branch -d l/m &&
+ git branch l'
test_expect_success \
'git branch -m m m/m should work' \
'git branch -l m &&
- git branch -m m m/m &&
- test -f .git/logs/refs/heads/m/m'
+ git branch -m m m/m &&
+ test -f .git/logs/refs/heads/m/m'
test_expect_success \
'git branch -m n/n n should work' \
'git branch -l n/n &&
- git branch -m n/n n
- test -f .git/logs/refs/heads/n'
+ git branch -m n/n n
+ test -f .git/logs/refs/heads/n'
test_expect_success 'git branch -m o/o o should fail when o/p exists' '
git branch o/o &&
- git branch o/p &&
+ git branch o/p &&
test_must_fail git branch -m o/o o
'
@@ -112,12 +112,12 @@ git config branch.s/s.dummy Hello
test_expect_success \
'git branch -m s/s s should work when s/t is deleted' \
'git branch -l s/s &&
- test -f .git/logs/refs/heads/s/s &&
- git branch -l s/t &&
- test -f .git/logs/refs/heads/s/t &&
- git branch -d s/t &&
- git branch -m s/s s &&
- test -f .git/logs/refs/heads/s'
+ test -f .git/logs/refs/heads/s/s &&
+ git branch -l s/t &&
+ test -f .git/logs/refs/heads/s/t &&
+ git branch -d s/t &&
+ git branch -m s/s s &&
+ test -f .git/logs/refs/heads/s'
test_expect_success 'config information was renamed, too' \
"test $(git config branch.s.dummy) = Hello &&
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 27/40] whitespace: remediate t9100-git-svn-basic.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t9100-git-svn-basic.sh | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index b041516..225d88b 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -210,27 +210,27 @@ EOF
test_expect_success "$name" "test_cmp a expected"
test_expect_success 'exit if remote refs are ambigious' "
- git config --add svn-remote.svn.fetch \
- bar:refs/${remotes_git_svn} &&
+ git config --add svn-remote.svn.fetch \
+ bar:refs/${remotes_git_svn} &&
test_must_fail git svn migrate
"
test_expect_success 'exit if init-ing a would clobber a URL' '
- svnadmin create "${PWD}/svnrepo2" &&
- svn mkdir -m "mkdir bar" "${svnrepo}2/bar" &&
- git config --unset svn-remote.svn.fetch \
- "^bar:refs/${remotes_git_svn}$" &&
+ svnadmin create "${PWD}/svnrepo2" &&
+ svn mkdir -m "mkdir bar" "${svnrepo}2/bar" &&
+ git config --unset svn-remote.svn.fetch \
+ "^bar:refs/${remotes_git_svn}$" &&
test_must_fail git svn init "${svnrepo}2/bar"
- '
+ '
test_expect_success \
'init allows us to connect to another directory in the same repo' '
- git svn init --minimize-url -i bar "$svnrepo/bar" &&
- git config --get svn-remote.svn.fetch \
- "^bar:refs/remotes/bar$" &&
- git config --get svn-remote.svn.fetch \
- "^:refs/${remotes_git_svn}$"
- '
+ git svn init --minimize-url -i bar "$svnrepo/bar" &&
+ git config --get svn-remote.svn.fetch \
+ "^bar:refs/remotes/bar$" &&
+ git config --get svn-remote.svn.fetch \
+ "^:refs/${remotes_git_svn}$"
+ '
test_expect_success 'dcommit $rev does not clobber current branch' '
git svn fetch -i bar &&
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 09/40] whitespace: remediate t4002-diff-basic.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t4002-diff-basic.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t4002-diff-basic.sh b/t/t4002-diff-basic.sh
index a5e8b83..b6730a5 100755
--- a/t/t4002-diff-basic.sh
+++ b/t/t4002-diff-basic.sh
@@ -258,9 +258,9 @@ test_expect_success \
test_expect_success \
'diff can read from stdin' \
'test_must_fail git diff --no-index -- MN - < NN |
- grep -v "^index" | sed "s#/-#/NN#" >.test-a &&
+ grep -v "^index" | sed "s#/-#/NN#" >.test-a &&
test_must_fail git diff --no-index -- MN NN |
- grep -v "^index" >.test-b &&
+ grep -v "^index" >.test-b &&
test_cmp .test-a .test-b'
test_done
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 25/40] whitespace: remediate t7500-commit.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t7500-commit.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
index 1c908f4..ac64632 100755
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
@@ -142,7 +142,7 @@ test_expect_success 'using alternate GIT_INDEX_FILE (1)' '
cp .git/index saved-index &&
(
echo some new content >file &&
- GIT_INDEX_FILE=.git/another_index &&
+ GIT_INDEX_FILE=.git/another_index &&
export GIT_INDEX_FILE &&
git add file &&
git commit -m "commit using another index" &&
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 31/40] whitespace: remediate t9109-git-svn-multi-glob.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t9109-git-svn-multi-glob.sh | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/t/t9109-git-svn-multi-glob.sh b/t/t9109-git-svn-multi-glob.sh
index c318f9f..5c48f46 100755
--- a/t/t9109-git-svn-multi-glob.sh
+++ b/t/t9109-git-svn-multi-glob.sh
@@ -41,11 +41,11 @@ test_expect_success 'test refspec globbing' '
) &&
git config --add svn-remote.svn.url "$svnrepo" &&
git config --add svn-remote.svn.fetch \
- "trunk/src/a:refs/remotes/trunk" &&
+ "trunk/src/a:refs/remotes/trunk" &&
git config --add svn-remote.svn.branches \
- "branches/*/*/src/a:refs/remotes/branches/*/*" &&
+ "branches/*/*/src/a:refs/remotes/branches/*/*" &&
git config --add svn-remote.svn.tags\
- "tags/*/src/a:refs/remotes/tags/*" &&
+ "tags/*/src/a:refs/remotes/tags/*" &&
git svn multi-fetch &&
git log --pretty=oneline refs/remotes/tags/end | \
sed -e "s/^.\{41\}//" > output.end &&
@@ -65,9 +65,9 @@ test_expect_success 'test left-hand-side only globbing' '
git config --add svn-remote.two.url "$svnrepo" &&
git config --add svn-remote.two.fetch trunk:refs/remotes/two/trunk &&
git config --add svn-remote.two.branches \
- "branches/*/*:refs/remotes/two/branches/*/*" &&
+ "branches/*/*:refs/remotes/two/branches/*/*" &&
git config --add svn-remote.two.tags \
- "tags/*:refs/remotes/two/tags/*" &&
+ "tags/*:refs/remotes/two/tags/*" &&
(
cd tmp &&
echo "try try" >> tags/end/src/b/readme &&
@@ -120,9 +120,9 @@ test_expect_success 'test another branch' '
git config --add svn-remote.four.url "$svnrepo" &&
git config --add svn-remote.four.fetch trunk:refs/remotes/four/trunk &&
git config --add svn-remote.four.branches \
- "branches/*/*:refs/remotes/four/branches/*/*" &&
+ "branches/*/*:refs/remotes/four/branches/*/*" &&
git config --add svn-remote.four.tags \
- "tags/*:refs/remotes/four/tags/*" &&
+ "tags/*:refs/remotes/four/tags/*" &&
git svn fetch four &&
test `git rev-list refs/remotes/four/tags/next | wc -l` -eq 5 &&
test `git rev-list refs/remotes/four/branches/v2/start | wc -l` -eq 3 &&
@@ -142,11 +142,11 @@ echo "" >> expect.three
test_expect_success 'test disallow multiple globs' '
git config --add svn-remote.three.url "$svnrepo" &&
git config --add svn-remote.three.fetch \
- trunk:refs/remotes/three/trunk &&
+ trunk:refs/remotes/three/trunk &&
git config --add svn-remote.three.branches \
- "branches/*/t/*:refs/remotes/three/branches/*/*" &&
+ "branches/*/t/*:refs/remotes/three/branches/*/*" &&
git config --add svn-remote.three.tags \
- "tags/*:refs/remotes/three/tags/*" &&
+ "tags/*:refs/remotes/three/tags/*" &&
(
cd tmp &&
echo "try try" >> tags/end/src/b/readme &&
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 05/40] whitespace: remediate t1503-rev-parse-verify.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t1503-rev-parse-verify.sh | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh
index 813cc1b..5cc50e7 100755
--- a/t/t1503-rev-parse-verify.sh
+++ b/t/t1503-rev-parse-verify.sh
@@ -14,12 +14,12 @@ add_line_into_file()
_file=$2
if [ -f "$_file" ]; then
- echo "$_line" >> $_file || return $?
- MSG="Add <$_line> into <$_file>."
+ echo "$_line" >> $_file || return $?
+ MSG="Add <$_line> into <$_file>."
else
- echo "$_line" > $_file || return $?
- git add $_file || return $?
- MSG="Create file <$_file> with <$_line> inside."
+ echo "$_line" > $_file || return $?
+ git add $_file || return $?
+ MSG="Create file <$_file> with <$_line> inside."
fi
test_tick
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 34/40] whitespace: remediate t9125-git-svn-multi-glob-branch-names.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t9125-git-svn-multi-glob-branch-names.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t9125-git-svn-multi-glob-branch-names.sh b/t/t9125-git-svn-multi-glob-branch-names.sh
index 096abd1..c00597d 100755
--- a/t/t9125-git-svn-multi-glob-branch-names.sh
+++ b/t/t9125-git-svn-multi-glob-branch-names.sh
@@ -11,14 +11,14 @@ test_expect_success 'setup svnrepo' '
svn_cmd import -m "$test_description" project "$svnrepo/project" &&
rm -rf project &&
svn_cmd cp -m "fun" "$svnrepo/project/trunk" \
- "$svnrepo/project/branches/v14.1/beta" &&
+ "$svnrepo/project/branches/v14.1/beta" &&
svn_cmd cp -m "more fun!" "$svnrepo/project/branches/v14.1/beta" \
- "$svnrepo/project/branches/v14.1/gold"
+ "$svnrepo/project/branches/v14.1/gold"
'
test_expect_success 'test clone with multi-glob in branch names' '
git svn clone -T trunk -b branches/*/* -t tags \
- "$svnrepo/project" project &&
+ "$svnrepo/project" project &&
(cd project &&
git rev-parse "refs/remotes/v14.1/beta" &&
git rev-parse "refs/remotes/v14.1/gold"
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 40/40] whitespace: remediate t6120-describe.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t6120-describe.sh | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index f67aa6f..d8838b4 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -2,13 +2,13 @@
test_description='test describe
- B
- .--------------o----o----o----x
+ B
+ .--------------o----o----o----x
/ / /
o----o----o----o----o----. /
\ A c /
- .------------o---o---o
- D,R e
+ .------------o---o---o
+ D,R e
'
. ./test-lib.sh
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 39/40] whitespace: remediate t1000-read-tree-m-3way.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t1000-read-tree-m-3way.sh | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh
index babcdd2..b461b42 100755
--- a/t/t1000-read-tree-m-3way.sh
+++ b/t/t1000-read-tree-m-3way.sh
@@ -169,7 +169,7 @@ checked.
3 missing exists missing take A* must match A, if exists.
------------------------------------------------------------------
4 missing exists A!=B no merge must match A and be
- up-to-date, if exists.
+ up-to-date, if exists.
------------------------------------------------------------------
5 missing exists A==B take A must match A, if exists.
------------------------------------------------------------------
@@ -180,21 +180,21 @@ checked.
8 exists missing O==B remove must not exist.
------------------------------------------------------------------
9 exists O!=A missing no merge must match A and be
- up-to-date, if exists.
+ up-to-date, if exists.
------------------------------------------------------------------
10 exists O==A missing no merge must match A
------------------------------------------------------------------
11 exists O!=A O!=B no merge must match A and be
- A!=B up-to-date, if exists.
+ A!=B up-to-date, if exists.
------------------------------------------------------------------
12 exists O!=A O!=B take A must match A, if exists.
- A==B
+ A==B
------------------------------------------------------------------
13 exists O!=A O==B take A must match A, if exists.
------------------------------------------------------------------
14 exists O==A O!=B take B if exists, must either (1)
- match A and be up-to-date,
- or (2) match B.
+ match A and be up-to-date,
+ or (2) match B.
------------------------------------------------------------------
15 exists O==A O==B take B must match A if exists.
------------------------------------------------------------------
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 37/40] whitespace: remediate t9500-gitweb-standalone-no-errors.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t9500-gitweb-standalone-no-errors.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index 5329715..d81764c 100755
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -502,8 +502,8 @@ test_expect_success \
test_expect_success \
'URL: project URLs via gitweb.url' \
'git config --add gitweb.url git://example.com/git/trash.git &&
- git config --add gitweb.url http://example.com/git/trash.git &&
- gitweb_run "p=.git;a=summary"'
+ git config --add gitweb.url http://example.com/git/trash.git &&
+ gitweb_run "p=.git;a=summary"'
cat >.git/cloneurl <<\EOF
git://example.com/git/trash.git
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 38/40] whitespace: remediate t9603-cvsimport-patchsets.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t9603-cvsimport-patchsets.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
index 52034c8..93c4108 100755
--- a/t/t9603-cvsimport-patchsets.sh
+++ b/t/t9603-cvsimport-patchsets.sh
@@ -20,9 +20,9 @@ test_expect_failure 'import with criss cross times on revisions' '
git cvsimport -p"-x" -C module-git module &&
(cd module-git &&
- git log --pretty=format:%s > ../actual-master &&
- git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
- echo "" >> ../actual-master &&
+ git log --pretty=format:%s > ../actual-master &&
+ git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
+ echo "" >> ../actual-master &&
echo "" >> ../actual-A
) &&
echo "Rev 4
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 35/40] whitespace: remediate t9400-git-cvsserver-server.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t9400-git-cvsserver-server.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index 9199550..193d485 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -337,9 +337,9 @@ test_expect_success 'cvs update (subdirectories)' \
filename="file_in_$(echo $dir|sed -e "s#/# #g")" &&
if test "$(echo $(grep -v ^D $dir/CVS/Entries|cut -d/ -f2,3,5))" = "$filename/1.1/" &&
test_cmp "$dir/$filename" "../$dir/$filename"; then
- :
+ :
else
- echo >failure
+ echo >failure
fi
done) &&
test ! -f failure'
@@ -448,7 +448,7 @@ test_expect_success 'cvs update (-p)' '
GIT_CONFIG="$git_config" cvs update &&
rm -f failures &&
for i in merge no-lf empty really-empty; do
- GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out
+ GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out
test_cmp $i.out ../$i >>failures 2>&1
done &&
test -z "$(cat failures)"
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 36/40] whitespace: remediate t9401-git-cvsserver-crlf.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t9401-git-cvsserver-crlf.sh | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
index ff6d6fb..302a24b 100755
--- a/t/t9401-git-cvsserver-crlf.sh
+++ b/t/t9401-git-cvsserver-crlf.sh
@@ -26,15 +26,15 @@ marked_as () {
not_present() {
foundEntry="$(grep "^/$2/" "$1/CVS/Entries")"
if [ -r "$1/$2" ] ; then
- echo "Error: File still exists: $1 $2" >> "${WORKDIR}/marked.log"
- return 1;
+ echo "Error: File still exists: $1 $2" >> "${WORKDIR}/marked.log"
+ return 1;
fi
if [ x"$foundEntry" != x"" ] ; then
- echo "Error: should not have found: $1 $2" >> "${WORKDIR}/marked.log"
- return 1;
+ echo "Error: should not have found: $1 $2" >> "${WORKDIR}/marked.log"
+ return 1;
else
- echo "Correctly not found: $1 $2" >> "${WORKDIR}/marked.log"
- return 0;
+ echo "Correctly not found: $1 $2" >> "${WORKDIR}/marked.log"
+ return 0;
fi
}
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 33/40] whitespace: remediate t9118-git-svn-funky-branch-names.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t9118-git-svn-funky-branch-names.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t9118-git-svn-funky-branch-names.sh b/t/t9118-git-svn-funky-branch-names.sh
index 63fc982..52c7436 100755
--- a/t/t9118-git-svn-funky-branch-names.sh
+++ b/t/t9118-git-svn-funky-branch-names.sh
@@ -16,11 +16,11 @@ test_expect_success 'setup svnrepo' '
svn_cmd import -m "$test_description" project "$svnrepo/pr ject" &&
rm -rf project &&
svn_cmd cp -m "fun" "$svnrepo/pr ject/trunk" \
- "$svnrepo/pr ject/branches/fun plugin" &&
+ "$svnrepo/pr ject/branches/fun plugin" &&
svn_cmd cp -m "more fun!" "$svnrepo/pr ject/branches/fun plugin" \
- "$svnrepo/pr ject/branches/more fun plugin!" &&
+ "$svnrepo/pr ject/branches/more fun plugin!" &&
svn_cmd cp -m "scary" "$svnrepo/pr ject/branches/fun plugin" \
- "$svnrepo/pr ject/branches/$scary_uri" &&
+ "$svnrepo/pr ject/branches/$scary_uri" &&
svn_cmd cp -m "leading dot" "$svnrepo/pr ject/trunk" \
"$svnrepo/pr ject/branches/.leading_dot" &&
svn_cmd cp -m "trailing dot" "$svnrepo/pr ject/trunk" \
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 32/40] whitespace: remediate t9110-git-svn-use-svm-props.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t9110-git-svn-use-svm-props.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t9110-git-svn-use-svm-props.sh b/t/t9110-git-svn-use-svm-props.sh
index a06e4c5..7db429c 100755
--- a/t/t9110-git-svn-use-svm-props.sh
+++ b/t/t9110-git-svn-use-svm-props.sh
@@ -50,9 +50,9 @@ test_expect_success 'verify metadata for /dir' "
"
test_expect_success 'find commit based on SVN revision number' "
- git svn find-rev r12 |
+ git svn find-rev r12 |
grep `git rev-parse HEAD`
- "
+ "
test_expect_success 'empty rebase' "
git svn rebase
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 28/40] whitespace: remediate t9104-git-svn-follow-parent.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t9104-git-svn-follow-parent.sh | 88 +++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 13b179e..1ba69f4 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -32,57 +32,57 @@ test_expect_success 'init and fetch a moved directory' '
git svn init --minimize-url -i thunk "$svnrepo"/thunk &&
git svn fetch -i thunk &&
test "`git rev-parse --verify refs/remotes/thunk@2`" \
- = "`git rev-parse --verify refs/remotes/thunk~1`" &&
- test "`git cat-file blob refs/remotes/thunk:readme |\
- sed -n -e "3p"`" = goodbye &&
+ = "`git rev-parse --verify refs/remotes/thunk~1`" &&
+ test "`git cat-file blob refs/remotes/thunk:readme |\
+ sed -n -e "3p"`" = goodbye &&
test -z "`git config --get svn-remote.svn.fetch \
- "^trunk:refs/remotes/thunk@2$"`"
+ "^trunk:refs/remotes/thunk@2$"`"
'
test_expect_success 'init and fetch from one svn-remote' '
- git config svn-remote.svn.url "$svnrepo" &&
- git config --add svn-remote.svn.fetch \
- trunk:refs/remotes/svn/trunk &&
- git config --add svn-remote.svn.fetch \
- thunk:refs/remotes/svn/thunk &&
- git svn fetch -i svn/thunk &&
+ git config svn-remote.svn.url "$svnrepo" &&
+ git config --add svn-remote.svn.fetch \
+ trunk:refs/remotes/svn/trunk &&
+ git config --add svn-remote.svn.fetch \
+ thunk:refs/remotes/svn/thunk &&
+ git svn fetch -i svn/thunk &&
test "`git rev-parse --verify refs/remotes/svn/trunk`" \
- = "`git rev-parse --verify refs/remotes/svn/thunk~1`" &&
- test "`git cat-file blob refs/remotes/svn/thunk:readme |\
- sed -n -e "3p"`" = goodbye
- '
+ = "`git rev-parse --verify refs/remotes/svn/thunk~1`" &&
+ test "`git cat-file blob refs/remotes/svn/thunk:readme |\
+ sed -n -e "3p"`" = goodbye
+ '
test_expect_success 'follow deleted parent' '
- (svn_cmd cp -m "resurrecting trunk as junk" \
- "$svnrepo"/trunk@2 "$svnrepo"/junk ||
- svn cp -m "resurrecting trunk as junk" \
- -r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
- git config --add svn-remote.svn.fetch \
- junk:refs/remotes/svn/junk &&
- git svn fetch -i svn/thunk &&
- git svn fetch -i svn/junk &&
- test -z "`git diff svn/junk svn/trunk`" &&
- test "`git merge-base svn/junk svn/trunk`" \
- = "`git rev-parse svn/trunk`"
- '
+ (svn_cmd cp -m "resurrecting trunk as junk" \
+ "$svnrepo"/trunk@2 "$svnrepo"/junk ||
+ svn cp -m "resurrecting trunk as junk" \
+ -r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
+ git config --add svn-remote.svn.fetch \
+ junk:refs/remotes/svn/junk &&
+ git svn fetch -i svn/thunk &&
+ git svn fetch -i svn/junk &&
+ test -z "`git diff svn/junk svn/trunk`" &&
+ test "`git merge-base svn/junk svn/trunk`" \
+ = "`git rev-parse svn/trunk`"
+ '
test_expect_success 'follow larger parent' '
- mkdir -p import/trunk/thunk/bump/thud &&
- echo hi > import/trunk/thunk/bump/thud/file &&
- svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
- svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
- git svn init --minimize-url -i larger \
- "$svnrepo"/another-larger/trunk/thunk/bump/thud &&
- git svn fetch -i larger &&
- git rev-parse --verify refs/remotes/larger &&
- git rev-parse --verify \
- refs/remotes/larger-parent/trunk/thunk/bump/thud &&
- test "`git merge-base \
- refs/remotes/larger-parent/trunk/thunk/bump/thud \
- refs/remotes/larger`" = \
- "`git rev-parse refs/remotes/larger`"
- true
- '
+ mkdir -p import/trunk/thunk/bump/thud &&
+ echo hi > import/trunk/thunk/bump/thud/file &&
+ svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
+ svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
+ git svn init --minimize-url -i larger \
+ "$svnrepo"/another-larger/trunk/thunk/bump/thud &&
+ git svn fetch -i larger &&
+ git rev-parse --verify refs/remotes/larger &&
+ git rev-parse --verify \
+ refs/remotes/larger-parent/trunk/thunk/bump/thud &&
+ test "`git merge-base \
+ refs/remotes/larger-parent/trunk/thunk/bump/thud \
+ refs/remotes/larger`" = \
+ "`git rev-parse refs/remotes/larger`"
+ true
+ '
test_expect_success 'follow higher-level parent' '
svn mkdir -m "follow higher-level parent" "$svnrepo"/blob &&
@@ -96,8 +96,8 @@ test_expect_success 'follow higher-level parent' '
svn mkdir -m "new glob at top level" "$svnrepo"/glob &&
svn mv -m "move blob down a level" "$svnrepo"/blob "$svnrepo"/glob/blob &&
git svn init --minimize-url -i blob "$svnrepo"/glob/blob &&
- git svn fetch -i blob
- '
+ git svn fetch -i blob
+ '
test_expect_success 'follow deleted directory' '
svn_cmd mv -m "bye!" "$svnrepo"/glob/blob/hi "$svnrepo"/glob/blob/bye &&
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 29/40] whitespace: remediate t9107-git-svn-migrate.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t9107-git-svn-migrate.sh | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index 289fc31..789d2b9 100755
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -37,7 +37,7 @@ test_expect_success 'initialize old-style (v0) git svn layout' '
git rev-parse --verify refs/remotes/svn^0 &&
test "$(git config --get svn-remote.svn.url)" = "$svnrepo" &&
test `git config --get svn-remote.svn.fetch` = \
- ":refs/${remotes_git_svn}"
+ ":refs/${remotes_git_svn}"
'
test_expect_success 'initialize a multi-repository repo' '
@@ -45,18 +45,18 @@ test_expect_success 'initialize a multi-repository repo' '
git config --get-all svn-remote.svn.fetch > fetch.out &&
grep "^trunk:refs/remotes/trunk$" fetch.out &&
test -n "`git config --get svn-remote.svn.branches \
- "^branches/\*:refs/remotes/\*$"`" &&
+ "^branches/\*:refs/remotes/\*$"`" &&
test -n "`git config --get svn-remote.svn.tags \
- "^tags/\*:refs/remotes/tags/\*$"`" &&
+ "^tags/\*:refs/remotes/tags/\*$"`" &&
git config --unset svn-remote.svn.branches \
- "^branches/\*:refs/remotes/\*$" &&
+ "^branches/\*:refs/remotes/\*$" &&
git config --unset svn-remote.svn.tags \
- "^tags/\*:refs/remotes/tags/\*$" &&
+ "^tags/\*:refs/remotes/tags/\*$" &&
git config --add svn-remote.svn.fetch "branches/a:refs/remotes/a" &&
git config --add svn-remote.svn.fetch "branches/b:refs/remotes/b" &&
for i in tags/0.1 tags/0.2 tags/0.3; do
git config --add svn-remote.svn.fetch \
- $i:refs/remotes/$i || exit 1; done &&
+ $i:refs/remotes/$i || exit 1; done &&
git config --get-all svn-remote.svn.fetch > fetch.out &&
grep "^trunk:refs/remotes/trunk$" fetch.out &&
grep "^branches/a:refs/remotes/a$" fetch.out &&
@@ -78,7 +78,7 @@ test_expect_success 'multi-fetch works on partial urls + paths' "
for j in trunk a b tags/0.1 tags/0.2 tags/0.3; do
if test \$j != \$i; then continue; fi
test -z \"\`git diff refs/remotes/\$i \
- refs/remotes/\$j\`\" ||exit 1; done; done
+ refs/remotes/\$j\`\" ||exit 1; done; done
"
test_expect_success 'migrate --minimize on old inited layout' '
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 30/40] whitespace: remediate t9108-git-svn-glob.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t9108-git-svn-glob.sh | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/t/t9108-git-svn-glob.sh b/t/t9108-git-svn-glob.sh
index d732d31..a58f794 100755
--- a/t/t9108-git-svn-glob.sh
+++ b/t/t9108-git-svn-glob.sh
@@ -41,11 +41,11 @@ test_expect_success 'test refspec globbing' '
) &&
git config --add svn-remote.svn.url "$svnrepo" &&
git config --add svn-remote.svn.fetch \
- "trunk/src/a:refs/remotes/trunk" &&
+ "trunk/src/a:refs/remotes/trunk" &&
git config --add svn-remote.svn.branches \
- "branches/*/src/a:refs/remotes/branches/*" &&
+ "branches/*/src/a:refs/remotes/branches/*" &&
git config --add svn-remote.svn.tags\
- "tags/*/src/a:refs/remotes/tags/*" &&
+ "tags/*/src/a:refs/remotes/tags/*" &&
git svn multi-fetch &&
git log --pretty=oneline refs/remotes/tags/end | \
sed -e "s/^.\{41\}//" > output.end &&
@@ -65,9 +65,9 @@ test_expect_success 'test left-hand-side only globbing' '
git config --add svn-remote.two.url "$svnrepo" &&
git config --add svn-remote.two.fetch trunk:refs/remotes/two/trunk &&
git config --add svn-remote.two.branches \
- "branches/*:refs/remotes/two/branches/*" &&
+ "branches/*:refs/remotes/two/branches/*" &&
git config --add svn-remote.two.tags \
- "tags/*:refs/remotes/two/tags/*" &&
+ "tags/*:refs/remotes/two/tags/*" &&
(
cd tmp &&
echo "try try" >> tags/end/src/b/readme &&
@@ -93,11 +93,11 @@ echo "" >> expect.three
test_expect_success 'test disallow multi-globs' '
git config --add svn-remote.three.url "$svnrepo" &&
git config --add svn-remote.three.fetch \
- trunk:refs/remotes/three/trunk &&
+ trunk:refs/remotes/three/trunk &&
git config --add svn-remote.three.branches \
- "branches/*/t/*:refs/remotes/three/branches/*" &&
+ "branches/*/t/*:refs/remotes/three/branches/*" &&
git config --add svn-remote.three.tags \
- "tags/*/*:refs/remotes/three/tags/*" &&
+ "tags/*/*:refs/remotes/three/tags/*" &&
(
cd tmp &&
echo "try try" >> tags/end/src/b/readme &&
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 21/40] whitespace: remediate t6030-bisect-porcelain.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t6030-bisect-porcelain.sh | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index b5063b6..479184f 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -14,12 +14,12 @@ add_line_into_file()
_file=$2
if [ -f "$_file" ]; then
- echo "$_line" >> $_file || return $?
- MSG="Add <$_line> into <$_file>."
+ echo "$_line" >> $_file || return $?
+ MSG="Add <$_line> into <$_file>."
else
- echo "$_line" > $_file || return $?
- git add $_file || return $?
- MSG="Create file <$_file> with <$_line> inside."
+ echo "$_line" > $_file || return $?
+ git add $_file || return $?
+ MSG="Create file <$_file> with <$_line> inside."
fi
test_tick
@@ -559,10 +559,10 @@ test_expect_success 'skipping away from skipped commit' '
git bisect start $PARA_HASH7 $HASH1 &&
para4=$(git rev-parse --verify HEAD) &&
test "$para4" = "$PARA_HASH4" &&
- git bisect skip &&
+ git bisect skip &&
hash7=$(git rev-parse --verify HEAD) &&
test "$hash7" = "$HASH7" &&
- git bisect skip &&
+ git bisect skip &&
para3=$(git rev-parse --verify HEAD) &&
test "$para3" = "$PARA_HASH3"
'
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 26/40] whitespace: remediate t7810-grep.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t7810-grep.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index a29ae45..348e575 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -168,7 +168,7 @@ do
test_expect_success "grep -c $L (no /dev/null)" '
! git grep -c test $H | grep /dev/null
- '
+ '
test_expect_success "grep --max-depth -1 $L" '
{
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 22/40] whitespace: remediate t7003-filter-branch.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t7003-filter-branch.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index e022773..96aca9e 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -147,7 +147,7 @@ test_expect_success 'use index-filter to move into a subdirectory' '
git branch directorymoved &&
git filter-branch -f --index-filter \
"git ls-files -s | sed \"s- -&newsubdir/-\" |
- GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
+ GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
git update-index --index-info &&
mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&
git diff --exit-code HEAD directorymoved:newsubdir
--
1.7.6.362.gf0e6
^ permalink raw reply related
* [PATCH 23/40] whitespace: remediate t7004-tag.sh
From: Jon Seymour @ 2011-08-06 8:44 UTC (permalink / raw)
To: git; +Cc: Jon Seymour
In-Reply-To: <1312620294-18616-1-git-send-email-jon.seymour@gmail.com>
This file was edited by applying:
expand -i | unexpand --first-only | sed "s/ *$//"
to the file.
No change to test outputs or status code was observed.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t7004-tag.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 097ce2b..1ae978c 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1239,7 +1239,7 @@ test_expect_success 'checking that third commit has no tags' "
test_expect_success 'creating simple branch' '
git branch stable v2.0 &&
- git checkout stable &&
+ git checkout stable &&
echo foo-3.0 > foo &&
git commit foo -m fourth &&
git tag v3.0
@@ -1258,7 +1258,7 @@ test_expect_success 'checking that branch head only has one tag' "
test_expect_success 'merging original branch into this branch' '
git merge --strategy=ours master &&
- git tag v4.0
+ git tag v4.0
'
cat > expected <<EOF
--
1.7.6.362.gf0e6
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox