Added t6089 - test for an internal & explicit file write ignore.

gittup · gittup · commit 7149db11be17 · 2022-08-06T13:32:41.000-07:00
Writing to a file inside a .git directory is ok (it just generates a warning about writing to a hidden file). However, if you also explicitly ignore it with an exclusion like ^\.git, then tup checks that first and fails to find a pel pointer and returns an internal error. Instead we can do the internal checks first, and only if those pass we can check the exclusions. Fixes #468.
diff --git a/src/tup/file.c b/src/tup/file.c
@@ -700,6 +700,17 @@ static int update_write_info(FILE *f, tupid_t cmdid, struct file_info *info,
 
 		w = TAILQ_FIRST(&info->write_list);
 
+		if(get_path_elements(w->filename, &pg) < 0)
+			return -1;
+		if(pg.pg_flags & PG_HIDDEN) {
+			if(warnings) {
+				fprintf(f, "tup warning: Writing to hidden file '%s'\n", w->filename);
+				(*warnings)++;
+			}
+			del_pel_group(&pg);
+			goto out_skip;
+		}
+
 		if(exclusion_match(f, &info->exclusion_root, w->filename, &match) < 0)
 			return -1;
 		if(match) {
@@ -719,17 +730,6 @@ static int update_write_info(FILE *f, tupid_t cmdid, struct file_info *info,
 			}
 		}
 
-		if(get_path_elements(w->filename, &pg) < 0)
-			return -1;
-		if(pg.pg_flags & PG_HIDDEN) {
-			if(warnings) {
-				fprintf(f, "tup warning: Writing to hidden file '%s'\n", w->filename);
-				(*warnings)++;
-			}
-			del_pel_group(&pg);
-			goto out_skip;
-		}
-
 		tent = NULL;
 		newdt = find_dir_tupid_dt_pg(DOT_DT, &pg, &pel, 0, 0);
 		del_pel_group(&pg);
diff --git a/test/t6089-broken-update67.sh b/test/t6089-broken-update67.sh
@@ -0,0 +1,33 @@
+#! /bin/sh -e
+# tup - A file-based build system
+#
+# Copyright (C) 2022  Mike Shal <marfey@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# Try writing to a file in a file that is both internally ignored (eg: in .git
+# from pel_ignored()) and explicitly ignored with an exclusion. Tup was
+# checking the explicit ignores first, and getting an internal error about not
+# finding the final pel pointer because the .git directory is also internally
+# ignored.
+
+. ./tup.sh
+
+mkdir .git
+cat > Tupfile << HERE
+: |> touch %o && touch .git/index-lock |> out ^\.git
+HERE
+update
+
+eotup
