summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2006-12-17 23:30:55 +0100
committerLars Hjemli <hjemli@gmail.com>2006-12-17 23:30:55 +0100
commitfb6e5869dcc81b775d5ac79dd3afac7220c366dd (patch)
tree6e68d9dfe43d3ca5c6fc5b9be6546ea70779f0f1
parent6cb326c83b3c0b35d472305294afee3105b3088d (diff)
downloadcgit-fb6e5869dcc81b775d5ac79dd3afac7220c366dd.tar.gz
cgit-fb6e5869dcc81b775d5ac79dd3afac7220c366dd.tar.bz2
cgit-fb6e5869dcc81b775d5ac79dd3afac7220c366dd.zip
Don't show new and old filemode for added/removed files
It gives us no extra info whatsoever to show "----------" for either new or old mode, it's just noise (especially since we now show the "old" filemode for deleted files) Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to '')
-rw-r--r--ui-commit.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/ui-commit.c b/ui-commit.c
index c5ee8e7..b49b2e9 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -46,8 +46,15 @@ void print_filepair(struct diff_filepair *pair)
html("<tr>");
htmlf("<td class='mode'>");
- html_filemode(pair->two->mode);
- if (pair->one->mode != pair->two->mode) {
+ if (is_null_sha1(pair->two->sha1)) {
+ html_filemode(pair->one->mode);
+ } else {
+ html_filemode(pair->two->mode);
+ }
+
+ if (pair->one->mode != pair->two->mode &&
+ !is_null_sha1(pair->one->sha1) &&
+ !is_null_sha1(pair->two->sha1)) {
html("<span class='modechange'>[");
html_filemode(pair->one->mode);
html("]</span>");
ght'> Suggested-by: Matthieu Weber <mweber@free.fr> 2014-03-22clip: rename SELECTION to X_SELECTIONJason A. Donenfeld2-6/+6 2014-03-22Version bump ahead of release.Jason A. Donenfeld1-1/+1 2014-03-22Makefile: do not use recursion and organizeJason A. Donenfeld12-9/+7 2014-03-22clip: suppress kill errorJason A. Donenfeld2-3/+3 2014-03-22clip: do not race on osxJason A. Donenfeld1-5/+5 2014-03-22clip: use pkill instead of procJason A. Donenfeld1-1/+1 2014-03-20Keepass import should include root-level entriesErik Mackdanz1-0/+1 Repro steps: 1. In KeePass, add some entries as children of the root node 2. Export the KeePass to foo.xml 3. 'keepass2pass.py -f foo.xml' Expect: all entries imported Actual: root-level entries are skipped 2014-03-20keepassx2pass: friendly title fieldPhilip Chase1-1/+24 This patch removes several special characters while attempting to preserve as much meaning in the filename as possible. These changes are made to the KeepassX title before it is used as a file password store filename: - Spaces between words in file names are replaced with camelCasing. - The characters \ | ( ) are each replaced with a hyphen. - Trailing hypens are removed. - @ is replaced with "At" - ' is removed