This makes git checkout, git reset, etc use smudgeToFile.
Includes test cases.
(There's a call to convert_to_working_tree in merge-recursive.c
that could also be made to use smudgeToFile as well.)
Signed-off-by: Joey Hess <joeyh@xxxxxxxxxx>
---
entry.c | 37 +++++++++++++++++++++++++++++--------
t/t0021-conversion.sh | 38 +++++++++++++++++++++++++++++++++-----
2 files changed, 62 insertions(+), 13 deletions(-)
diff --git a/entry.c b/entry.c
index 519e042..97975e5 100644
--- a/entry.c
+++ b/entry.c
@@ -175,8 +175,13 @@ static int write_entry(struct cache_entry *ce,
/*
* Convert from git internal format to working tree format
+ * unless the smudgeToFile filter can write to the
+ * file directly.
*/
- if (ce_mode_s_ifmt == S_IFREG &&
+ int regular_file = ce_mode_s_ifmt == S_IFREG;
+ int smudge_to_file = regular_file
+ && can_smudge_to_file(ce->name);
+ if (regular_file && ! smudge_to_file &&
convert_to_working_tree(ce->name, new, size, &buf)) {
free(new);
new = strbuf_detach(&buf, &newsize);
@@ -189,13 +194,29 @@ static int write_entry(struct cache_entry *ce,
return error_errno("unable to create file %s", path);
}
- wrote = write_in_full(fd, new, size);
- if (!to_tempfile)
- fstat_done = fstat_output(fd, state, &st);
- close(fd);
- free(new);
- if (wrote != size)
- return error("unable to write file %s", path);
+ if (! smudge_to_file) {
+ wrote = write_in_full(fd, new, size);
+ if (!to_tempfile)
+ fstat_done = fstat_output(fd, state, &st);
+ close(fd);
+ free(new);
+ if (wrote != size)
+ return error("unable to write file %s", path);
+ }
+ else {
+ close(fd);
+ convert_to_working_tree_filter_to_file(ce->name, path, new, size);
+ free(new);
+ /* The smudgeToFile filter may have replaced the
+ * file; open it to make sure that the file
+ * exists. */
+ fd = open(path, O_RDONLY);
+ if (fd < 0)
+ return error_errno("unable to create file %s", path);
+ if (!to_tempfile)
+ fstat_done = fstat_output(fd, state, &st);
+ close(fd);
+ }
break;
case S_IFGITLINK:
if (to_tempfile)
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index 407d5d6..cba03fd 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -14,12 +14,20 @@ chmod +x rot13.sh
cat <<EOF >rot13-from-file.sh
#!$SHELL_PATH
-fsfile="\$1"
+srcfile="\$1"
touch rot13-from-file.ran
-cat "\$fsfile" | ./rot13.sh
+cat "\$srcfile" | ./rot13.sh
EOF
chmod +x rot13-from-file.sh
+cat <<EOF >rot13-to-file.sh
+#!$SHELL_PATH
+destfile="\$1"
+touch rot13-to-file.ran
+./rot13.sh > "\$destfile"
+EOF
+chmod +x rot13-to-file.sh
+
test_expect_success setup '
git config filter.rot13.smudge ./rot13.sh &&
git config filter.rot13.clean ./rot13.sh &&
@@ -291,6 +299,17 @@ test_expect_success 'cleanFromFile filter is used when adding a file' '
cmp test fstest.t
'
+test_expect_success 'smudgeToFile filter is used when checking out a file' '
+ test_config filter.rot13.smudgeToFile ./rot13-to-file.sh &&
+
+ rm -f fstest.t &&
+ git checkout -- fstest.t &&
+ cmp test fstest.t &&
+
+ test -e rot13-to-file.ran &&
+ rm -f rot13-to-file.ran
+'
+
test_expect_success 'cleanFromFile filter is not used when clean filter is not configured' '
test_config filter.noclean.smudge ./rot13.sh &&
test_config filter.noclean.cleanFromFile ./rot13-from-file.sh &&
@@ -299,9 +318,18 @@ test_expect_success 'cleanFromFile filter is not used when clean filter is not c
cat test >test.no &&
git add test.no &&
- test ! -e rot13-from-file.ran &&
- git cat-file blob :test.no >actual &&
- cmp test actual
+ test ! -e rot13-from-file.ran
+'
+
+test_expect_success 'smudgeToFile filter is not used when smudge filter is not configured' '
+ test_config filter.nosmudge.clean ./rot13.sh &&
+ test_config filter.nosmudge.smudgeToFile ./rot13-to-file.sh &&
+
+ echo "*.no filter=nosmudge" >.gitattributes &&
+
+ rm -f fstest.t &&
+ git checkout -- fstest.t &&
+ test ! -e rot13-to-file.ran
'
test_done
--
2.9.0.587.ga3bedf2
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html