update-ref: disallow "start" for ongoing transactions

It is currently possible to write multiple "start" commands into
git-update-ref(1) for a single session, but none of them except for the
first one actually have any effect.

Using such nested "start"s may eventually have a sensible effect. One
may imagine that it restarts the current transaction, effectively
emptying it and creating a new one. It may also allow for creation of
nested transactions. But currently, none of these are implemented.

Silently ignoring this misuse is making it hard to iterate in the future
if "start" is ever going to have meaningful semantics in such a context.
This commit thus makes sure to error out in case we see such use.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index bb65129012dc551236f79ee6ea7ead255b01a56d..6029a80544e560ccc97e77163782f7c432099296 100644 (file)
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -436,6 +436,8 @@ static void update_refs_stdin(void)
                switch (state) {
                case UPDATE_REFS_OPEN:
                case UPDATE_REFS_STARTED:
+                       if (state == UPDATE_REFS_STARTED && cmd->state == UPDATE_REFS_STARTED)
+                               die("cannot restart ongoing transaction");
                        /* Do not downgrade a transaction to a non-transaction. */
                        if (cmd->state >= state)
                                state = cmd->state;

diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 3144e98b31535c1d817d46c697cadf3885bb50da..31b64be521d28e7cce5ff77aacd43c900c1ee803 100755 (executable)
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -1583,4 +1583,15 @@ test_expect_success 'transaction can commit after abort' '
        test_cmp expect actual
 '
 
+test_expect_success 'transaction cannot restart ongoing transaction' '
+       cat >stdin <<-EOF &&
+       start
+       create refs/heads/restart $A
+       start
+       commit
+       EOF
+       test_must_fail git update-ref --stdin <stdin >actual &&
+       test_must_fail git show-ref --verify refs/heads/restart
+'
+
 test_done