Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
wt-status: convert two uses of EMPTY_TREE_SHA1_HEX
author
brian m. carlson
<sandals@crustytoothpaste.net>
Wed, 2 May 2018 00:26:00 +0000
(
00:26
+0000)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 2 May 2018 04:59:52 +0000
(13:59 +0900)
Convert two uses of EMPTY_TREE_SHA1_HEX to use empty_tree_oid_hex to
avoid a dependency on a given hash algorithm.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
wt-status.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
939b89a
)
diff --git
a/wt-status.c
b/wt-status.c
index 50815e5faffba0e9df861dbc4881e9fbffd7a941..e44115b3be1898cbf1d9a38e01735d70853151c7 100644
(file)
--- a/
wt-status.c
+++ b/
wt-status.c
@@
-603,7
+603,7
@@
static void wt_status_collect_changes_index(struct wt_status *s)
init_revisions(&rev, NULL);
memset(&opt, 0, sizeof(opt));
init_revisions(&rev, NULL);
memset(&opt, 0, sizeof(opt));
- opt.def = s->is_initial ?
EMPTY_TREE_SHA1_HEX
: s->reference;
+ opt.def = s->is_initial ?
empty_tree_oid_hex()
: s->reference;
setup_revisions(0, NULL, &rev, &opt);
rev.diffopt.flags.override_submodule_config = 1;
setup_revisions(0, NULL, &rev, &opt);
rev.diffopt.flags.override_submodule_config = 1;
@@
-981,7
+981,7
@@
static void wt_longstatus_print_verbose(struct wt_status *s)
rev.diffopt.ita_invisible_in_index = 1;
memset(&opt, 0, sizeof(opt));
rev.diffopt.ita_invisible_in_index = 1;
memset(&opt, 0, sizeof(opt));
- opt.def = s->is_initial ?
EMPTY_TREE_SHA1_HEX
: s->reference;
+ opt.def = s->is_initial ?
empty_tree_oid_hex()
: s->reference;
setup_revisions(0, NULL, &rev, &opt);
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
setup_revisions(0, NULL, &rev, &opt);
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;