mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Usage-string fixes.

Browse Source 
Usage string fixes to make maintenance easier (only one instance
of a string to update not multiple copies).  I've spotted and
corrected inconsistent usage text in diff-tree while doing this.

Also diff-cache and read-tree usage text have been corrected to
match their up-to-date features.  Earlier, neither "--cached"
form of diff-cache nor "-m single-merge" form of read-tree were
described. 

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Junio C Hamano
2005-04-20 19:49:16 -07:00
committed by Linus Torvalds
parent 80913d4364
commit c5bac17ad2
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
read-tree.c
View File

@ -217,6 +217,8 @@ static void merge_stat_info(struct cache_entry **src, int nr)
}
}
static char *read_tree_usage = "read-tree (<sha> | -m <sha1> [<sha2> <sha3>])";
int main(int argc, char **argv)
{
int i, newfd, merge;
@ -236,20 +238,20 @@ int main(int argc, char **argv)
if (!strcmp(arg, "-m")) {
int i;
if (stage)
usage("-m needs to come first");
die("-m needs to come first");
read_cache();
for (i = 0; i < active_nr; i++) {
if (ce_stage(active_cache[i]))
usage("you need to resolve your current index first");
die("you need to resolve your current index first");
}
stage = 1;
merge = 1;
continue;
}
if (get_sha1_hex(arg, sha1) < 0)
usage("read-tree [-m] <sha1>");
usage(read_tree_usage);
if (stage > 3)
usage("can't merge more than two trees");
usage(read_tree_usage);
if (read_tree(sha1, "", 0) < 0)
die("failed to unpack tree object %s", arg);
stage++;