diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:01:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:01:28 -0700 |
| commit | aba7af8e67664f60b432ae1760644f9e96470949 (patch) | |
| tree | b0e8f3ca4c167b4935d8a047fcff54efa65f125d | |
| parent | Merge branch 'jk/commit-dates-parsing-fix' into maint (diff) | |
| parent | update-ref: fail create operation over stdin if ref already exists (diff) | |
| download | tgif-aba7af8e67664f60b432ae1760644f9e96470949.tar.xz | |
Merge branch 'mh/update-ref-batch-create-fix' into maint
* mh/update-ref-batch-create-fix:
update-ref: fail create operation over stdin if ref already exists
| -rw-r--r-- | builtin/update-ref.c | 1 | ||||
| -rwxr-xr-x | t/t1400-update-ref.sh | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/builtin/update-ref.c b/builtin/update-ref.c index 1292cfea11..5c208bb1fc 100644 --- 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(); + update->have_old = 1; 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 6ffd82fe32..e130c528fe 100755 --- 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_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' ' + 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 && |