Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
update-index --index-info: allow stage 0 entries.
author
Junio C Hamano
<junkio@cox.net>
Wed, 1 Feb 2006 02:03:37 +0000
(18:03 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Thu, 2 Feb 2006 03:45:55 +0000
(19:45 -0800)
Somehow we did not allow stuffing the index with stage 0 entries
through --index-info interface. I do not think of a reason to
forbid it offhand.
Signed-off-by: Junio C Hamano <junkio@cox.net>
update-index.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
d9e2e12
)
diff --git
a/update-index.c
b/update-index.c
index a84a04f91855f1953f33cfa7573b7656e7c116b9..afec98dd48f59e095c0884c821c85b7228b45201 100644
(file)
--- a/
update-index.c
+++ b/
update-index.c
@@
-367,7
+367,7
@@
static void read_index_info(int line_termination)
if (!tab || tab - ptr < 41)
goto bad_line;
- if (tab[-2] == ' ' && '
1
' <= tab[-1] && tab[-1] <= '3') {
+ if (tab[-2] == ' ' && '
0
' <= tab[-1] && tab[-1] <= '3') {
stage = tab[-1] - '0';
ptr = tab + 1; /* point at the head of path */
tab = tab - 2; /* point at tail of sha1 */