Skip to main content

Browse the archive

Revision bde42f081e68030505f59186ae036b2bbbd94ce8 authored by Junio C Hamano on 09 September 2016, 04:35:54 UTC, committed by Junio C Hamano on 09 September 2016, 04:35:54 UTC 
Merge branch 'jk/difftool-command-not-found' into maint
 
"git difftool" by default ignores the error exit from the backend
commands it spawns, because often they signal that they found
differences by exiting with a non-zero status code just like "diff"
does; the exit status codes 126 and above however are special in
that they are used to signal that the command is not executable,
does not exist, or killed by a signal.  "git difftool" has been
taught to notice these exit status codes.

* jk/difftool-command-not-found:
  difftool: always honor fatal error exit codes
2 parent s 7c96471 + 45a4f5d
Raw File
patch-ids.h 
#ifndef PATCH_IDS_H
#define PATCH_IDS_H

struct patch_id {
	unsigned char patch_id[20];
	char seen;
};

struct patch_ids {
	struct diff_options diffopts;
	int nr, alloc;
	struct patch_id **table;
	struct patch_id_bucket *patches;
};

int commit_patch_id(struct commit *commit, struct diff_options *options,
		    unsigned char *sha1);
int init_patch_ids(struct patch_ids *);
int free_patch_ids(struct patch_ids *);
struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);
struct patch_id *has_commit_patch_id(struct commit *, struct patch_ids *);

#endif /* PATCH_IDS_H */
back to top