From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 31 Jul 2019 21:38:56 +0000 (-0700)
Subject: Merge branch 'jk/no-system-includes-in-dot-c'
X-Git-Tag: v2.23.0-rc1~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0bdce88004b768a0d12f64de0b71946c444f616c?hp=-c

Merge branch 'jk/no-system-includes-in-dot-c'

Compilation fix.

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

0bdce88004b768a0d12f64de0b71946c444f616c
diff --combined builtin/verify-commit.c
index 4b9e823f8f,4e93914e59..40c69a0bed
--- a/builtin/verify-commit.c
+++ b/builtin/verify-commit.c
@@@ -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);
@@@ -37,20 -37,26 +36,20 @@@
  
  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 b0cfdc8011,8849768e92..77dad5b920
--- a/wt-status.h
+++ b/wt-status.h
@@@ -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;