From: Grzegorz Kossakowski <grek@tuffmail.com>
To: git@vger.kernel.org
Subject: git-mergetool changes file rights?
Date: Sat, 07 Mar 2009 16:55:38 +0100 [thread overview]
Message-ID: <49B298FA.2050803@tuffmail.com> (raw)
Hello,
I've stumbled upon very weird problem:
grek@linux-p3yg:~/asf/git/infrastructure/apache-git-mirrors/bin> git --version
git version 1.6.1.3
grek@linux-p3yg:~/asf/git/infrastructure/apache-git-mirrors/bin> ls -l
razem 40
-rwxr-xr-x 1 grek users 773 mar 7 16:47 create-repo.sh
-rwxr-xr-x 1 grek users 3219 mar 7 16:50 email-update.sh
-rwxr-xr-x 1 grek users 3219 mar 7 16:50 email-update.sh.orig
-rwxr-xr-x 1 grek users 2086 mar 7 16:47 move-svn-project.sh
-rwxr-xr-x 1 grek users 1464 mar 7 16:47 update-authors.sh
-rwxr-xr-x 1 grek users 156 mar 6 16:16 update-daily.sh
-rwxr-xr-x 1 grek users 371 mar 7 16:47 update-every-minute.sh
-rwxr-xr-x 1 grek users 215 mar 7 16:47 update-gitweb.sh
-rwxr-xr-x 1 grek users 1104 mar 7 16:47 update-repo.sh
-rwxr-xr-x 1 grek users 188 mar 7 16:47 update.sh
grek@linux-p3yg:~/asf/git/infrastructure/apache-git-mirrors/bin> git mergetool
merge tool candidates: kdiff3 kdiff3 tkdiff xxdiff meld gvimdiff opendiff emerge vimdiff
Merging the files: email-update.sh
Normal merge conflict for 'email-update.sh':
{local}: modified
{remote}: modified
Hit return to start merge resolution tool (kdiff3):
error: open("bin/email-update.sh"): Permission denied
error: unable to index file bin/email-update.sh
fatal: updating files failed
grek@linux-p3yg:~/asf/git/infrastructure/apache-git-mirrors/bin> ls -l
razem 40
-rwxr-xr-x 1 grek users 773 mar 7 16:47 create-repo.sh
---x------ 1 grek users 3219 mar 7 16:53 email-update.sh
-rwxr-xr-x 1 grek users 3219 mar 7 16:53 email-update.sh.orig
-rwxr-xr-x 1 grek users 2086 mar 7 16:47 move-svn-project.sh
-rwxr-xr-x 1 grek users 1464 mar 7 16:47 update-authors.sh
-rwxr-xr-x 1 grek users 156 mar 6 16:16 update-daily.sh
-rwxr-xr-x 1 grek users 371 mar 7 16:47 update-every-minute.sh
-rwxr-xr-x 1 grek users 215 mar 7 16:47 update-gitweb.sh
-rwxr-xr-x 1 grek users 1104 mar 7 16:47 update-repo.sh
-rwxr-xr-x 1 grek users 188 mar 7 16:47 update.sh
Notice rights for email-update.sh.
What's going on here?
--
Best regards,
Grzegorz Kossakowski
next reply other threads:[~2009-03-07 15:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-07 15:55 Grzegorz Kossakowski [this message]
2009-03-07 19:48 ` git-mergetool changes file rights? Charles Bailey
2009-03-07 19:54 ` Grzegorz Kossakowski
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=49B298FA.2050803@tuffmail.com \
--to=grek@tuffmail.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.