 54f0bdc811
			
		
	
	54f0bdc811
	
	
	
		
			
			* tr/reset-checkout-patch: stash: simplify defaulting to "save" and reject unknown options Make test case number unique tests: disable interactive hunk selection tests if perl is not available DWIM 'git stash save -p' for 'git stash -p' Implement 'git stash save --patch' Implement 'git checkout --patch' Implement 'git reset --patch' builtin-add: refactor the meat of interactive_add() Add a small patch-mode testing library git-apply--interactive: Refactor patch mode code Make 'git stash -k' a short form for 'git stash save --keep-index'
		
			
				
	
	
		
			154 lines
		
	
	
		
			4.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			154 lines
		
	
	
		
			4.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #ifndef COMMIT_H
 | |
| #define COMMIT_H
 | |
| 
 | |
| #include "object.h"
 | |
| #include "tree.h"
 | |
| #include "strbuf.h"
 | |
| #include "decorate.h"
 | |
| 
 | |
| struct commit_list {
 | |
| 	struct commit *item;
 | |
| 	struct commit_list *next;
 | |
| };
 | |
| 
 | |
| struct commit {
 | |
| 	struct object object;
 | |
| 	void *util;
 | |
| 	unsigned int indegree;
 | |
| 	unsigned long date;
 | |
| 	struct commit_list *parents;
 | |
| 	struct tree *tree;
 | |
| 	char *buffer;
 | |
| };
 | |
| 
 | |
| extern int save_commit_buffer;
 | |
| extern const char *commit_type;
 | |
| 
 | |
| /* While we can decorate any object with a name, it's only used for commits.. */
 | |
| extern struct decoration name_decoration;
 | |
| struct name_decoration {
 | |
| 	struct name_decoration *next;
 | |
| 	char name[1];
 | |
| };
 | |
| 
 | |
| struct commit *lookup_commit(const unsigned char *sha1);
 | |
| struct commit *lookup_commit_reference(const unsigned char *sha1);
 | |
| struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
 | |
| 					      int quiet);
 | |
| 
 | |
| int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
 | |
| 
 | |
| int parse_commit(struct commit *item);
 | |
| 
 | |
| struct commit_list * commit_list_insert(struct commit *item, struct commit_list **list_p);
 | |
| unsigned commit_list_count(const struct commit_list *l);
 | |
| struct commit_list * insert_by_date(struct commit *item, struct commit_list **list);
 | |
| 
 | |
| void free_commit_list(struct commit_list *list);
 | |
| 
 | |
| void sort_by_date(struct commit_list **list);
 | |
| 
 | |
| /* Commit formats */
 | |
| enum cmit_fmt {
 | |
| 	CMIT_FMT_RAW,
 | |
| 	CMIT_FMT_MEDIUM,
 | |
| 	CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
 | |
| 	CMIT_FMT_SHORT,
 | |
| 	CMIT_FMT_FULL,
 | |
| 	CMIT_FMT_FULLER,
 | |
| 	CMIT_FMT_ONELINE,
 | |
| 	CMIT_FMT_EMAIL,
 | |
| 	CMIT_FMT_USERFORMAT,
 | |
| 
 | |
| 	CMIT_FMT_UNSPECIFIED,
 | |
| };
 | |
| 
 | |
| extern int non_ascii(int);
 | |
| extern int has_non_ascii(const char *text);
 | |
| struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
 | |
| extern char *reencode_commit_message(const struct commit *commit,
 | |
| 				     const char **encoding_p);
 | |
| extern void get_commit_format(const char *arg, struct rev_info *);
 | |
| extern void format_commit_message(const struct commit *commit,
 | |
| 				  const void *format, struct strbuf *sb,
 | |
| 				  enum date_mode dmode);
 | |
| extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit*,
 | |
|                                 struct strbuf *,
 | |
|                                 int abbrev, const char *subject,
 | |
|                                 const char *after_subject, enum date_mode,
 | |
| 				int need_8bit_cte);
 | |
| void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
 | |
| 		   const char *line, enum date_mode dmode,
 | |
| 		   const char *encoding);
 | |
| void pp_title_line(enum cmit_fmt fmt,
 | |
| 		   const char **msg_p,
 | |
| 		   struct strbuf *sb,
 | |
| 		   const char *subject,
 | |
| 		   const char *after_subject,
 | |
| 		   const char *encoding,
 | |
| 		   int need_8bit_cte);
 | |
| void pp_remainder(enum cmit_fmt fmt,
 | |
| 		  const char **msg_p,
 | |
| 		  struct strbuf *sb,
 | |
| 		  int indent);
 | |
| 
 | |
| 
 | |
| /** Removes the first commit from a list sorted by date, and adds all
 | |
|  * of its parents.
 | |
|  **/
 | |
| struct commit *pop_most_recent_commit(struct commit_list **list,
 | |
| 				      unsigned int mark);
 | |
| 
 | |
| struct commit *pop_commit(struct commit_list **stack);
 | |
| 
 | |
| void clear_commit_marks(struct commit *commit, unsigned int mark);
 | |
| 
 | |
| /*
 | |
|  * Performs an in-place topological sort of list supplied.
 | |
|  *
 | |
|  *   invariant of resulting list is:
 | |
|  *      a reachable from b => ord(b) < ord(a)
 | |
|  *   in addition, when lifo == 0, commits on parallel tracks are
 | |
|  *   sorted in the dates order.
 | |
|  */
 | |
| void sort_in_topological_order(struct commit_list ** list, int lifo);
 | |
| 
 | |
| struct commit_graft {
 | |
| 	unsigned char sha1[20];
 | |
| 	int nr_parent; /* < 0 if shallow commit */
 | |
| 	unsigned char parent[FLEX_ARRAY][20]; /* more */
 | |
| };
 | |
| 
 | |
| struct commit_graft *read_graft_line(char *buf, int len);
 | |
| int register_commit_graft(struct commit_graft *, int);
 | |
| struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
 | |
| 
 | |
| const unsigned char *lookup_replace_object(const unsigned char *sha1);
 | |
| 
 | |
| extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
 | |
| extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
 | |
| extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
 | |
| 
 | |
| extern int register_shallow(const unsigned char *sha1);
 | |
| extern int unregister_shallow(const unsigned char *sha1);
 | |
| extern int write_shallow_commits(int fd, int use_pack_protocol);
 | |
| extern int is_repository_shallow(void);
 | |
| extern struct commit_list *get_shallow_commits(struct object_array *heads,
 | |
| 		int depth, int shallow_flag, int not_shallow_flag);
 | |
| 
 | |
| int is_descendant_of(struct commit *, struct commit_list *);
 | |
| int in_merge_bases(struct commit *, struct commit **, int);
 | |
| 
 | |
| extern int interactive_add(int argc, const char **argv, const char *prefix);
 | |
| extern int run_add_interactive(const char *revision, const char *patch_mode,
 | |
| 			       const char **pathspec);
 | |
| 
 | |
| static inline int single_parent(struct commit *commit)
 | |
| {
 | |
| 	return commit->parents && !commit->parents->next;
 | |
| }
 | |
| 
 | |
| struct commit_list *reduce_heads(struct commit_list *heads);
 | |
| 
 | |
| #endif /* COMMIT_H */
 |