* [PATCH 1/2] cogito: fix t9105-fetch-local.sh - use "git-fsck-objects --full"
@ 2007-03-20 17:04 Pavel Roskin
2007-03-20 17:04 ` [PATCH 2/2] cogito: understand permissions written as "100755" Pavel Roskin
0 siblings, 1 reply; 2+ messages in thread
From: Pavel Roskin @ 2007-03-20 17:04 UTC (permalink / raw
To: Petr Baudis; +Cc: git
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] cogito: understand permissions written as "100755"
2007-03-20 17:04 [PATCH 1/2] cogito: fix t9105-fetch-local.sh - use "git-fsck-objects --full" Pavel Roskin
@ 2007-03-20 17:04 ` Pavel Roskin
0 siblings, 0 replies; 2+ messages in thread
From: Pavel Roskin @ 2007-03-20 17:04 UTC (permalink / raw
To: Petr Baudis; +Cc: git
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-03-20 17:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-20 17:04 [PATCH 1/2] cogito: fix t9105-fetch-local.sh - use "git-fsck-objects --full" Pavel Roskin
2007-03-20 17:04 ` [PATCH 2/2] cogito: understand permissions written as "100755" Pavel Roskin
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).