diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-04-22 05:14:43 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-04-22 05:14:43 +0300 |
commit | e36adf712251a19bd2ada0016764d340dfcf2ba0 (patch) | |
tree | 0b58e0a8e315bb737fdcdb16cf8f30d262025f76 /cache.h | |
parent | ffac537e6cbbf934b08745a378932722df287a53 (diff) | |
parent | 7906af0cb84c8e65656347909abd4e22b04d1c1e (diff) |
Merge branch 'ps/stash-in-c'
"git stash" rewritten in C.
* ps/stash-in-c: (28 commits)
tests: add a special setup where stash.useBuiltin is off
stash: optionally use the scripted version again
stash: add back the original, scripted `git stash`
stash: convert `stash--helper.c` into `stash.c`
stash: replace all `write-tree` child processes with API calls
stash: optimize `get_untracked_files()` and `check_changes()`
stash: convert save to builtin
stash: make push -q quiet
stash: convert push to builtin
stash: convert create to builtin
stash: convert store to builtin
stash: convert show to builtin
stash: convert list to builtin
stash: convert pop to builtin
stash: convert branch to builtin
stash: convert drop and clear to builtin
stash: convert apply to builtin
stash: mention options in `show` synopsis
stash: add tests for `git stash show` config
stash: rename test cases to be more descriptive
...
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1379,6 +1379,7 @@ enum get_oid_result { }; extern int get_oid(const char *str, struct object_id *oid); +extern int get_oidf(struct object_id *oid, const char *fmt, ...); extern int get_oid_commit(const char *str, struct object_id *oid); extern int get_oid_committish(const char *str, struct object_id *oid); extern int get_oid_tree(const char *str, struct object_id *oid); @@ -1552,6 +1553,10 @@ extern const char *git_sequence_editor(void); extern const char *git_pager(int stdout_is_tty); extern int is_terminal_dumb(void); extern int git_ident_config(const char *, const char *, void *); +/* + * Prepare an ident to fall back on if the user didn't configure it. + */ +void prepare_fallback_ident(const char *name, const char *email); extern void reset_ident_date(void); struct ident_split { |