diff options
| author | Brandon Williams <bmwill@google.com> | 2017-10-31 11:19:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-01 11:50:02 +0900 |
| commit | 02f2f56bc377c287c411947d0e1482aac888f8db (patch) | |
| tree | e03063fbe94146e5adfe73bb072c5aeeb60a9685 /sequencer.c | |
| parent | c9f348e926d300c4e254299b92e9bfe1678512d6 (diff) | |
| download | git-02f2f56bc377c287c411947d0e1482aac888f8db.tar.gz | |
diff: convert flags to be stored in bitfields
We cannot add many more flags to the diff machinery due to the
limitations of the number of flags that can be stored in a single
unsigned int. In order to allow for more flags to be added to the diff
machinery in the future this patch converts the flags to be stored in
bitfields in 'struct diff_flags'.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index f2a10cc4f2..c0410e4910 100644 --- a/sequencer.c +++ b/sequencer.c @@ -959,7 +959,8 @@ static int do_pick_commit(enum todo_command command, struct commit *commit, unborn = get_oid("HEAD", &head); if (unborn) oidcpy(&head, &empty_tree_oid); - if (index_differs_from(unborn ? EMPTY_TREE_SHA1_HEX : "HEAD", 0, 0)) + if (index_differs_from(unborn ? EMPTY_TREE_SHA1_HEX : "HEAD", + NULL, 0)) return error_dirty_index(opts); } discard_cache(); @@ -2279,7 +2280,7 @@ int sequencer_continue(struct replay_opts *opts) if (res) goto release_todo_list; } - if (index_differs_from("HEAD", 0, 0)) { + if (index_differs_from("HEAD", NULL, 0)) { res = error_dirty_index(opts); goto release_todo_list; } |