mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Merge branch 'kh/update-ref'
* kh/update-ref: Make old sha1 optional with git update-ref -d Clean up builtin-update-ref's option parsing
This commit is contained in:
commit
66915b5d7c
|
@ -7,7 +7,7 @@ git-update-ref - Update the object name stored in a ref safely
|
|||
|
||||
SYNOPSIS
|
||||
--------
|
||||
'git-update-ref' [-m <reason>] (-d <ref> <oldvalue> | [--no-deref] <ref> <newvalue> [<oldvalue>])
|
||||
'git-update-ref' [-m <reason>] (-d <ref> [<oldvalue>] | [--no-deref] <ref> <newvalue> [<oldvalue>])
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
@ -4,14 +4,14 @@
|
|||
#include "parse-options.h"
|
||||
|
||||
static const char * const git_update_ref_usage[] = {
|
||||
"git-update-ref [options] -d <refname> <oldval>",
|
||||
"git-update-ref [options] -d <refname> [<oldval>]",
|
||||
"git-update-ref [options] <refname> <newval> [<oldval>]",
|
||||
NULL
|
||||
};
|
||||
|
||||
int cmd_update_ref(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
const char *refname, *value, *oldval, *msg=NULL;
|
||||
const char *refname, *oldval, *msg=NULL;
|
||||
unsigned char sha1[20], oldsha1[20];
|
||||
int delete = 0, no_deref = 0;
|
||||
struct option options[] = {
|
||||
|
@ -27,25 +27,29 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
|
|||
if (msg && !*msg)
|
||||
die("Refusing to perform update with empty message.");
|
||||
|
||||
if (argc < 2 || argc > 3)
|
||||
usage_with_options(git_update_ref_usage, options);
|
||||
refname = argv[0];
|
||||
value = argv[1];
|
||||
oldval = argv[2];
|
||||
|
||||
if (get_sha1(value, sha1))
|
||||
die("%s: not a valid SHA1", value);
|
||||
|
||||
if (delete) {
|
||||
if (oldval)
|
||||
if (argc < 1 || argc > 2)
|
||||
usage_with_options(git_update_ref_usage, options);
|
||||
return delete_ref(refname, sha1);
|
||||
refname = argv[0];
|
||||
oldval = argv[1];
|
||||
} else {
|
||||
const char *value;
|
||||
if (argc < 2 || argc > 3)
|
||||
usage_with_options(git_update_ref_usage, options);
|
||||
refname = argv[0];
|
||||
value = argv[1];
|
||||
oldval = argv[2];
|
||||
if (get_sha1(value, sha1))
|
||||
die("%s: not a valid SHA1", value);
|
||||
}
|
||||
|
||||
hashclr(oldsha1);
|
||||
hashclr(oldsha1); /* all-zero hash in case oldval is the empty string */
|
||||
if (oldval && *oldval && get_sha1(oldval, oldsha1))
|
||||
die("%s: not a valid old SHA1", oldval);
|
||||
|
||||
return update_ref(msg, refname, sha1, oldval ? oldsha1 : NULL,
|
||||
no_deref ? REF_NODEREF : 0, DIE_ON_ERR);
|
||||
if (delete)
|
||||
return delete_ref(refname, oldval ? oldsha1 : NULL);
|
||||
else
|
||||
return update_ref(msg, refname, sha1, oldval ? oldsha1 : NULL,
|
||||
no_deref ? REF_NODEREF : 0, DIE_ON_ERR);
|
||||
}
|
||||
|
|
|
@ -42,6 +42,14 @@ test_expect_success "delete $m" '
|
|||
'
|
||||
rm -f .git/$m
|
||||
|
||||
test_expect_success "delete $m without oldvalue verification" "
|
||||
git update-ref $m $A &&
|
||||
test $A = \$(cat .git/$m) &&
|
||||
git update-ref -d $m &&
|
||||
! test -f .git/$m
|
||||
"
|
||||
rm -f .git/$m
|
||||
|
||||
test_expect_success \
|
||||
"fail to create $n" \
|
||||
"touch .git/$n_dir
|
||||
|
|
Loading…
Reference in a new issue