THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

瀏覽代碼

wt-status: convert struct wt_status to object_id

Change struct wt_status to use struct object_id instead of an array of
unsigned char.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
tags/v2.24.0-rc0
brian m. carlson Junio C Hamano 3 月之前
父節點
當前提交
e0cb7cdb89
共有 3 個文件被更改,包括 4 次插入4 次删除
  1. +2
    -2
      builtin/commit.c
  2. +1
    -1
      wt-status.c
  3. +1
    -1
      wt-status.h

+ 2
- 2
builtin/commit.c 查看文件

@@ -510,7 +510,7 @@ static int run_status(FILE *fp, const char *index_file, const char *prefix, int
s->nowarn = nowarn;
s->is_initial = get_oid(s->reference, &oid) ? 1 : 0;
if (!s->is_initial)
hashcpy(s->sha1_commit, oid.hash);
oidcpy(&s->oid_commit, &oid);
s->status_format = status_format;
s->ignore_submodule_arg = ignore_submodule_arg;

@@ -1406,7 +1406,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)

s.is_initial = get_oid(s.reference, &oid) ? 1 : 0;
if (!s.is_initial)
hashcpy(s.sha1_commit, oid.hash);
oidcpy(&s.oid_commit, &oid);

s.ignore_submodule_arg = ignore_submodule_arg;
s.status_format = status_format;


+ 1
- 1
wt-status.c 查看文件

@@ -2025,7 +2025,7 @@ static void wt_porcelain_v2_print_tracking(struct wt_status *s)
char eol = s->null_termination ? '\0' : '\n';

fprintf(s->fp, "# branch.oid %s%c",
(s->is_initial ? "(initial)" : sha1_to_hex(s->sha1_commit)),
(s->is_initial ? "(initial)" : oid_to_hex(&s->oid_commit)),
eol);

if (!s->branch)


+ 1
- 1
wt-status.h 查看文件

@@ -116,7 +116,7 @@ struct wt_status {
int rename_limit;
enum wt_status_format status_format;
struct wt_status_state state;
unsigned char sha1_commit[GIT_MAX_RAWSZ]; /* when not Initial */
struct object_id oid_commit; /* when not Initial */

/* These are computed during processing of the individual sections */
int committable;


Loading…
取消
儲存