This makes git checkout, git reset, etc use smudge-to-file.
Includes test cases.
(There's a call to convert_to_working_tree in merge-recursive.c
that could also be made to use smudge-to-file as well.)
Signed-off-by: Joey Hess <joeyh@xxxxxxxxxx>
---
entry.c | 34 +++++++++++++++++++++++++++-------
t/t0021-conversion.sh | 44 ++++++++++++++++++++++++++++++++++++--------
2 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/entry.c b/entry.c
index 519e042..6a23159 100644
--- a/entry.c
+++ b/entry.c
@@ -175,8 +175,12 @@ static int write_entry(struct cache_entry *ce,
/*
* Convert from git internal format to working tree format
+ * unless the smudge-to-file filter can write to the
+ * file directly.
*/
+ int smudge_to_file = can_smudge_to_file(ce->name);
if (ce_mode_s_ifmt == S_IFREG &&
+ ! smudge_to_file &&
convert_to_working_tree(ce->name, new, size, &buf)) {
free(new);
new = strbuf_detach(&buf, &newsize);
@@ -189,13 +193,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 (! can_smudge_to_file(ce->name)) {
+ 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);
+ if (!to_tempfile) {
+ /* Re-open the file to stat it; the
+ * smudge-to-file filter may have replaced
+ * the file. */
+ fd = open(path, O_RDONLY);
+ if (fd < 0) {
+ return error_errno("unable to create file %s", path);
+ }
+ }
+ }
break;
case S_IFGITLINK:
if (to_tempfile)
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index 1043ea5..b0e2e5e 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,17 +299,37 @@ test_expect_success 'clean-from-file filter is used when adding a file' '
cmp test.t fstest.t
'
+test_expect_success 'smudge-to-file filter is used when checking out a file' '
+ test_config filter.rot13.smudge-to-file "./rot13-to-file.sh %p" &&
+
+ rm -f fstest.t &&
+ git checkout -- fstest.t &&
+ cmp test.t fstest.t &&
+
+ test -e rot13-to-file.ran &&
+ rm -f rot13-to-file.ran
+'
+
test_expect_success 'clean-from-file filter is not used when clean filter is not configured' '
- test_config filter.no.smudge ./rot13.sh &&
- test_config filter.no.clean-from-file "./rot13-from-file.sh %p" &&
+ test_config filter.noclean.smudge ./rot13.sh &&
+ test_config filter.noclean.clean-from-file "./rot13-from-file.sh %p" &&
- echo "*.no filter=no" >.gitattributes &&
+ echo "*.no filter=noclean" >.gitattributes &&
cat test.t >test.no &&
git add test.no &&
- test ! -e rot13-from-file.ran &&
- git cat-file blob :test.no >actual &&
- cmp test.t actual
+ test ! -e rot13-from-file.ran
+'
+
+test_expect_success 'smudge-to-file filter is not used when smudge filter is not configured' '
+ test_config filter.nosmudge.clean ./rot13.sh &&
+ test_config filter.nosmudge.smudge-to-file "./rot13-to-file.sh %p" &&
+
+ echo "*.no filter=nosmudge" >.gitattributes &&
+
+ rm -f fstest.t &&
+ git checkout -- fstest.t &&
+ test ! -e rot13-to-file.ran
'
test_done
--
2.9.0.4.g2856e74.dirty
--
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