From: Pavel Roskin <proski@gnu.org>
To: Petr Baudis <pasky@suse.cz>
Cc: git@vger.kernel.org
Subject: [PATCH 2/2] cogito: understand permissions written as "100755"
Date: Tue, 20 Mar 2007 13:04:29 -0400 [thread overview]
Message-ID: <20070320170428.9139.69748.stgit@dv.roinet.com> (raw)
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 <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
prev parent reply other threads:[~2007-03-20 17:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070320170428.9139.69748.stgit@dv.roinet.com \
--to=proski@gnu.org \
--cc=git@vger.kernel.org \
--cc=pasky@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 NNTP newsgroup(s).