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   |