update-ref: fail create operation over stdin if ref already exists

Signed-off-by: Aman Gupta <aman@tmm1.net>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Acked-by: Brad King <brad.king@kitware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 1292cfea11d87e8c98ba64ffae9d6a1aeffaca9f..5c208bb1fc4f6c467842b37157435e87fe1415cd 100644 (file)
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -147,6 +147,7 @@ static void parse_cmd_create(const char *next)
        struct ref_update *update;
 
        update = update_alloc();
        struct ref_update *update;
 
        update = update_alloc();

+       update->have_old = 1;

 
        if ((next = parse_first_arg(next, &ref)) != NULL && ref.buf[0])
                update_store_ref_name(update, ref.buf);
 
        if ((next = parse_first_arg(next, &ref)) != NULL && ref.buf[0])
                update_store_ref_name(update, ref.buf);

diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 6ffd82fe321cd3154d6f193c21198218e762f1b2..e130c528fe5a0115c99b1203cfe9dced046cece3 100755 (executable)
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -820,7 +820,18 @@ test_expect_success 'stdin -z update ref fails with bad old value' '
        test_must_fail git rev-parse --verify -q $c
 '
 
        test_must_fail git rev-parse --verify -q $c
 '
 

+test_expect_success 'stdin -z create ref fails when ref exists' '
+       git update-ref $c $m &&
+       git rev-parse "$c" >expect &&
+       printf $F "create $c" "$m~1" >stdin &&
+       test_must_fail git update-ref -z --stdin <stdin 2>err &&
+       grep "fatal: Cannot lock the ref '"'"'$c'"'"'" err &&
+       git rev-parse "$c" >actual &&
+       test_cmp expect actual
+'
+

 test_expect_success 'stdin -z create ref fails with bad new value' '
 test_expect_success 'stdin -z create ref fails with bad new value' '

+       git update-ref -d "$c" &&

        printf $F "create $c" "does-not-exist" >stdin &&
        test_must_fail git update-ref -z --stdin <stdin 2>err &&
        grep "fatal: invalid new value for ref $c: does-not-exist" err &&
        printf $F "create $c" "does-not-exist" >stdin &&
        test_must_fail git update-ref -z --stdin <stdin 2>err &&
        grep "fatal: invalid new value for ref $c: does-not-exist" err &&