From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Yegor Yefremov <yegorslists@googlemail.com>
Cc: "linux-can@vger.kernel.org" <linux-can@vger.kernel.org>
Subject: Re: slcan2d
Date: Thu, 11 Jul 2013 11:30:29 +0200 [thread overview]
Message-ID: <51DE7B35.90807@pengutronix.de> (raw)
In-Reply-To: <CAGm1_kt9Pd_JjfBJSWMHMJaq3eyKE2LpBjk5323Waksz1vQYPg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1398 bytes --]
On 07/11/2013 10:38 AM, Yegor Yefremov wrote:
> Trying to commit slcan2d.c
> (https://github.com/yegorich/can-utils/commits/slcan2d) and my git
> 1.7.7 renames slcand.c because it looks quite similar. How can I
> prevent this? So far I found no option for git commit command.
Do you mean commit "90c9b2f slcan2d: add new slcan daemon"? git doesn't
rename Files if you don't tell git to do so. However git may optimize
and treat your new slcan2d as a copy+modifications of slcand.
If I check out commit 90c9b2f, there is slcand.c and slcan2d.c:
> ➜ (pts/25) frogger@hardanger:gitorious/can-utils (master) git checkout 90c9b2fcf644b9c5924983114f951b334039f665
> Note: checking out '90c9b2fcf644b9c5924983114f951b334039f665'.
[...]
> HEAD is now at 90c9b2f... slcan2d: add new slcan daemon
> ➜ (pts/25) frogger@hardanger:gitorious/can-utils ((90c9b2f...)) ll slcan*d.c
> -rwxr-xr-x 1 frogger frogger 12022 Jul 11 11:27 slcan2d.c
> -rw-r--r-- 1 frogger frogger 7777 Feb 12 17:57 slcand.c
You probably want to remove the executable bit from your slcan2d.c :) So
far everything looks good.
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]
next prev parent reply other threads:[~2013-07-11 9:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-11 8:38 slcan2d Yegor Yefremov
2013-07-11 9:30 ` Marc Kleine-Budde [this message]
2013-07-12 6:19 ` slcan2d Yegor Yefremov
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=51DE7B35.90807@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=yegorslists@googlemail.com \
/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