aboutsummaryrefslogtreecommitdiffstats
path: root/git-gui/lib/commit.tcl
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2013-03-01 21:06:17 +0100
committerJunio C Hamano <gitster@pobox.com>2013-03-01 12:24:45 -0800
commit8b1bd024154f0ee0d71a6befe9bbd96462e76abc (patch)
tree08c39a9a729bd3d02f632f95b550322abc8fde68 /git-gui/lib/commit.tcl
parentMerge branch 'wk/user-manual' into maint (diff)
downloadgit-8b1bd024154f0ee0d71a6befe9bbd96462e76abc.tar.gz
git-8b1bd024154f0ee0d71a6befe9bbd96462e76abc.zip
Make !pattern in .gitattributes non-fatal
Before 82dce99 (attr: more matching optimizations from .gitignore, 2012-10-15), .gitattributes did not have any special treatment of a leading '!'. The docs, however, always said The rules how the pattern matches paths are the same as in `.gitignore` files; see linkgit:gitignore[5]. By those rules, leading '!' means pattern negation. So 82dce99 correctly determined that this kind of line makes no sense and should be disallowed. However, users who actually had a rule for files starting with a '!' are in a bad position: before 82dce99 '!' matched that literal character, so it is conceivable that users have .gitattributes with such lines in them. After 82dce99 the unescaped version was disallowed in such a way that git outright refuses to run(!) most commands in the presence of such a .gitattributes. It therefore becomes very hard to fix, let alone work with, such repositories. Let's at least allow the users to fix their repos: change the fatal error into a warning. Reported-by: mathstuf@gmail.com Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions
pan class='insertions'>+47 2006-06-03Builtin git-rev-parse.Christian Couder4-6/+8 2006-06-03fetch: do not report "same" unless -verbose.Junio C Hamano1-1/+4 2006-06-02Update documentation for git-format-patchDennis Stosberg1-34/+35 2006-06-02fetch.c: do not call process_tree() from process_tree().Junio C Hamano1-3/+10 2006-06-02sha1_file: avoid re-preparing duplicate packsJeff King1-0/+6 2006-06-02handle concurrent pruning of packed objectsJeff King1-6/+18 2006-06-02format-patch: resurrect extra headers from configJohannes Schindelin3-3/+26 2006-05-31http: prevent segfault during curl handle reuseNick Hengeveld1-3/+6 2006-05-31send-email: only 'require' instead of 'use' Net::SMTPJohannes Schindelin1-1/+1 2006-05-31Allow multiple -m options to git-commit.Shawn Pearce1-7/+30 2006-05-31fetch.c: do not pass uninitialized lock to unlock_ref().Junio C Hamano1-4/+7 2006-05-31format-patch --signoffJunio C Hamano3-2/+52 2006-05-31git-svnimport: Improved detection of merges.Florian Forster1-2/+9 2006-05-30Improved pack format documentation.Shawn Pearce1-3/+8 2006-05-30tree_entry(): new tree-walking helper functionLinus Torvalds11-141/+112 2006-05-30git_exec_path, execv_git_cmd: ignore empty environment variablesDmitry V. Levin1-2/+2 2006-05-30execv_git_cmd: Fix stack buffer overflow.Dmitry V. Levin1-9/+23 2006-05-30Fixed Cygwin CR-munging problem in mailsplitSalikh Zakirov1-1/+1 2006-05-30send-email: do not pass bogus address to local sendmail binaryJunio C Hamano2-8/+17