Skip to main content

Browse the archive

Revision 2496da42118087e6766964c7a7b94f45daf372f4 authored by Junio C Hamano on 19 September 2020, 00:58:00 UTC, committed by Junio C Hamano on 19 September 2020, 00:58:00 UTC 
Merge branch 'rs/parallel-read-cache-fix'
 
A follow-up fix to a topic already in 'master'.

* rs/parallel-read-cache-fix:
  read-cache: fix mem-pool allocation for multi-threaded index loading
2 parent s 21de7e9 + bcd2c5e
Raw File
reset.h 
#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 *action,
	       const char *switch_to_branch, unsigned flags,
	       const char *reflog_orig_head, const char *reflog_head,
	       const char *default_reflog_action);

#endif
back to top