undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-read-tree: -u without -m is meaningless. Don't allow it.

Browse Source 
Also, documetn the "-u" in the usage string.
This commit is contained in:
Linus Torvalds 2005-06-07 15:20:39 -07:00
parent b5b425074e
commit a57f0b58d7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
read-tree.c
View File

@ -275,7 +275,7 @@ static void merge_cache(struct cache_entry **src, int nr, merge_fn_t fn)
check_updates(active_cache, active_nr);
}
static char *read_tree_usage = "git-read-tree (<sha> | -m <sha1> [<sha2> [<sha3>]])";
static char *read_tree_usage = "git-read-tree (<sha> | -m [-u] <sha1> [<sha2> [<sha3>]])";
static struct cache_file cache_file;
@ -320,6 +320,8 @@ int main(int argc, char **argv)
die("failed to unpack tree object %s", arg);
stage++;
}
if (update && !merge)
usage(read_tree_usage);
if (merge) {
static const merge_fn_t merge_function[] = {
[1] = oneway_merge,