diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-20 12:36:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-20 12:36:12 -0700 |
| commit | 9a86b899415c8a49cc33d6b43bcab8113ddca517 (patch) | |
| tree | 75c5c99594fc6d20d6196860aa78cd46c733ea16 /builtin/reset.c | |
| parent | 087350398e8b2c5d4b39f051b23a2e533f4d830b (diff) | |
| parent | c6268bc0082e340633b7a785e6c7761cd54063cc (diff) | |
| download | git-9a86b899415c8a49cc33d6b43bcab8113ddca517.tar.gz | |
Merge branch 'bk/refs-multi-update'
Give "update-refs" a "--stdin" option to read multiple update
requests and perform them in an all-or-none fashion.
* bk/refs-multi-update:
update-ref: add test cases covering --stdin signature
update-ref: support multiple simultaneous updates
refs: add update_refs for multiple simultaneous updates
refs: add function to repack without multiple refs
refs: factor delete_ref loose ref step into a helper
refs: factor update_ref steps into helpers
refs: report ref type from lock_any_ref_for_update
reset: rename update_refs to reset_refs
Diffstat (limited to 'builtin/reset.c')
| -rw-r--r-- | builtin/reset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index 088ccffba0..1a53448772 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -226,7 +226,7 @@ static void parse_args(struct pathspec *pathspec, prefix, argv); } -static int update_refs(const char *rev, const unsigned char *sha1) +static int reset_refs(const char *rev, const unsigned char *sha1) { int update_ref_status; struct strbuf msg = STRBUF_INIT; @@ -354,7 +354,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) if (!pathspec.nr && !unborn) { /* Any resets without paths update HEAD to the head being * switched to, saving the previous head in ORIG_HEAD before. */ - update_ref_status = update_refs(rev, sha1); + update_ref_status = reset_refs(rev, sha1); if (reset_type == HARD && !update_ref_status && !quiet) print_new_head_line(lookup_commit_reference(sha1)); |