mirror of
https://github.com/git/git.git
synced 2024-11-20 17:55:52 +01:00
5bd74506cd
Now that "git diff" handles stdin and relative paths outside the working tree correctly, we can convert all instances of "diff -u" to "git diff". This commit is really the result of $ perl -pi.bak -e 's/diff -u/git diff/' $(git grep -l "diff -u" t/) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from commit c699a40d68215c7e44a5b26117a35c8a56fbd387)
139 lines
3.4 KiB
Bash
Executable File
139 lines
3.4 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Johannes E. Schindelin
|
|
#
|
|
|
|
test_description='git-rerere
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
cat > a1 << EOF
|
|
Whether 'tis nobler in the mind to suffer
|
|
The slings and arrows of outrageous fortune,
|
|
Or to take arms against a sea of troubles,
|
|
And by opposing end them? To die: to sleep;
|
|
No more; and by a sleep to say we end
|
|
The heart-ache and the thousand natural shocks
|
|
That flesh is heir to, 'tis a consummation
|
|
Devoutly to be wish'd.
|
|
EOF
|
|
|
|
git add a1
|
|
git commit -q -a -m initial
|
|
|
|
git checkout -b first
|
|
cat >> a1 << EOF
|
|
To die, to sleep;
|
|
To sleep: perchance to dream: ay, there's the rub;
|
|
For in that sleep of death what dreams may come
|
|
When we have shuffled off this mortal coil,
|
|
Must give us pause: there's the respect
|
|
That makes calamity of so long life;
|
|
EOF
|
|
git commit -q -a -m first
|
|
|
|
git checkout -b second master
|
|
git show first:a1 | sed 's/To die, t/To die! T/' > a1
|
|
git commit -q -a -m second
|
|
|
|
# activate rerere
|
|
mkdir .git/rr-cache
|
|
|
|
test_expect_failure 'conflicting merge' 'git pull . first'
|
|
|
|
sha1=4f58849a60b4f969a2848966b6d02893b783e8fb
|
|
rr=.git/rr-cache/$sha1
|
|
test_expect_success 'recorded preimage' "grep ======= $rr/preimage"
|
|
|
|
test_expect_success 'no postimage or thisimage yet' \
|
|
"test ! -f $rr/postimage -a ! -f $rr/thisimage"
|
|
|
|
git show first:a1 > a1
|
|
|
|
cat > expect << EOF
|
|
--- a/a1
|
|
+++ b/a1
|
|
@@ -6,11 +6,7 @@
|
|
The heart-ache and the thousand natural shocks
|
|
That flesh is heir to, 'tis a consummation
|
|
Devoutly to be wish'd.
|
|
-<<<<<<<
|
|
-To die! To sleep;
|
|
-=======
|
|
To die, to sleep;
|
|
->>>>>>>
|
|
To sleep: perchance to dream: ay, there's the rub;
|
|
For in that sleep of death what dreams may come
|
|
When we have shuffled off this mortal coil,
|
|
EOF
|
|
|
|
git rerere diff > out
|
|
|
|
test_expect_success 'rerere diff' 'git diff expect out'
|
|
|
|
cat > expect << EOF
|
|
a1
|
|
EOF
|
|
|
|
git rerere status > out
|
|
|
|
test_expect_success 'rerere status' 'git diff expect out'
|
|
|
|
test_expect_success 'commit succeeds' \
|
|
"git commit -q -a -m 'prefer first over second'"
|
|
|
|
test_expect_success 'recorded postimage' "test -f $rr/postimage"
|
|
|
|
git checkout -b third master
|
|
git show second^:a1 | sed 's/To die: t/To die! T/' > a1
|
|
git commit -q -a -m third
|
|
|
|
test_expect_failure 'another conflicting merge' 'git pull . first'
|
|
|
|
git show first:a1 | sed 's/To die: t/To die! T/' > expect
|
|
test_expect_success 'rerere kicked in' "! grep ======= a1"
|
|
|
|
test_expect_success 'rerere prefers first change' 'git diff a1 expect'
|
|
|
|
rm $rr/postimage
|
|
echo "$sha1 a1" | tr '\012' '\0' > .git/rr-cache/MERGE_RR
|
|
|
|
test_expect_success 'rerere clear' 'git rerere clear'
|
|
|
|
test_expect_success 'clear removed the directory' "test ! -d $rr"
|
|
|
|
mkdir $rr
|
|
echo Hello > $rr/preimage
|
|
echo World > $rr/postimage
|
|
|
|
sha2=4000000000000000000000000000000000000000
|
|
rr2=.git/rr-cache/$sha2
|
|
mkdir $rr2
|
|
echo Hello > $rr2/preimage
|
|
|
|
almost_15_days_ago=$((60-15*86400))
|
|
just_over_15_days_ago=$((-1-15*86400))
|
|
almost_60_days_ago=$((60-60*86400))
|
|
just_over_60_days_ago=$((-1-60*86400))
|
|
|
|
test-chmtime =$almost_60_days_ago $rr/preimage
|
|
test-chmtime =$almost_15_days_ago $rr2/preimage
|
|
|
|
test_expect_success 'garbage collection (part1)' 'git rerere gc'
|
|
|
|
test_expect_success 'young records still live' \
|
|
"test -f $rr/preimage && test -f $rr2/preimage"
|
|
|
|
test-chmtime =$just_over_60_days_ago $rr/preimage
|
|
test-chmtime =$just_over_15_days_ago $rr2/preimage
|
|
|
|
test_expect_success 'garbage collection (part2)' 'git rerere gc'
|
|
|
|
test_expect_success 'old records rest in peace' \
|
|
"test ! -f $rr/preimage && test ! -f $rr2/preimage"
|
|
|
|
test_done
|
|
|
|
|