test-rm: accommodate packed-refs creation by newer git

It looks like newer versions of git (as of at least 2.150 rc1) are
automatically creating packed-refs.  Adjust test-rm.sh to accommodate
that possibility.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/t/test-rm.sh b/t/test-rm.sh
index 0887a9d1ad88a99a5a2b68bc99019d51282c44b2..3bd498e0ef3022ee95564e085e58f7526fe1422d 100755 (executable)
--- a/t/test-rm.sh
+++ b/t/test-rm.sh
@@ -52,8 +52,10 @@ observed="$(compare-trees bup/ bup-baseline/ | LC_ALL=C sort)" || exit $?
 wv_matches_rx "$observed" \
 '\*deleting[ ]+logs/refs/heads/src
 \*deleting[ ]+refs/heads/src
+(\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
-\.d\.\.t\.\.\.[.]*[ ]+refs/heads/'
+\.d\.\.t\.\.\.[.]*[ ]+refs/heads/
+(>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?'
 
 
 WVSTART "rm /foo (one of many)"
@@ -72,8 +74,10 @@ observed="$(compare-trees bup/ bup-baseline/ | LC_ALL=C sort)" || exit $?
 wv_matches_rx "$observed" \
 "\*deleting[ ]+logs/refs/heads/src
 \*deleting[ ]+refs/heads/src
+(\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
-\.d\.\.t\.\.\.[.]*[ ]+refs/heads/"
+\.d\.\.t\.\.\.[.]*[ ]+refs/heads/
+(>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
 
 
 WVSTART "rm /foo /bar (multiple of many)"
@@ -94,8 +98,10 @@ wv_matches_rx "$observed" \
 \*deleting[ ]+logs/refs/heads/src-4
 \*deleting[ ]+refs/heads/src-2
 \*deleting[ ]+refs/heads/src-4
+(\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
-\.d\.\.t\.\.\.[.]*[ ]+refs/heads/"
+\.d\.\.t\.\.\.[.]*[ ]+refs/heads/
+(>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
 
 
 WVSTART "rm /foo /bar (all)"
@@ -116,8 +122,10 @@ wv_matches_rx "$observed" \
 \*deleting[ ]+refs/heads/src-3
 \*deleting[ ]+refs/heads/src-4
 \*deleting[ ]+refs/heads/src-5
+(\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
-\.d\.\.t\.\.\.[.]*[ ]+refs/heads/"
+\.d\.\.t\.\.\.[.]*[ ]+refs/heads/
+(>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
 
 
 WVSTART "rm /foo/bar (lone save - equivalent to rm /foo)"
@@ -137,8 +145,10 @@ observed="$(compare-trees bup/ bup-baseline/ | LC_ALL=C sort)" || exit $?
 wv_matches_rx "$observed" \
 "\*deleting[ ]+logs/refs/heads/src
 \*deleting[ ]+refs/heads/src
+(\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
-\.d\.\.t\.\.\.[.]*[ ]+refs/heads/"
+\.d\.\.t\.\.\.[.]*[ ]+refs/heads/
+(>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
 
 
 verify-changes-caused-by-rewriting-save()