projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge-recursive: conflicting rename case.
[git.git]
/
show-branch.c
diff --git
a/show-branch.c
b/show-branch.c
index
3cb335d
..
c742246
100644
(file)
--- a/
show-branch.c
+++ b/
show-branch.c
@@
-5,7
+5,7
@@
#include "refs.h"
static const char show_branch_usage[] =
#include "refs.h"
static const char show_branch_usage[] =
-"git-show-branch [--all] [--heads] [--tags] [--more=count | --list | --independent | --merge-base ] [<refs>...]";
+"git-show-branch [--all] [--heads] [--tags] [--
topo-order] [--
more=count | --list | --independent | --merge-base ] [<refs>...]";
#define UNINTERESTING 01
#define UNINTERESTING 01
@@
-450,6
+450,8
@@
static void append_one_rev(const char *av)
if (saved_matches == ref_name_cnt &&
ref_name_cnt < MAX_REVS)
error("no matching refs with %s", av);
if (saved_matches == ref_name_cnt &&
ref_name_cnt < MAX_REVS)
error("no matching refs with %s", av);
+ if (saved_matches + 1 < ref_name_cnt)
+ sort_ref_range(saved_matches, ref_name_cnt);
return;
}
die("bad sha1 reference %s", av);
return;
}
die("bad sha1 reference %s", av);