diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-22 19:35:59 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-09 12:22:25 +0400 |
| commit | 32260ad5dbc3100ebb5e05432198888bfbe600f8 (patch) | |
| tree | dba543f212ca43a1ab90e6a532de72098609c3f8 /unpack-trees.h | |
| parent | 0a9b88b7dee70bd36d35b7857640a18ee3adeef1 (diff) | |
Make branch merging aware of underlying case-insensitive filsystems
If we find an unexpected file, see if that filename perhaps exists in a
case-insensitive way in the index, and whether the file matches that. If
so, ignore it as a known pre-existing file of a different name.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index ad8cc65d68..d436d6ced9 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -31,7 +31,7 @@ struct unpack_trees_options { void *unpack_data; struct index_state *dst_index; - const struct index_state *src_index; + struct index_state *src_index; struct index_state result; }; |