summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-10-18 23:01:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-10-18 23:01:31 -0700
commit804edc13ae07ddfccad8c149a68a0ab95d5e5441 (patch)
treea1a252b3d522f7d887c37f8d1c03500dbf37218f /t
parentMerge branch 'jn/maint-1.6.3-check-ref-format-doc' (diff)
parentgit: add --no-replace-objects option to disable replacing (diff)
downloadtgif-804edc13ae07ddfccad8c149a68a0ab95d5e5441.tar.xz
Merge branch 'cc/replace-no-replace'
* cc/replace-no-replace: git: add --no-replace-objects option to disable replacing
Diffstat (limited to 't')
-rwxr-xr-xt/t6050-replace.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 8b8bd81c09..d4818b430a 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -70,6 +70,13 @@ test_expect_success 'replace the author' '
git show $HASH2 | grep "O Thor"
'
+test_expect_success 'test --no-replace-objects option' '
+ git cat-file commit $HASH2 | grep "author O Thor" &&
+ git --no-replace-objects cat-file commit $HASH2 | grep "author A U Thor" &&
+ git show $HASH2 | grep "O Thor" &&
+ git --no-replace-objects show $HASH2 | grep "A U Thor"
+'
+
cat >tag.sig <<EOF
object $HASH2
type commit