# [PATCH 2/2] cogito: understand permissions written as "100755" 2 messages from 2007-03-20 to 2007-03-20. Participants: Pavel Roskin. Thread: https://gitlist.dev/t/7335 ## Pavel Roskin, 2007-03-20 17:04 Subject: [PATCH 1/2] cogito: fix t9105-fetch-local.sh - use "git-fsck-objects --full" Message-ID: <20070320170423.9139.43914.stgit@dv.roinet.com> URL: https://gitlist.dev/e/20070320170423.9139.43914.stgit%40dv.roinet.com ``` git-fsck-objects without "--full" won't succeed in a repository that uses "alternates". Signed-off-by: Pavel Roskin --- t/t9105-fetch-local.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/t/t9105-fetch-local.sh b/t/t9105-fetch-local.sh index 35e2778..184ae69 100755 --- a/t/t9105-fetch-local.sh +++ b/t/t9105-fetch-local.sh @@ -66,6 +66,6 @@ test_expect_success 'incremental update in repo2' \ '(cd repo2 && cg-update)' test_expect_success 'verifying incremental update' \ "(cmp repo1/.git/refs/heads/master repo2/.git/refs/heads/master && - cd repo2 && git-fsck-objects)" + cd repo2 && git-fsck-objects --full)" test_done ``` ## Pavel Roskin, 2007-03-20 17:04 Subject: [PATCH 2/2] cogito: understand permissions written as "100755" Message-ID: <20070320170428.9139.69748.stgit@dv.roinet.com> URL: https://gitlist.dev/e/20070320170428.9139.69748.stgit%40dv.roinet.com In-Reply-To: <20070320170423.9139.43914.stgit@dv.roinet.com> ``` The original code only recognized "755", which is not working anymore. This fixes t9204-merge-weird-conflicts.sh Signed-off-by: Pavel Roskin --- cg-Xmergefile | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cg-Xmergefile b/cg-Xmergefile index ac9d356..1219d1f 100755 --- a/cg-Xmergefile +++ b/cg-Xmergefile @@ -53,11 +53,12 @@ warning() # PlusMinus+XModeChar ;-) pmxmc() { - if [ "$1" = "755" ]; then - _pmxmc=+ - else - _pmxmc=- - fi + case "$1" in + *755) + _pmxmc=+;; + *) + _pmxmc=-;; + esac } # Set ways[] to the symbolic names of the particular ways ```