development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues 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
Show stats Download patch file Download diff file Expand all files Collapse all files

14
commit-tree.c
View file

@ -268,15 +268,13 @@ static void check_valid(unsigned char *sha1, const char *expect)
}
/*
* Having more than two parents may be strange, but hey, there's
* no conceptual reason why the file format couldn't accept multi-way
* merges. It might be the "union" of several packages, for example.
*
* I don't really expect that to happen, but this is here to make
* it clear that _conceptually_ it's ok..
* Having more than two parents is not strange at all, and this is
* how multi-way merges are represented.
*/
#define MAXPARENT (16)
static char *commit_tree_usage = "commit-tree <sha1> [-p <sha1>]* < changelog";
int main(int argc, char **argv)
{
int i, len;
@ -296,14 +294,14 @@ int main(int argc, char **argv)
unsigned int size;
if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
usage("commit-tree <sha1> [-p <sha1>]* < changelog");
usage(commit_tree_usage);
check_valid(tree_sha1, "tree");
for (i = 2; i < argc; i += 2) {
char *a, *b;
a = argv[i]; b = argv[i+1];
if (!b || strcmp(a, "-p") || get_sha1_hex(b, parent_sha1[parents]))
usage("commit-tree <sha1> [-p <sha1>]* < changelog");
usage(commit_tree_usage);
check_valid(parent_sha1[parents], "commit");
parents++;
}

6
diff-cache.c
View file

@ -215,6 +215,8 @@ static int diff_cache(void *tree, unsigned long size, struct cache_entry **ac, i
return 0;
}
static char *diff_cache_usage = "diff-cache [-r] [-z] [--cached] <tree sha1>";
int main(int argc, char **argv)
{
unsigned char tree_sha1[20];
@ -238,11 +240,11 @@ int main(int argc, char **argv)
cached_only = 1;
continue;
}
usage("diff-cache [-r] [-z] <tree sha1>");
usage(diff_cache_usage);
}
if (argc != 2 || get_sha1_hex(argv[1], tree_sha1))
usage("diff-cache [-r] [-z] <tree sha1>");
usage(diff_cache_usage);
tree = read_tree_with_tree_or_commit_sha1(tree_sha1, &size, 0);
if (!tree)

6
diff-tree.c
View file

@ -178,6 +178,8 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
return retval;
}
static char *diff_tree_usage = "diff-tree [-r] [-z] <tree sha1> <tree sha1>";
int main(int argc, char **argv)
{
unsigned char old[20], new[20];
@ -194,10 +196,10 @@ int main(int argc, char **argv)
line_termination = '\0';
continue;
}
usage("diff-tree [-r] [-z] <tree sha1> <tree sha1>");
usage(diff_tree_usage);
}
if (argc != 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new))
usage("diff-tree <tree sha1> <tree sha1>");
usage(diff_tree_usage);
return diff_tree_sha1(old, new, "");
}

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++;