Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | |
Michael Haggerty | bf0c660 | 2016-06-07 10:13:04 +0200 | [diff] [blame] | 3 | test_description='Test git update-ref error handling' |
Ævar Arnfjörð Bjarmason | 03267e8 | 2022-11-08 19:17:39 +0100 | [diff] [blame] | 4 | |
| 5 | TEST_PASSES_SANITIZE_LEAK=true |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 6 | . ./test-lib.sh |
| 7 | |
Michael Haggerty | 017f722 | 2016-06-10 08:55:40 +0200 | [diff] [blame] | 8 | # Create some references, perhaps run pack-refs --all, then try to |
| 9 | # create some more references. Ensure that the second creation fails |
| 10 | # with the correct error message. |
| 11 | # Usage: test_update_rejected <before> <pack> <create> <error> |
| 12 | # <before> is a ws-separated list of refs to create before the test |
| 13 | # <pack> (true or false) tells whether to pack the refs before the test |
| 14 | # <create> is a list of variables to attempt creating |
| 15 | # <error> is a string to look for in the stderr of update-ref. |
| 16 | # All references are created in the namespace specified by the current |
| 17 | # value of $prefix. |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 18 | test_update_rejected () { |
Michael Haggerty | 0e4b63b | 2016-06-10 08:50:53 +0200 | [diff] [blame] | 19 | before="$1" && |
| 20 | pack="$2" && |
| 21 | create="$3" && |
| 22 | error="$4" && |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 23 | printf "create $prefix/%s $C\n" $before | |
| 24 | git update-ref --stdin && |
| 25 | git for-each-ref $prefix >unchanged && |
| 26 | if $pack |
| 27 | then |
| 28 | git pack-refs --all |
| 29 | fi && |
| 30 | printf "create $prefix/%s $C\n" $create >input && |
| 31 | test_must_fail git update-ref --stdin <input 2>output.err && |
Nguyễn Thái Ngọc Duy | 661558f | 2018-07-21 09:49:35 +0200 | [diff] [blame] | 32 | test_i18ngrep -F "$error" output.err && |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 33 | git for-each-ref $prefix >actual && |
| 34 | test_cmp unchanged actual |
| 35 | } |
| 36 | |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 37 | # Test adding and deleting D/F-conflicting references in a single |
| 38 | # transaction. |
| 39 | df_test() { |
| 40 | prefix="$1" |
| 41 | pack=: symadd=false symdel=false add_del=false addref= delref= |
| 42 | shift |
| 43 | while test $# -gt 0 |
| 44 | do |
| 45 | case "$1" in |
| 46 | --pack) |
| 47 | pack="git pack-refs --all" |
| 48 | shift |
| 49 | ;; |
| 50 | --sym-add) |
| 51 | # Perform the add via a symbolic reference |
| 52 | symadd=true |
| 53 | shift |
| 54 | ;; |
| 55 | --sym-del) |
| 56 | # Perform the del via a symbolic reference |
| 57 | symdel=true |
| 58 | shift |
| 59 | ;; |
| 60 | --del-add) |
| 61 | # Delete first reference then add second |
| 62 | add_del=false |
| 63 | delref="$prefix/r/$2" |
| 64 | addref="$prefix/r/$3" |
| 65 | shift 3 |
| 66 | ;; |
| 67 | --add-del) |
| 68 | # Add first reference then delete second |
| 69 | add_del=true |
| 70 | addref="$prefix/r/$2" |
| 71 | delref="$prefix/r/$3" |
| 72 | shift 3 |
| 73 | ;; |
| 74 | *) |
| 75 | echo 1>&2 "Extra args to df_test: $*" |
| 76 | return 1 |
| 77 | ;; |
| 78 | esac |
| 79 | done |
| 80 | git update-ref "$delref" $C && |
| 81 | if $symadd |
| 82 | then |
| 83 | addname="$prefix/s/symadd" && |
| 84 | git symbolic-ref "$addname" "$addref" |
| 85 | else |
| 86 | addname="$addref" |
| 87 | fi && |
| 88 | if $symdel |
| 89 | then |
| 90 | delname="$prefix/s/symdel" && |
| 91 | git symbolic-ref "$delname" "$delref" |
| 92 | else |
| 93 | delname="$delref" |
| 94 | fi && |
| 95 | cat >expected-err <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 96 | fatal: cannot lock ref $SQ$addname$SQ: $SQ$delref$SQ exists; cannot create $SQ$addref$SQ |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 97 | EOF |
| 98 | $pack && |
| 99 | if $add_del |
| 100 | then |
| 101 | printf "%s\n" "create $addname $D" "delete $delname" |
| 102 | else |
| 103 | printf "%s\n" "delete $delname" "create $addname $D" |
| 104 | fi >commands && |
| 105 | test_must_fail git update-ref --stdin <commands 2>output.err && |
Ævar Arnfjörð Bjarmason | 1108cea | 2021-02-11 02:53:53 +0100 | [diff] [blame] | 106 | test_cmp expected-err output.err && |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 107 | printf "%s\n" "$C $delref" >expected-refs && |
| 108 | git for-each-ref --format="%(objectname) %(refname)" $prefix/r >actual-refs && |
| 109 | test_cmp expected-refs actual-refs |
| 110 | } |
| 111 | |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 112 | test_expect_success 'setup' ' |
| 113 | |
| 114 | git commit --allow-empty -m Initial && |
Michael Haggerty | 19dd7d0 | 2016-05-05 13:22:23 +0200 | [diff] [blame] | 115 | C=$(git rev-parse HEAD) && |
| 116 | git commit --allow-empty -m Second && |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 117 | D=$(git rev-parse HEAD) && |
| 118 | git commit --allow-empty -m Third && |
| 119 | E=$(git rev-parse HEAD) |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 120 | ' |
| 121 | |
| 122 | test_expect_success 'existing loose ref is a simple prefix of new' ' |
| 123 | |
| 124 | prefix=refs/1l && |
Michael Haggerty | 0e4b63b | 2016-06-10 08:50:53 +0200 | [diff] [blame] | 125 | test_update_rejected "a c e" false "b c/x d" \ |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 126 | "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x$SQ" |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 127 | |
| 128 | ' |
| 129 | |
| 130 | test_expect_success 'existing packed ref is a simple prefix of new' ' |
| 131 | |
| 132 | prefix=refs/1p && |
Michael Haggerty | 0e4b63b | 2016-06-10 08:50:53 +0200 | [diff] [blame] | 133 | test_update_rejected "a c e" true "b c/x d" \ |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 134 | "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x$SQ" |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 135 | |
| 136 | ' |
| 137 | |
| 138 | test_expect_success 'existing loose ref is a deeper prefix of new' ' |
| 139 | |
| 140 | prefix=refs/2l && |
Michael Haggerty | 0e4b63b | 2016-06-10 08:50:53 +0200 | [diff] [blame] | 141 | test_update_rejected "a c e" false "b c/x/y d" \ |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 142 | "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x/y$SQ" |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 143 | |
| 144 | ' |
| 145 | |
| 146 | test_expect_success 'existing packed ref is a deeper prefix of new' ' |
| 147 | |
| 148 | prefix=refs/2p && |
Michael Haggerty | 0e4b63b | 2016-06-10 08:50:53 +0200 | [diff] [blame] | 149 | test_update_rejected "a c e" true "b c/x/y d" \ |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 150 | "$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x/y$SQ" |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 151 | |
| 152 | ' |
| 153 | |
| 154 | test_expect_success 'new ref is a simple prefix of existing loose' ' |
| 155 | |
| 156 | prefix=refs/3l && |
Michael Haggerty | 0e4b63b | 2016-06-10 08:50:53 +0200 | [diff] [blame] | 157 | test_update_rejected "a c/x e" false "b c d" \ |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 158 | "$SQ$prefix/c/x$SQ exists; cannot create $SQ$prefix/c$SQ" |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 159 | |
| 160 | ' |
| 161 | |
| 162 | test_expect_success 'new ref is a simple prefix of existing packed' ' |
| 163 | |
| 164 | prefix=refs/3p && |
Michael Haggerty | 0e4b63b | 2016-06-10 08:50:53 +0200 | [diff] [blame] | 165 | test_update_rejected "a c/x e" true "b c d" \ |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 166 | "$SQ$prefix/c/x$SQ exists; cannot create $SQ$prefix/c$SQ" |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 167 | |
| 168 | ' |
| 169 | |
| 170 | test_expect_success 'new ref is a deeper prefix of existing loose' ' |
| 171 | |
| 172 | prefix=refs/4l && |
Michael Haggerty | 0e4b63b | 2016-06-10 08:50:53 +0200 | [diff] [blame] | 173 | test_update_rejected "a c/x/y e" false "b c d" \ |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 174 | "$SQ$prefix/c/x/y$SQ exists; cannot create $SQ$prefix/c$SQ" |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 175 | |
| 176 | ' |
| 177 | |
| 178 | test_expect_success 'new ref is a deeper prefix of existing packed' ' |
| 179 | |
| 180 | prefix=refs/4p && |
Michael Haggerty | 0e4b63b | 2016-06-10 08:50:53 +0200 | [diff] [blame] | 181 | test_update_rejected "a c/x/y e" true "b c d" \ |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 182 | "$SQ$prefix/c/x/y$SQ exists; cannot create $SQ$prefix/c$SQ" |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 183 | |
| 184 | ' |
| 185 | |
Michael Haggerty | e911104 | 2015-05-11 17:25:12 +0200 | [diff] [blame] | 186 | test_expect_success 'one new ref is a simple prefix of another' ' |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 187 | |
| 188 | prefix=refs/5 && |
Michael Haggerty | 0e4b63b | 2016-06-10 08:50:53 +0200 | [diff] [blame] | 189 | test_update_rejected "a e" false "b c c/x d" \ |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 190 | "cannot process $SQ$prefix/c$SQ and $SQ$prefix/c/x$SQ at the same time" |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 191 | |
| 192 | ' |
| 193 | |
Han-Wen Nienhuys | fe8fc09 | 2021-05-31 16:56:33 +0000 | [diff] [blame] | 194 | test_expect_success REFFILES 'empty directory should not fool rev-parse' ' |
Michael Haggerty | 19dd7d0 | 2016-05-05 13:22:23 +0200 | [diff] [blame] | 195 | prefix=refs/e-rev-parse && |
| 196 | git update-ref $prefix/foo $C && |
| 197 | git pack-refs --all && |
| 198 | mkdir -p .git/$prefix/foo/bar/baz && |
| 199 | echo "$C" >expected && |
| 200 | git rev-parse $prefix/foo >actual && |
| 201 | test_cmp expected actual |
| 202 | ' |
| 203 | |
Han-Wen Nienhuys | fe8fc09 | 2021-05-31 16:56:33 +0000 | [diff] [blame] | 204 | test_expect_success REFFILES 'empty directory should not fool for-each-ref' ' |
Michael Haggerty | 19dd7d0 | 2016-05-05 13:22:23 +0200 | [diff] [blame] | 205 | prefix=refs/e-for-each-ref && |
| 206 | git update-ref $prefix/foo $C && |
| 207 | git for-each-ref $prefix >expected && |
| 208 | git pack-refs --all && |
| 209 | mkdir -p .git/$prefix/foo/bar/baz && |
| 210 | git for-each-ref $prefix >actual && |
| 211 | test_cmp expected actual |
| 212 | ' |
| 213 | |
Han-Wen Nienhuys | fe8fc09 | 2021-05-31 16:56:33 +0000 | [diff] [blame] | 214 | test_expect_success REFFILES 'empty directory should not fool create' ' |
Michael Haggerty | 19dd7d0 | 2016-05-05 13:22:23 +0200 | [diff] [blame] | 215 | prefix=refs/e-create && |
| 216 | mkdir -p .git/$prefix/foo/bar/baz && |
| 217 | printf "create %s $C\n" $prefix/foo | |
| 218 | git update-ref --stdin |
| 219 | ' |
| 220 | |
Han-Wen Nienhuys | fe8fc09 | 2021-05-31 16:56:33 +0000 | [diff] [blame] | 221 | test_expect_success REFFILES 'empty directory should not fool verify' ' |
Michael Haggerty | 19dd7d0 | 2016-05-05 13:22:23 +0200 | [diff] [blame] | 222 | prefix=refs/e-verify && |
| 223 | git update-ref $prefix/foo $C && |
| 224 | git pack-refs --all && |
| 225 | mkdir -p .git/$prefix/foo/bar/baz && |
| 226 | printf "verify %s $C\n" $prefix/foo | |
| 227 | git update-ref --stdin |
| 228 | ' |
| 229 | |
Han-Wen Nienhuys | fe8fc09 | 2021-05-31 16:56:33 +0000 | [diff] [blame] | 230 | test_expect_success REFFILES 'empty directory should not fool 1-arg update' ' |
Michael Haggerty | 19dd7d0 | 2016-05-05 13:22:23 +0200 | [diff] [blame] | 231 | prefix=refs/e-update-1 && |
| 232 | git update-ref $prefix/foo $C && |
| 233 | git pack-refs --all && |
| 234 | mkdir -p .git/$prefix/foo/bar/baz && |
| 235 | printf "update %s $D\n" $prefix/foo | |
| 236 | git update-ref --stdin |
| 237 | ' |
| 238 | |
Han-Wen Nienhuys | fe8fc09 | 2021-05-31 16:56:33 +0000 | [diff] [blame] | 239 | test_expect_success REFFILES 'empty directory should not fool 2-arg update' ' |
Michael Haggerty | 19dd7d0 | 2016-05-05 13:22:23 +0200 | [diff] [blame] | 240 | prefix=refs/e-update-2 && |
| 241 | git update-ref $prefix/foo $C && |
| 242 | git pack-refs --all && |
| 243 | mkdir -p .git/$prefix/foo/bar/baz && |
| 244 | printf "update %s $D $C\n" $prefix/foo | |
| 245 | git update-ref --stdin |
| 246 | ' |
| 247 | |
Han-Wen Nienhuys | fe8fc09 | 2021-05-31 16:56:33 +0000 | [diff] [blame] | 248 | test_expect_success REFFILES 'empty directory should not fool 0-arg delete' ' |
Michael Haggerty | 19dd7d0 | 2016-05-05 13:22:23 +0200 | [diff] [blame] | 249 | prefix=refs/e-delete-0 && |
| 250 | git update-ref $prefix/foo $C && |
| 251 | git pack-refs --all && |
| 252 | mkdir -p .git/$prefix/foo/bar/baz && |
| 253 | printf "delete %s\n" $prefix/foo | |
| 254 | git update-ref --stdin |
| 255 | ' |
| 256 | |
Han-Wen Nienhuys | fe8fc09 | 2021-05-31 16:56:33 +0000 | [diff] [blame] | 257 | test_expect_success REFFILES 'empty directory should not fool 1-arg delete' ' |
Michael Haggerty | 19dd7d0 | 2016-05-05 13:22:23 +0200 | [diff] [blame] | 258 | prefix=refs/e-delete-1 && |
| 259 | git update-ref $prefix/foo $C && |
| 260 | git pack-refs --all && |
| 261 | mkdir -p .git/$prefix/foo/bar/baz && |
| 262 | printf "delete %s $C\n" $prefix/foo | |
| 263 | git update-ref --stdin |
| 264 | ' |
| 265 | |
Han-Wen Nienhuys | 911e9e8 | 2021-11-29 18:20:22 +0000 | [diff] [blame] | 266 | test_expect_success REFFILES 'D/F conflict prevents add long + delete short' ' |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 267 | df_test refs/df-al-ds --add-del foo/bar foo |
| 268 | ' |
| 269 | |
Han-Wen Nienhuys | 911e9e8 | 2021-11-29 18:20:22 +0000 | [diff] [blame] | 270 | test_expect_success REFFILES 'D/F conflict prevents add short + delete long' ' |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 271 | df_test refs/df-as-dl --add-del foo foo/bar |
| 272 | ' |
| 273 | |
Han-Wen Nienhuys | 911e9e8 | 2021-11-29 18:20:22 +0000 | [diff] [blame] | 274 | test_expect_success REFFILES 'D/F conflict prevents delete long + add short' ' |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 275 | df_test refs/df-dl-as --del-add foo/bar foo |
| 276 | ' |
| 277 | |
Han-Wen Nienhuys | 911e9e8 | 2021-11-29 18:20:22 +0000 | [diff] [blame] | 278 | test_expect_success REFFILES 'D/F conflict prevents delete short + add long' ' |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 279 | df_test refs/df-ds-al --del-add foo foo/bar |
| 280 | ' |
| 281 | |
Han-Wen Nienhuys | 911e9e8 | 2021-11-29 18:20:22 +0000 | [diff] [blame] | 282 | test_expect_success REFFILES 'D/F conflict prevents add long + delete short packed' ' |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 283 | df_test refs/df-al-dsp --pack --add-del foo/bar foo |
| 284 | ' |
| 285 | |
Han-Wen Nienhuys | 911e9e8 | 2021-11-29 18:20:22 +0000 | [diff] [blame] | 286 | test_expect_success REFFILES 'D/F conflict prevents add short + delete long packed' ' |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 287 | df_test refs/df-as-dlp --pack --add-del foo foo/bar |
| 288 | ' |
| 289 | |
Han-Wen Nienhuys | 911e9e8 | 2021-11-29 18:20:22 +0000 | [diff] [blame] | 290 | test_expect_success REFFILES 'D/F conflict prevents delete long packed + add short' ' |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 291 | df_test refs/df-dlp-as --pack --del-add foo/bar foo |
| 292 | ' |
| 293 | |
Han-Wen Nienhuys | 911e9e8 | 2021-11-29 18:20:22 +0000 | [diff] [blame] | 294 | test_expect_success REFFILES 'D/F conflict prevents delete short packed + add long' ' |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 295 | df_test refs/df-dsp-al --pack --del-add foo foo/bar |
| 296 | ' |
| 297 | |
| 298 | # Try some combinations involving symbolic refs... |
| 299 | |
Han-Wen Nienhuys | 911e9e8 | 2021-11-29 18:20:22 +0000 | [diff] [blame] | 300 | test_expect_success REFFILES 'D/F conflict prevents indirect add long + delete short' ' |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 301 | df_test refs/df-ial-ds --sym-add --add-del foo/bar foo |
| 302 | ' |
| 303 | |
Han-Wen Nienhuys | 911e9e8 | 2021-11-29 18:20:22 +0000 | [diff] [blame] | 304 | test_expect_success REFFILES 'D/F conflict prevents indirect add long + indirect delete short' ' |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 305 | df_test refs/df-ial-ids --sym-add --sym-del --add-del foo/bar foo |
| 306 | ' |
| 307 | |
Han-Wen Nienhuys | 911e9e8 | 2021-11-29 18:20:22 +0000 | [diff] [blame] | 308 | test_expect_success REFFILES 'D/F conflict prevents indirect add short + indirect delete long' ' |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 309 | df_test refs/df-ias-idl --sym-add --sym-del --add-del foo foo/bar |
| 310 | ' |
| 311 | |
Han-Wen Nienhuys | 911e9e8 | 2021-11-29 18:20:22 +0000 | [diff] [blame] | 312 | test_expect_success REFFILES 'D/F conflict prevents indirect delete long + indirect add short' ' |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 313 | df_test refs/df-idl-ias --sym-add --sym-del --del-add foo/bar foo |
| 314 | ' |
| 315 | |
Han-Wen Nienhuys | 911e9e8 | 2021-11-29 18:20:22 +0000 | [diff] [blame] | 316 | test_expect_success REFFILES 'D/F conflict prevents indirect add long + delete short packed' ' |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 317 | df_test refs/df-ial-dsp --sym-add --pack --add-del foo/bar foo |
| 318 | ' |
| 319 | |
Han-Wen Nienhuys | 911e9e8 | 2021-11-29 18:20:22 +0000 | [diff] [blame] | 320 | test_expect_success REFFILES 'D/F conflict prevents indirect add long + indirect delete short packed' ' |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 321 | df_test refs/df-ial-idsp --sym-add --sym-del --pack --add-del foo/bar foo |
| 322 | ' |
| 323 | |
Han-Wen Nienhuys | 911e9e8 | 2021-11-29 18:20:22 +0000 | [diff] [blame] | 324 | test_expect_success REFFILES 'D/F conflict prevents add long + indirect delete short packed' ' |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 325 | df_test refs/df-al-idsp --sym-del --pack --add-del foo/bar foo |
| 326 | ' |
| 327 | |
Han-Wen Nienhuys | 911e9e8 | 2021-11-29 18:20:22 +0000 | [diff] [blame] | 328 | test_expect_success REFFILES 'D/F conflict prevents indirect delete long packed + indirect add short' ' |
Michael Haggerty | 2e9de01 | 2017-10-24 17:16:24 +0200 | [diff] [blame] | 329 | df_test refs/df-idlp-ias --sym-add --sym-del --pack --del-add foo/bar foo |
| 330 | ' |
| 331 | |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 332 | # Test various errors when reading the old values of references... |
| 333 | |
| 334 | test_expect_success 'missing old value blocks update' ' |
| 335 | prefix=refs/missing-update && |
| 336 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 337 | fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 338 | EOF |
| 339 | printf "%s\n" "update $prefix/foo $E $D" | |
| 340 | test_must_fail git update-ref --stdin 2>output.err && |
| 341 | test_cmp expected output.err |
| 342 | ' |
| 343 | |
| 344 | test_expect_success 'incorrect old value blocks update' ' |
| 345 | prefix=refs/incorrect-update && |
| 346 | git update-ref $prefix/foo $C && |
| 347 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 348 | fatal: cannot lock ref $SQ$prefix/foo$SQ: is at $C but expected $D |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 349 | EOF |
| 350 | printf "%s\n" "update $prefix/foo $E $D" | |
| 351 | test_must_fail git update-ref --stdin 2>output.err && |
| 352 | test_cmp expected output.err |
| 353 | ' |
| 354 | |
| 355 | test_expect_success 'existing old value blocks create' ' |
| 356 | prefix=refs/existing-create && |
| 357 | git update-ref $prefix/foo $C && |
| 358 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 359 | fatal: cannot lock ref $SQ$prefix/foo$SQ: reference already exists |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 360 | EOF |
| 361 | printf "%s\n" "create $prefix/foo $E" | |
| 362 | test_must_fail git update-ref --stdin 2>output.err && |
| 363 | test_cmp expected output.err |
| 364 | ' |
| 365 | |
| 366 | test_expect_success 'incorrect old value blocks delete' ' |
| 367 | prefix=refs/incorrect-delete && |
| 368 | git update-ref $prefix/foo $C && |
| 369 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 370 | fatal: cannot lock ref $SQ$prefix/foo$SQ: is at $C but expected $D |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 371 | EOF |
| 372 | printf "%s\n" "delete $prefix/foo $D" | |
| 373 | test_must_fail git update-ref --stdin 2>output.err && |
| 374 | test_cmp expected output.err |
| 375 | ' |
| 376 | |
| 377 | test_expect_success 'missing old value blocks indirect update' ' |
| 378 | prefix=refs/missing-indirect-update && |
| 379 | git symbolic-ref $prefix/symref $prefix/foo && |
| 380 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 381 | fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 382 | EOF |
| 383 | printf "%s\n" "update $prefix/symref $E $D" | |
| 384 | test_must_fail git update-ref --stdin 2>output.err && |
| 385 | test_cmp expected output.err |
| 386 | ' |
| 387 | |
| 388 | test_expect_success 'incorrect old value blocks indirect update' ' |
| 389 | prefix=refs/incorrect-indirect-update && |
| 390 | git symbolic-ref $prefix/symref $prefix/foo && |
| 391 | git update-ref $prefix/foo $C && |
| 392 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 393 | fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 394 | EOF |
| 395 | printf "%s\n" "update $prefix/symref $E $D" | |
| 396 | test_must_fail git update-ref --stdin 2>output.err && |
| 397 | test_cmp expected output.err |
| 398 | ' |
| 399 | |
| 400 | test_expect_success 'existing old value blocks indirect create' ' |
| 401 | prefix=refs/existing-indirect-create && |
| 402 | git symbolic-ref $prefix/symref $prefix/foo && |
| 403 | git update-ref $prefix/foo $C && |
| 404 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 405 | fatal: cannot lock ref $SQ$prefix/symref$SQ: reference already exists |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 406 | EOF |
| 407 | printf "%s\n" "create $prefix/symref $E" | |
| 408 | test_must_fail git update-ref --stdin 2>output.err && |
| 409 | test_cmp expected output.err |
| 410 | ' |
| 411 | |
| 412 | test_expect_success 'incorrect old value blocks indirect delete' ' |
| 413 | prefix=refs/incorrect-indirect-delete && |
| 414 | git symbolic-ref $prefix/symref $prefix/foo && |
| 415 | git update-ref $prefix/foo $C && |
| 416 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 417 | fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 418 | EOF |
| 419 | printf "%s\n" "delete $prefix/symref $D" | |
| 420 | test_must_fail git update-ref --stdin 2>output.err && |
| 421 | test_cmp expected output.err |
| 422 | ' |
| 423 | |
| 424 | test_expect_success 'missing old value blocks indirect no-deref update' ' |
| 425 | prefix=refs/missing-noderef-update && |
| 426 | git symbolic-ref $prefix/symref $prefix/foo && |
| 427 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 428 | fatal: cannot lock ref $SQ$prefix/symref$SQ: reference is missing but expected $D |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 429 | EOF |
| 430 | printf "%s\n" "option no-deref" "update $prefix/symref $E $D" | |
| 431 | test_must_fail git update-ref --stdin 2>output.err && |
| 432 | test_cmp expected output.err |
| 433 | ' |
| 434 | |
| 435 | test_expect_success 'incorrect old value blocks indirect no-deref update' ' |
| 436 | prefix=refs/incorrect-noderef-update && |
| 437 | git symbolic-ref $prefix/symref $prefix/foo && |
| 438 | git update-ref $prefix/foo $C && |
| 439 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 440 | fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 441 | EOF |
| 442 | printf "%s\n" "option no-deref" "update $prefix/symref $E $D" | |
| 443 | test_must_fail git update-ref --stdin 2>output.err && |
| 444 | test_cmp expected output.err |
| 445 | ' |
| 446 | |
Michael Haggerty | e3f5103 | 2016-06-07 09:29:23 +0200 | [diff] [blame] | 447 | test_expect_success 'existing old value blocks indirect no-deref create' ' |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 448 | prefix=refs/existing-noderef-create && |
| 449 | git symbolic-ref $prefix/symref $prefix/foo && |
| 450 | git update-ref $prefix/foo $C && |
| 451 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 452 | fatal: cannot lock ref $SQ$prefix/symref$SQ: reference already exists |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 453 | EOF |
| 454 | printf "%s\n" "option no-deref" "create $prefix/symref $E" | |
| 455 | test_must_fail git update-ref --stdin 2>output.err && |
| 456 | test_cmp expected output.err |
| 457 | ' |
| 458 | |
| 459 | test_expect_success 'incorrect old value blocks indirect no-deref delete' ' |
| 460 | prefix=refs/incorrect-noderef-delete && |
| 461 | git symbolic-ref $prefix/symref $prefix/foo && |
| 462 | git update-ref $prefix/foo $C && |
| 463 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 464 | fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 465 | EOF |
| 466 | printf "%s\n" "option no-deref" "delete $prefix/symref $D" | |
| 467 | test_must_fail git update-ref --stdin 2>output.err && |
| 468 | test_cmp expected output.err |
| 469 | ' |
| 470 | |
Han-Wen Nienhuys | fe8fc09 | 2021-05-31 16:56:33 +0000 | [diff] [blame] | 471 | test_expect_success REFFILES 'non-empty directory blocks create' ' |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 472 | prefix=refs/ne-create && |
| 473 | mkdir -p .git/$prefix/foo/bar && |
| 474 | : >.git/$prefix/foo/bar/baz.lock && |
| 475 | test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" && |
| 476 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 477 | fatal: cannot lock ref $SQ$prefix/foo$SQ: there is a non-empty directory $SQ.git/$prefix/foo$SQ blocking reference $SQ$prefix/foo$SQ |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 478 | EOF |
| 479 | printf "%s\n" "update $prefix/foo $C" | |
| 480 | test_must_fail git update-ref --stdin 2>output.err && |
| 481 | test_cmp expected output.err && |
| 482 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 483 | fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 484 | EOF |
| 485 | printf "%s\n" "update $prefix/foo $D $C" | |
| 486 | test_must_fail git update-ref --stdin 2>output.err && |
| 487 | test_cmp expected output.err |
| 488 | ' |
| 489 | |
Han-Wen Nienhuys | fe8fc09 | 2021-05-31 16:56:33 +0000 | [diff] [blame] | 490 | test_expect_success REFFILES 'broken reference blocks create' ' |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 491 | prefix=refs/broken-create && |
| 492 | mkdir -p .git/$prefix && |
| 493 | echo "gobbledigook" >.git/$prefix/foo && |
| 494 | test_when_finished "rm -f .git/$prefix/foo" && |
| 495 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 496 | fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 497 | EOF |
| 498 | printf "%s\n" "update $prefix/foo $C" | |
| 499 | test_must_fail git update-ref --stdin 2>output.err && |
| 500 | test_cmp expected output.err && |
| 501 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 502 | fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 503 | EOF |
| 504 | printf "%s\n" "update $prefix/foo $D $C" | |
| 505 | test_must_fail git update-ref --stdin 2>output.err && |
| 506 | test_cmp expected output.err |
| 507 | ' |
| 508 | |
Han-Wen Nienhuys | fe8fc09 | 2021-05-31 16:56:33 +0000 | [diff] [blame] | 509 | test_expect_success REFFILES 'non-empty directory blocks indirect create' ' |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 510 | prefix=refs/ne-indirect-create && |
| 511 | git symbolic-ref $prefix/symref $prefix/foo && |
| 512 | mkdir -p .git/$prefix/foo/bar && |
| 513 | : >.git/$prefix/foo/bar/baz.lock && |
| 514 | test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" && |
| 515 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 516 | fatal: cannot lock ref $SQ$prefix/symref$SQ: there is a non-empty directory $SQ.git/$prefix/foo$SQ blocking reference $SQ$prefix/foo$SQ |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 517 | EOF |
| 518 | printf "%s\n" "update $prefix/symref $C" | |
| 519 | test_must_fail git update-ref --stdin 2>output.err && |
| 520 | test_cmp expected output.err && |
| 521 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 522 | fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 523 | EOF |
| 524 | printf "%s\n" "update $prefix/symref $D $C" | |
| 525 | test_must_fail git update-ref --stdin 2>output.err && |
| 526 | test_cmp expected output.err |
| 527 | ' |
| 528 | |
Han-Wen Nienhuys | fe8fc09 | 2021-05-31 16:56:33 +0000 | [diff] [blame] | 529 | test_expect_success REFFILES 'broken reference blocks indirect create' ' |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 530 | prefix=refs/broken-indirect-create && |
| 531 | git symbolic-ref $prefix/symref $prefix/foo && |
| 532 | echo "gobbledigook" >.git/$prefix/foo && |
| 533 | test_when_finished "rm -f .git/$prefix/foo" && |
| 534 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 535 | fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 536 | EOF |
| 537 | printf "%s\n" "update $prefix/symref $C" | |
| 538 | test_must_fail git update-ref --stdin 2>output.err && |
| 539 | test_cmp expected output.err && |
| 540 | cat >expected <<-EOF && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 541 | fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ: reference broken |
Michael Haggerty | c5119dc | 2016-06-07 12:29:02 +0200 | [diff] [blame] | 542 | EOF |
| 543 | printf "%s\n" "update $prefix/symref $D $C" | |
| 544 | test_must_fail git update-ref --stdin 2>output.err && |
| 545 | test_cmp expected output.err |
| 546 | ' |
| 547 | |
Han-Wen Nienhuys | fe8fc09 | 2021-05-31 16:56:33 +0000 | [diff] [blame] | 548 | test_expect_success REFFILES 'no bogus intermediate values during delete' ' |
Michael Haggerty | 6a2a773 | 2017-09-08 15:51:50 +0200 | [diff] [blame] | 549 | prefix=refs/slow-transaction && |
| 550 | # Set up a reference with differing loose and packed versions: |
| 551 | git update-ref $prefix/foo $C && |
| 552 | git pack-refs --all && |
| 553 | git update-ref $prefix/foo $D && |
| 554 | git for-each-ref $prefix >unchanged && |
| 555 | # Now try to update the reference, but hold the `packed-refs` lock |
| 556 | # for a while to see what happens while the process is blocked: |
| 557 | : >.git/packed-refs.lock && |
| 558 | test_when_finished "rm -f .git/packed-refs.lock" && |
| 559 | { |
| 560 | # Note: the following command is intentionally run in the |
| 561 | # background. We increase the timeout so that `update-ref` |
SZEDER Gábor | 377d845 | 2018-08-01 01:32:48 +0200 | [diff] [blame] | 562 | # attempts to acquire the `packed-refs` lock for much longer |
| 563 | # than it takes for us to do the check then delete it: |
| 564 | git -c core.packedrefstimeout=30000 update-ref -d $prefix/foo & |
Michael Haggerty | 6a2a773 | 2017-09-08 15:51:50 +0200 | [diff] [blame] | 565 | } && |
| 566 | pid2=$! && |
| 567 | # Give update-ref plenty of time to get to the point where it tries |
| 568 | # to lock packed-refs: |
| 569 | sleep 1 && |
| 570 | # Make sure that update-ref did not complete despite the lock: |
| 571 | kill -0 $pid2 && |
| 572 | # Verify that the reference still has its old value: |
| 573 | sha1=$(git rev-parse --verify --quiet $prefix/foo || echo undefined) && |
| 574 | case "$sha1" in |
| 575 | $D) |
| 576 | # This is what we hope for; it means that nothing |
| 577 | # user-visible has changed yet. |
| 578 | : ;; |
| 579 | undefined) |
| 580 | # This is not correct; it means the deletion has happened |
| 581 | # already even though update-ref should not have been |
| 582 | # able to acquire the lock yet. |
| 583 | echo "$prefix/foo deleted prematurely" && |
| 584 | break |
| 585 | ;; |
| 586 | $C) |
| 587 | # This value should never be seen. Probably the loose |
| 588 | # reference has been deleted but the packed reference |
| 589 | # is still there: |
| 590 | echo "$prefix/foo incorrectly observed to be C" && |
| 591 | break |
| 592 | ;; |
| 593 | *) |
| 594 | # WTF? |
| 595 | echo "unexpected value observed for $prefix/foo: $sha1" && |
| 596 | break |
| 597 | ;; |
| 598 | esac >out && |
| 599 | rm -f .git/packed-refs.lock && |
| 600 | wait $pid2 && |
| 601 | test_must_be_empty out && |
| 602 | test_must_fail git rev-parse --verify --quiet $prefix/foo |
| 603 | ' |
| 604 | |
Han-Wen Nienhuys | fe8fc09 | 2021-05-31 16:56:33 +0000 | [diff] [blame] | 605 | test_expect_success REFFILES 'delete fails cleanly if packed-refs file is locked' ' |
Michael Haggerty | 6a2a773 | 2017-09-08 15:51:50 +0200 | [diff] [blame] | 606 | prefix=refs/locked-packed-refs && |
| 607 | # Set up a reference with differing loose and packed versions: |
| 608 | git update-ref $prefix/foo $C && |
| 609 | git pack-refs --all && |
| 610 | git update-ref $prefix/foo $D && |
| 611 | git for-each-ref $prefix >unchanged && |
| 612 | # Now try to delete it while the `packed-refs` lock is held: |
| 613 | : >.git/packed-refs.lock && |
| 614 | test_when_finished "rm -f .git/packed-refs.lock" && |
| 615 | test_must_fail git update-ref -d $prefix/foo >out 2>err && |
| 616 | git for-each-ref $prefix >actual && |
Denton Liu | bd482d6 | 2019-09-05 15:10:05 -0700 | [diff] [blame] | 617 | test_i18ngrep "Unable to create $SQ.*packed-refs.lock$SQ: " err && |
Michael Haggerty | 6a2a773 | 2017-09-08 15:51:50 +0200 | [diff] [blame] | 618 | test_cmp unchanged actual |
| 619 | ' |
| 620 | |
Han-Wen Nienhuys | fe8fc09 | 2021-05-31 16:56:33 +0000 | [diff] [blame] | 621 | test_expect_success REFFILES 'delete fails cleanly if packed-refs.new write fails' ' |
Jeff King | 249e8dc | 2019-03-21 05:28:44 -0400 | [diff] [blame] | 622 | # Setup and expectations are similar to the test above. |
| 623 | prefix=refs/failed-packed-refs && |
| 624 | git update-ref $prefix/foo $C && |
| 625 | git pack-refs --all && |
| 626 | git update-ref $prefix/foo $D && |
| 627 | git for-each-ref $prefix >unchanged && |
| 628 | # This should not happen in practice, but it is an easy way to get a |
| 629 | # reliable error (we open with create_tempfile(), which uses O_EXCL). |
| 630 | : >.git/packed-refs.new && |
| 631 | test_when_finished "rm -f .git/packed-refs.new" && |
| 632 | test_must_fail git update-ref -d $prefix/foo && |
| 633 | git for-each-ref $prefix >actual && |
| 634 | test_cmp unchanged actual |
| 635 | ' |
| 636 | |
Michael Haggerty | 433efca | 2015-05-11 17:25:03 +0200 | [diff] [blame] | 637 | test_done |