Revision 197a772c48652d94ddb340fc6bcd8ed4440ff233 authored by Johannes Schindelin on 20 May 2024, 20:22:01 UTC, committed by Junio C Hamano on 21 May 2024, 19:33:08 UTC
In df93e407f06 (init: refactor the template directory discovery into its own function, 2024-03-29), I refactored the way the templates directory is discovered. The refactoring was faithful, but missed a reference in the `Makefile` where the `DEFAULT_GIT_TEMPLATE_DIR` constant is defined. As a consequence, Git v2.45.1 and friends will always use the hard-coded path `/usr/share/git-core/templates`. Let's fix that by defining the `DEFAULT_GIT_TEMPLATE_DIR` when building `setup.o`, where that constant is actually used. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent ee05253
resolve-undo.h
#ifndef RESOLVE_UNDO_H
#define RESOLVE_UNDO_H
#include "cache.h"
struct resolve_undo_info {
unsigned int mode[3];
struct object_id oid[3];
};
void record_resolve_undo(struct index_state *, struct cache_entry *);
void resolve_undo_write(struct strbuf *, struct string_list *);
struct string_list *resolve_undo_read(const char *, unsigned long);
void resolve_undo_clear_index(struct index_state *);
int unmerge_index_entry_at(struct index_state *, int);
void unmerge_index(struct index_state *, const struct pathspec *);
void unmerge_marked_index(struct index_state *);
#endif
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...