projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xdiff: post-process hunks to make them consistent.
[git.git]
/
rev-list.c
diff --git
a/rev-list.c
b/rev-list.c
index
441c437
..
963707a
100644
(file)
--- a/
rev-list.c
+++ b/
rev-list.c
@@
-4,12
+4,13
@@
#include "commit.h"
#include "tree.h"
#include "blob.h"
#include "commit.h"
#include "tree.h"
#include "blob.h"
+#include "tree-walk.h"
#include "diff.h"
#include "revision.h"
#include "diff.h"
#include "revision.h"
-/* bits #0-
4
in revision.h */
+/* bits #0-
6
in revision.h */
-#define COUNTED (1u<<
5
)
+#define COUNTED (1u<<
7
)
static const char rev_list_usage[] =
"git-rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
static const char rev_list_usage[] =
"git-rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
@@
-30,6
+31,7
@@
static const char rev_list_usage[] =
" --unpacked\n"
" --header | --pretty\n"
" --abbrev=nr | --no-abbrev\n"
" --unpacked\n"
" --header | --pretty\n"
" --abbrev=nr | --no-abbrev\n"
+" --abbrev-commit\n"
" special purpose:\n"
" --bisect"
;
" special purpose:\n"
" --bisect"
;
@@
-39,7
+41,7
@@
struct rev_info revs;
static int bisect_list = 0;
static int verbose_header = 0;
static int abbrev = DEFAULT_ABBREV;
static int bisect_list = 0;
static int verbose_header = 0;
static int abbrev = DEFAULT_ABBREV;
-static int
show_parents
= 0;
+static int
abbrev_commit
= 0;
static int show_timestamp = 0;
static int hdr_termination = 0;
static const char *commit_prefix = "";
static int show_timestamp = 0;
static int hdr_termination = 0;
static const char *commit_prefix = "";
@@
-51,8
+53,13
@@
static void show_commit(struct commit *commit)
printf("%lu ", commit->date);
if (commit_prefix[0])
fputs(commit_prefix, stdout);
printf("%lu ", commit->date);
if (commit_prefix[0])
fputs(commit_prefix, stdout);
- fputs(sha1_to_hex(commit->object.sha1), stdout);
- if (show_parents) {
+ if (commit->object.flags & BOUNDARY)
+ putchar('-');
+ if (abbrev_commit && abbrev)
+ fputs(find_unique_abbrev(commit->object.sha1, abbrev), stdout);
+ else
+ fputs(sha1_to_hex(commit->object.sha1), stdout);
+ if (revs.parents) {
struct commit_list *parents = commit->parents;
while (parents) {
struct object *o = &(parents->item->object);
struct commit_list *parents = commit->parents;
while (parents) {
struct object *o = &(parents->item->object);
@@
-318,6
+325,14
@@
int main(int argc, const char **argv)
abbrev = 0;
continue;
}
abbrev = 0;
continue;
}
+ if (!strcmp(arg, "--abbrev")) {
+ abbrev = DEFAULT_ABBREV;
+ continue;
+ }
+ if (!strcmp(arg, "--abbrev-commit")) {
+ abbrev_commit = 1;
+ continue;
+ }
if (!strncmp(arg, "--abbrev=", 9)) {
abbrev = strtoul(arg + 9, NULL, 10);
if (abbrev && abbrev < MINIMUM_ABBREV)
if (!strncmp(arg, "--abbrev=", 9)) {
abbrev = strtoul(arg + 9, NULL, 10);
if (abbrev && abbrev < MINIMUM_ABBREV)
@@
-336,10
+351,6
@@
int main(int argc, const char **argv)
commit_prefix = "commit ";
continue;
}
commit_prefix = "commit ";
continue;
}
- if (!strcmp(arg, "--parents")) {
- show_parents = 1;
- continue;
- }
if (!strcmp(arg, "--timestamp")) {
show_timestamp = 1;
continue;
if (!strcmp(arg, "--timestamp")) {
show_timestamp = 1;
continue;
@@
-358,6
+369,9
@@
int main(int argc, const char **argv)
(!(revs.tag_objects||revs.tree_objects||revs.blob_objects) && !revs.pending_objects))
usage(rev_list_usage);
(!(revs.tag_objects||revs.tree_objects||revs.blob_objects) && !revs.pending_objects))
usage(rev_list_usage);
+ save_commit_buffer = verbose_header;
+ track_object_refs = 0;
+
prepare_revision_walk(&revs);
if (revs.tree_objects)
mark_edges_uninteresting(revs.commits);
prepare_revision_walk(&revs);
if (revs.tree_objects)
mark_edges_uninteresting(revs.commits);
@@
-365,9
+379,6
@@
int main(int argc, const char **argv)
if (bisect_list)
revs.commits = find_bisection(revs.commits);
if (bisect_list)
revs.commits = find_bisection(revs.commits);
- save_commit_buffer = verbose_header;
- track_object_refs = 0;
-
show_commit_list(&revs);
return 0;
show_commit_list(&revs);
return 0;