diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-07-31 12:42:35 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-31 15:41:12 -0700 |
| commit | c1f3089e4bb5a3e8e8f92915800f2d5a2d4dd246 (patch) | |
| tree | 1e328dc91018d6d3a729728be8925b1b037524eb /merge-recursive.c | |
| parent | 7a85b848ad77c72c539c5887ead99a89140541da (diff) | |
| download | git-c1f3089e4bb5a3e8e8f92915800f2d5a2d4dd246.tar.gz git-c1f3089e4bb5a3e8e8f92915800f2d5a2d4dd246.tar.xz | |
merge-recur: virtual commits shall never be parsed
It would not make sense to parse a virtual commit, therefore set the
"parsed" flag to 1.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 10bce705f..74a329faa 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -43,6 +43,8 @@ static struct commit *make_virtual_commit(struct tree *tree, const char *comment commit->tree = tree; commit->util = (void*)comment; *(int*)commit->object.sha1 = virtual_id++; + /* avoid warnings */ + commit->object.parsed = 1; return commit; } |