Skip to content

Commit addafaf

Browse files
author
Junio C Hamano
committed
Merge lt/revlist,jc/diff,jc/revparse,jc/abbrev
5 parents 6b94f1e + 93b74bc + ea726d0 + b33aba5 + 6b1ddbd commit addafaf

File tree

15 files changed

+932
-107
lines changed

15 files changed

+932
-107
lines changed

Documentation/git-rev-list.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ SYNOPSIS
1414
[ \--min-age=timestamp ]
1515
[ \--sparse ]
1616
[ \--no-merges ]
17+
[ \--remove-empty ]
1718
[ \--all ]
1819
[ [ \--merge-order [ \--show-breaks ] ] | [ \--topo-order ] ]
1920
[ \--parents ]
@@ -80,6 +81,9 @@ OPTIONS
8081
(still subject to count and age limitation), but apply
8182
merge simplification nevertheless.
8283

84+
--remove-empty::
85+
Stop when a given path disappears from the tree.
86+
8387
--all::
8488
Pretend as if all the refs in `$GIT_DIR/refs/` are
8589
listed on the command line as <commit>.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ LIB_H = \
182182

183183
DIFF_OBJS = \
184184
diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
185-
diffcore-pickaxe.o diffcore-rename.o tree-diff.o
185+
diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o
186186

187187
LIB_OBJS = \
188188
blob.o commit.o connect.o count-delta.o csum-file.o \

cache.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,9 @@ extern int has_pack_file(const unsigned char *sha1);
221221
extern int has_pack_index(const unsigned char *sha1);
222222

223223
/* Convert to/from hex/sha1 representation */
224+
#define MINIMUM_ABBREV 4
225+
#define DEFAULT_ABBREV 7
226+
224227
extern int get_sha1(const char *str, unsigned char *sha1);
225228
extern int get_sha1_hex(const char *hex, unsigned char *sha1);
226229
extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */

0 commit comments

Comments
 (0)