Skip to content

Commit 3269be3

Browse files
Ben PeartBen Peart
authored andcommitted
PR 134438: Block ident conversions when running under GVFS
Block $Id$ ident conversions along with EOL conversions and filters when running under GVFS
1 parent 470d7c1 commit 3269be3

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

convert.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -597,6 +597,9 @@ static int ident_to_git(const char *path, const char *src, size_t len,
597597
if (!buf)
598598
return 1;
599599

600+
if (gvfs_config_is_set(GVFS_BLOCK_FILTERS_AND_EOL_CONVERSIONS))
601+
die("ident conversions not supported when running under GVFS");
602+
600603
/* only grow if not in place */
601604
if (strbuf_avail(buf) + buf->len < len)
602605
strbuf_grow(buf, len - buf->len);
@@ -644,6 +647,9 @@ static int ident_to_worktree(const char *path, const char *src, size_t len,
644647
if (!cnt)
645648
return 0;
646649

650+
if (gvfs_config_is_set(GVFS_BLOCK_FILTERS_AND_EOL_CONVERSIONS))
651+
die("ident conversions not supported when running under GVFS");
652+
647653
/* are we "faking" in place editing ? */
648654
if (src == buf->buf)
649655
to_free = strbuf_detach(buf, NULL);

0 commit comments

Comments
 (0)