diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-07-31 13:07:12 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-31 09:25:25 -0700 |
| commit | 941a7baa4d7aa592b9373180dcc13aaf2681f7a1 (patch) | |
| tree | 21571118638be9990d7166d493473e049676c1b5 /git-rebase--preserve-merges.sh | |
| parent | push tests: fix logic error in "push" test assertion (diff) | |
| download | tgif-941a7baa4d7aa592b9373180dcc13aaf2681f7a1.tar.xz | |
push tests: add more testing for forced tag pushing
Improve the tests added in dbfeddb12e ("push: require force for refs
under refs/tags/", 2012-11-29) to assert that the same behavior
applies various other combinations of command-line option and
refspecs.
Supplying either "+" in refspec or "--force" is sufficient to clobber
the reference. With --no-force we still pay attention to "+" in the
refspec, and vice-versa with clobbering kicking in if there's no "+"
in the refspec but "+" is given.
This is consistent with how refspecs work for branches, where either
"+" or "--force" will enable clobbering, with neither taking priority
over the other.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--preserve-merges.sh')
0 files changed, 0 insertions, 0 deletions