mirror of
https://github.com/git/git
synced 2024-07-16 10:38:05 +00:00
1946d45844
The only use of the action parameter is to setup the error messages for unpack_trees(). All but two cases pass either "checkout" or "reset". The case that passes "reset --hard" would be better passing "reset" so that the error messages match the builtin reset command like all the other callers that are doing a reset. The case that passes "Fast-forwarded" is only updating HEAD and so the parameter is unused in that case as it does not call unpack_trees(). The value to pass to setup_unpack_trees_porcelain() can be determined by checking whether flags contains RESET_HEAD_HARD without the caller having to specify it. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
21 lines
545 B
C
21 lines
545 B
C
#ifndef RESET_H
|
|
#define RESET_H
|
|
|
|
#include "hash.h"
|
|
#include "repository.h"
|
|
|
|
#define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION"
|
|
|
|
#define RESET_HEAD_DETACH (1<<0)
|
|
#define RESET_HEAD_HARD (1<<1)
|
|
#define RESET_HEAD_RUN_POST_CHECKOUT_HOOK (1<<2)
|
|
#define RESET_HEAD_REFS_ONLY (1<<3)
|
|
#define RESET_ORIG_HEAD (1<<4)
|
|
|
|
int reset_head(struct repository *r, struct object_id *oid,
|
|
const char *switch_to_branch, unsigned flags,
|
|
const char *reflog_orig_head, const char *reflog_head,
|
|
const char *default_reflog_action);
|
|
|
|
#endif
|