diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-12 18:34:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-12 18:35:14 -0700 |
| commit | eed94a570e0421175d6b4342c0ac48e03ceedf0b (patch) | |
| tree | f33864f2abffdcb83cbf626b26da34f9cc8d5bab /t/t4013-diff-various.sh | |
| parent | 4147d801db66df9b127ffe315601f467aa9d1c48 (diff) | |
| parent | 01aaf1f88ddc2b99162c302710339f202996f39b (diff) | |
| download | git-eed94a570e0421175d6b4342c0ac48e03ceedf0b.tar.gz | |
Merge branch 'master' into js/c-merge-recursive
Adjust to hold_lock_file_for_update() change on the master.
Diffstat (limited to 't/t4013-diff-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index b24c829f0f..71c454356f 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -88,7 +88,7 @@ test_expect_success setup ' +*+ [initial] Initial EOF -V=`git version | sed -e 's/^git version //'` +V=`git version | sed -e 's/^git version //' -e 's/\./\\./g'` while read cmd do case "$cmd" in @@ -103,7 +103,9 @@ do test_expect_success "git $cmd" ' { echo "\$ git $cmd" - git $cmd | sed -e "s/$V/g-i-t--v-e-r-s-i-o-n/" + git $cmd | + sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \ + -e "s/^\\( *boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/" echo "\$" } >"$actual" && if test -f "$expect" |