summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-08-12 18:07:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-12 18:07:09 -0700
commit642f7108f68ef622b338d27d94a956e32c8567dd (patch)
tree32972655c14bdbd803e3842cb2220b9045632199 /t
parentMerge branch 'maint' (diff)
parentpush: mention "git pull" in error message for non-fast forwards (diff)
downloadtgif-642f7108f68ef622b338d27d94a956e32c8567dd.tar.xz
Merge branch 'maint'
* maint: push: mention "git pull" in error message for non-fast forwards Standardize do { ... } while (0) style t/t7003: replace \t with literal tab in sed expression index-pack: Don't follow replace refs.
Diffstat (limited to 't')
-rwxr-xr-xt/t6050-replace.sh6
-rwxr-xr-xt/t7003-filter-branch.sh2
2 files changed, 7 insertions, 1 deletions
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 203ffdb17a..4185b7ca1d 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -219,6 +219,12 @@ test_expect_success 'bisect and replacements' '
git bisect reset
'
+test_expect_success 'index-pack and replacements' '
+ git --no-replace-objects rev-list --objects HEAD |
+ git --no-replace-objects pack-objects test- &&
+ git index-pack test-*.pack
+'
+
#
#
test_done
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index fd7e3a113c..2c55801ee8 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -143,7 +143,7 @@ test_expect_success 'more setup' '
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-\\t-&newsubdir/-\" |
+ "git ls-files -s | sed \"s- -&newsubdir/-\" |
GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
git update-index --index-info &&
mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&