Skip to main content

Browse the archive

Revision 6bbfd1fa98b0c1fa1684bd35e64404799f0cc2b3 authored by Andreas Schwab on 25 September 2009, 18:44:44 UTC, committed by Shawn O. Pearce on 29 September 2009, 14:28:47 UTC 
parse-opt: ignore negation of OPT_NONEG for ambiguity checks
 
parse_long_opt always matches both --opt and --no-opt for any option
"opt", and only get_value checks whether --no-opt is actually valid.
Since the options for git branch contains both "no-merged" and "merged"
there are two matches for --no-merge, but no exact match.  With this
patch the negation of a NONEG option is rejected earlier, but it changes
the error message from "option `no-opt' isn't available" to "unknown
option `no-opt'".

[jk: added test]

Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
1 parent 5bdc32d
Raw File
tree.h 
#ifndef TREE_H
#define TREE_H

#include "object.h"

extern const char *tree_type;

struct tree {
	struct object object;
	void *buffer;
	unsigned long size;
};

struct tree *lookup_tree(const unsigned char *sha1);

int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);

int parse_tree(struct tree *tree);

/* Parses and returns the tree in the given ent, chasing tags and commits. */
struct tree *parse_tree_indirect(const unsigned char *sha1);

#define READ_TREE_RECURSIVE 1
typedef int (*read_tree_fn_t)(const unsigned char *, const char *, int, const char *, unsigned int, int, void *);

extern int read_tree_recursive(struct tree *tree,
			       const char *base, int baselen,
			       int stage, const char **match,
			       read_tree_fn_t fn, void *context);

extern int read_tree(struct tree *tree, int stage, const char **paths);

#endif /* TREE_H */
back to top