A new attribute "precious" is added to indicate that certain files
have valuable content and should not be easily discarded even if they
are ignored or untracked.
So far there are two parts of Git that are made aware of precious
files: "git clean" will leave precious files alone and unpack-trees.c
(i.e. merges and branch switches) will not overwrite
ignored-but-precious files.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
Documentation/git-clean.txt | 3 ++-
Documentation/gitattributes.txt | 13 +++++++++++++
Documentation/gitignore.txt | 4 ++++
attr.c | 12 ++++++++++++
attr.h | 2 ++
builtin/clean.c | 20 +++++++++++++++++---
t/t1004-read-tree-m-u-wf.sh | 6 ++++++
t/t7300-clean.sh | 29 +++++++++++++++++++++++++++++
unpack-trees.c | 1 +
9 files changed, 86 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index 03056dad0d..a9beadfb12 100644
--- a/Documentation/git-clean.txt
+++ b/Documentation/git-clean.txt
@@ -21,7 +21,8 @@ option is specified, ignored files are also removed. This
can, for
example, be useful to remove all build products.
If any optional `<path>...` arguments are given, only those paths
-are affected.
+are affected. Ignored or untracked files with `precious` attributes
+are not removed.
OPTIONS
-------
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index b8392fc330..b027abea4a 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -1188,6 +1188,19 @@ If this attribute is not set or has an invalid value,
the value of the
(See linkgit:git-config[1]).
+Precious files
+~~~~~~~~~~~~~~
+
+`precious`
+^^^^^^^^^^
+
+This attribute is set on files to indicate that their content is
+valuable. Many commands will behave slightly different on precious
+files. linkgit:git-clean[1] will leave precious files alone. Merging
+and branch switching will not silently overwrite ignored files that
+are marked "precious".
+
+
USING MACRO ATTRIBUTES
----------------------
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 1c94f08ff4..0e9614289e 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -141,6 +141,10 @@ not tracked by Git remain untracked.
To stop tracking a file that is currently tracked, use
'git rm --cached'.
+Ignored files are generally considered discardable. See `precious`
+attribute in linkgit:gitattributes[5] to change the behavior regarding
+ignored files.
+
EXAMPLES
--------
diff --git a/attr.c b/attr.c
index eaece6658d..b07d8cd835 100644
--- a/attr.c
+++ b/attr.c
@@ -1172,3 +1172,15 @@ void attr_start(void)
pthread_mutex_init(&g_attr_hashmap.mutex, NULL);
pthread_mutex_init(&check_vector.mutex, NULL);
}
+
+int is_precious_file(struct index_state *istate, const char *path)
+{
+ static struct attr_check *check;
+ if (!check)
+ check = attr_check_initl("precious", NULL);
+ if (!check)
+ return 0;
+
+ git_check_attr(istate, path, check);
+ return ATTR_TRUE(check->items[0].value);
+}
diff --git a/attr.h b/attr.h
index b0378bfe5f..b9a9751a66 100644
--- a/attr.h
+++ b/attr.h
@@ -82,4 +82,6 @@ void git_attr_set_direction(enum git_attr_direction
new_direction);
void attr_start(void);
+int is_precious_file(struct index_state *istate, const char *path);
+
#endif /* ATTR_H */
diff --git a/builtin/clean.c b/builtin/clean.c
index bbcdeb2d9e..42cd040849 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -17,6 +17,7 @@
#include "color.h"
#include "pathspec.h"
#include "help.h"
+#include "attr.h"
static int force = -1; /* unset */
static int interactive;
@@ -30,6 +31,8 @@ static const char *const builtin_clean_usage[] = {
static const char *msg_remove = N_("Removing %s\n");
static const char *msg_would_remove = N_("Would remove %s\n");
+static const char *msg_skip_precious = N_("Skipping precious file %s\n");
+static const char *msg_would_skip_precious = N_("Would skip precious file
%s\n");
static const char *msg_skip_git_dir = N_("Skipping repository %s\n");
static const char *msg_would_skip_git_dir = N_("Would skip repository %s\n");
static const char *msg_warn_remove_failed = N_("failed to remove %s");
@@ -153,6 +156,7 @@ static int remove_dirs(struct strbuf *path, const char
*prefix, int force_flag,
struct dirent *e;
int res = 0, ret = 0, gone = 1, original_len = path->len, len;
struct string_list dels = STRING_LIST_INIT_DUP;
+ const char *rel_path;
*dir_gone = 1;
@@ -192,9 +196,16 @@ static int remove_dirs(struct strbuf *path, const char
*prefix, int force_flag,
strbuf_setlen(path, len);
strbuf_addstr(path, e->d_name);
- if (lstat(path->buf, &st))
+ if (lstat(path->buf, &st)) {
; /* fall thru */
- else if (S_ISDIR(st.st_mode)) {
+ } else if ((!prefix && is_precious_file(&the_index, path->buf))
||
+ (prefix && skip_prefix(path->buf, prefix, &rel_path)
&&
+ is_precious_file(&the_index, rel_path))) {
+ quote_path_relative(path->buf, prefix, "ed);
+ printf(dry_run ? _(msg_would_skip_precious) :
_(msg_skip_precious), quoted.buf);
+ *dir_gone = 0;
+ continue;
+ } else if (S_ISDIR(st.st_mode)) {
if (remove_dirs(path, prefix, force_flag, dry_run,
quiet, &gone))
ret = 1;
if (gone) {
@@ -1018,7 +1029,10 @@ int cmd_clean(int argc, const char **argv, const char
*prefix)
if (lstat(abs_path.buf, &st))
continue;
- if (S_ISDIR(st.st_mode)) {
+ if (is_precious_file(&the_index, item->string)) {
+ qname = quote_path_relative(item->string, NULL, &buf);
+ printf(dry_run ? _(msg_would_skip_precious) :
_(msg_skip_precious), qname);
+ } else if (S_ISDIR(st.st_mode)) {
if (remove_dirs(&abs_path, prefix, rm_flags, dry_run,
quiet, &gone))
errors++;
if (gone && !quiet) {
diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh
index c13578a635..17dc626f62 100755
--- a/t/t1004-read-tree-m-u-wf.sh
+++ b/t/t1004-read-tree-m-u-wf.sh
@@ -63,6 +63,12 @@ test_expect_success 'two-way with incorrect
--exclude-per-directory (2)' '
fi
'
+test_expect_success 'two-way not clobbering a precious ignored file' '
+ test_when_finished rm -f .git/info/attributes &&
+ echo "file2 precious" >.git/info/attributes &&
+ read_tree_u_must_fail -m -u --exclude-per-directory=.gitignore master
side
+'
+
test_expect_success 'two-way clobbering a ignored file' '
read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore
master side
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 7b36954d63..a478a08a27 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -669,4 +669,33 @@ test_expect_success 'git clean -d skips untracked dirs
containing ignored files'
test_path_is_missing foo/b/bb
'
+test_expect_success 'git clean -xd leaves precious files alone' '
+ git init precious &&
+ (
+ cd precious &&
+ test_commit one &&
+ cat >.gitignore <<-\EOF &&
+ *.o
+ *.mak
+ EOF
+ cat >.gitattributes <<-\EOF &&
+ *.mak precious
+ .gitattributes precious
+ *.precious precious
+ EOF
+ mkdir sub &&
+ touch one.o sub/two.o one.mak sub/two.mak &&
+ touch one.untracked two.precious sub/also.precious &&
+ git clean -fdx &&
+ test_path_is_missing one.o &&
+ test_path_is_missing sub/two.o &&
+ test_path_is_missing one.untracked &&
+ test_path_is_file .gitattributes &&
+ test_path_is_file one.mak &&
+ test_path_is_file sub/two.mak &&
+ test_path_is_file two.precious &&
+ test_path_is_file sub/also.precious
+ )
+'
+
test_done
diff --git a/unpack-trees.c b/unpack-trees.c
index 7570df481b..9a5aadc084 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1895,6 +1895,7 @@ static int check_ok_to_remove(const char *name, int len,
int dtype,
return 0;
if (o->dir &&
+ !is_precious_file(o->src_index, name) &&
is_excluded(o->dir, o->src_index, name, &dtype))
/*
* ce->name is explicitly excluded, so it is Ok to
--
2.19.1.1327.g328c130451.dirty
