Merge branch 'jk/no-system-includes-in-dot-c'
authorJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2019 21:38:56 +0000 (14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2019 21:38:56 +0000 (14:38 -0700)
Compilation fix.

* jk/no-system-includes-in-dot-c:
wt-status.h: drop stdio.h include
verify-tag: drop signal.h include

1  2 
builtin/verify-commit.c
wt-status.h
diff --combined builtin/verify-commit.c
index 4b9e823f8f9656b686f22ac4bb531f7d63f325ee,4e93914e593bdc751dd2ca5496097ecffbc1d41f..40c69a0bedde5be02af557fd0c92efc1d2c857e5
@@@ -12,7 -12,6 +12,6 @@@
  #include "repository.h"
  #include "commit.h"
  #include "run-command.h"
- #include <signal.h>
  #include "parse-options.h"
  #include "gpg-interface.h"
  
@@@ -21,14 -20,15 +20,14 @@@ static const char * const verify_commit
                NULL
  };
  
 -static int run_gpg_verify(const struct object_id *oid, const char *buf, unsigned long size, unsigned flags)
 +static int run_gpg_verify(struct commit *commit, unsigned flags)
  {
        struct signature_check signature_check;
        int ret;
  
        memset(&signature_check, 0, sizeof(signature_check));
  
 -      ret = check_commit_signature(lookup_commit(the_repository, oid),
 -                                   &signature_check);
 +      ret = check_commit_signature(commit, &signature_check);
        print_signature_buffer(&signature_check, flags);
  
        signature_check_clear(&signature_check);
  
  static int verify_commit(const char *name, unsigned flags)
  {
 -      enum object_type type;
        struct object_id oid;
 -      char *buf;
 -      unsigned long size;
 -      int ret;
 +      struct object *obj;
  
        if (get_oid(name, &oid))
                return error("commit '%s' not found.", name);
  
 -      buf = read_object_file(&oid, &type, &size);
 -      if (!buf)
 +      obj = parse_object(the_repository, &oid);
 +      if (!obj)
                return error("%s: unable to read file.", name);
 -      if (type != OBJ_COMMIT)
 +      if (obj->type != OBJ_COMMIT)
                return error("%s: cannot verify a non-commit object of type %s.",
 -                              name, type_name(type));
 -
 -      ret = run_gpg_verify(&oid, buf, size, flags);
 +                              name, type_name(obj->type));
  
 -      free(buf);
 -      return ret;
 +      return run_gpg_verify((struct commit *)obj, flags);
  }
  
  static int git_verify_commit_config(const char *var, const char *value, void *cb)
diff --combined wt-status.h
index b0cfdc8011c3cf06db89f1fa19c9c2586fcfe4df,8849768e9234aeebced0e4a244ead366907e0a04..77dad5b92048851c622a35d8b34d802fbd0ecac6
@@@ -1,7 -1,6 +1,6 @@@
  #ifndef STATUS_H
  #define STATUS_H
  
- #include <stdio.h>
  #include "string-list.h"
  #include "color.h"
  #include "pathspec.h"
@@@ -65,9 -64,6 +64,9 @@@ enum wt_status_format 
        STATUS_FORMAT_UNSPECIFIED
  };
  
 +#define HEAD_DETACHED_AT _("HEAD detached at ")
 +#define HEAD_DETACHED_FROM _("HEAD detached from ")
 +
  struct wt_status_state {
        int merge_in_progress;
        int am_in_progress;