[PATCH 1/2] cogito: fix t9105-fetch-local.sh - use "git-fsck-objects --full"

[PATCH 1/2] cogito: fix t9105-fetch-local.sh - use "git-fsck-objects --full"

[Pavel Roskin]

git-fsck-objects without "--full" won't succeed in a repository that
uses "alternates".

Signed-off-by: Pavel Roskin <proski@gnu.org>
---

 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

[PATCH 2/2] cogito: understand permissions written as "100755"

[Pavel Roskin]

The original code only recognized "755", which is not working anymore. 
This fixes t9204-merge-weird-conflicts.sh

Signed-off-by: Pavel Roskin <proski@gnu.org>
---

 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