how to prevent accidentally running `git add`?

I fear that while using git annex I will at some point accidentally git add some small files and not notice it until the only way to fix the problem is to rewrite history. What would be the best way to prevent myself from ever git add-ing a file into my annex repository instead of git annex add-ing it?

And secondly, how can I best search in my git annex repository whether I already did this mistake in the past or not? Currently I'm using this which returns everything that's not a symlink or a git submodule:

git ls-files -s | awk ' $1 != 120000 && $1 != 160000 { print $4 }'

RSS Atom

comment 1

I'm not sure if you can prevent 'git add' but you can at least prevent it getting commited with the pre-commit hook. Mine is this:

#!/bin/sh

FILES=$(find -name ".git" -prune -o -type f -not -name ".gitignore" -print);
FILE_COUNT=$(echo -n "$FILES" | wc -l)

if [ $FILE_COUNT -gt 0 ]; then
        echo "$FILE_COUNT non-symlink files found."
        echo "$FILES"
        exit 1
fi

# automatically configured by git-annex
git annex pre-commit .

Comment by Xyem — Wed Jun 25 10:35:07 2014

Remove comment

comment 2

Xyem, your method does not work well because it finds all regular files in the whole annex directory and does not only check for those that are to be committed.

Comment by josch — Fri Jun 27 04:50:03 2014

Remove comment

comment 3

That is intentional. In my use case, there should never be any regular files in this particular annex at all. If there are, it means I have missed something!

Comment by Xyem — Fri Jun 27 12:02:08 2014

Remove comment

comment 4

Based on the above, I'm using this script in the pre-commit hook.

It gets the staged files and checks if they are links or not. If a file being committed is not a link (maybe it was added with git add filename ???), the script aborts the commit.

#!/bin/sh

# Don't allow files to be added to the normal repo.
stagedfiles=$(git diff --cached --name-only);
echo "$stagedfiles" | while IFS= read -r file; do
    if [ ! -L "$file" ]; then
        echo "[Error] The file \"$file\" should not be added to the repo.";
        echo "#Remove from the index and add with git-annex:";
        echo "\$ git rm --cached \"$file\" && git annex add \"$file\"";
        exit 1;
    #else
    #   echo "OK : $file";
    fi;
done;

# automatically configured by git-annex
git annex pre-commit .

Comment by Bence — Thu Jan 15 16:15:21 2015

Remove comment

Add a comment