From: Kumar Gala <galak@kernel.crashing.org>
To: git@vger.kernel.org
Subject: problem with git detecting proper renames
Date: Thu, 29 Nov 2007 10:57:24 -0600 (CST) [thread overview]
Message-ID: <Pine.LNX.4.64.0711291050440.1711@blarg.am.freescale.net> (raw)
I was wondering if there was a way to ensure that git tracks renames
properly (or maybe its reporting them properly).
I did some git-mv and got the following:
the problem is git seems confused about what file was associated with its
source.
For example:
.../mpc8541cds => freescale/mpc8555cds}/init.S
thanks
- k
---
(the following is the results of a git-format-patch after the git-mv)
Makefile | 6 +-
board/cds/mpc8548cds/Makefile | 60 -----
board/cds/mpc8555cds/Makefile | 60 -----
board/cds/mpc8555cds/init.S | 255 --------------------
board/cds/mpc8555cds/u-boot.lds | 150 ------------
board/{cds => freescale}/common/cadmus.c | 0
board/{cds => freescale}/common/cadmus.h | 0
board/{cds => freescale}/common/eeprom.c | 0
board/{cds => freescale}/common/eeprom.h | 0
board/{cds => freescale}/common/ft_board.c | 0
board/{cds => freescale}/common/via.c | 0
board/{cds => freescale}/common/via.h | 0
board/{cds => freescale}/mpc8541cds/Makefile | 0
board/{cds => freescale}/mpc8541cds/config.mk | 0
board/{cds => freescale}/mpc8541cds/init.S | 0
board/{cds => freescale}/mpc8541cds/mpc8541cds.c | 0
board/{cds => freescale}/mpc8541cds/u-boot.lds | 4 +-
.../mpc8541cds => freescale/mpc8548cds}/Makefile | 0
board/{cds => freescale}/mpc8548cds/config.mk | 0
board/{cds => freescale}/mpc8548cds/init.S | 0
board/{cds => freescale}/mpc8548cds/mpc8548cds.c | 0
board/{cds => freescale}/mpc8548cds/u-boot.lds | 4 +-
.../mpc8541cds => freescale/mpc8555cds}/Makefile | 0
board/{cds => freescale}/mpc8555cds/config.mk | 0
.../mpc8541cds => freescale/mpc8555cds}/init.S | 0
board/{cds => freescale}/mpc8555cds/mpc8555cds.c | 0
.../mpc8541cds => freescale/mpc8555cds}/u-boot.lds | 4 +-
27 files changed, 9 insertions(+), 534 deletions(-)
delete mode 100644 board/cds/mpc8548cds/Makefile
delete mode 100644 board/cds/mpc8555cds/Makefile
delete mode 100644 board/cds/mpc8555cds/init.S
delete mode 100644 board/cds/mpc8555cds/u-boot.lds
rename board/{cds => freescale}/common/cadmus.c (100%)
rename board/{cds => freescale}/common/cadmus.h (100%)
rename board/{cds => freescale}/common/eeprom.c (100%)
rename board/{cds => freescale}/common/eeprom.h (100%)
rename board/{cds => freescale}/common/ft_board.c (100%)
rename board/{cds => freescale}/common/via.c (100%)
rename board/{cds => freescale}/common/via.h (100%)
copy board/{cds => freescale}/mpc8541cds/Makefile (100%)
rename board/{cds => freescale}/mpc8541cds/config.mk (100%)
copy board/{cds => freescale}/mpc8541cds/init.S (100%)
rename board/{cds => freescale}/mpc8541cds/mpc8541cds.c (100%)
copy board/{cds => freescale}/mpc8541cds/u-boot.lds (97%)
copy board/{cds/mpc8541cds => freescale/mpc8548cds}/Makefile (100%)
rename board/{cds => freescale}/mpc8548cds/config.mk (100%)
rename board/{cds => freescale}/mpc8548cds/init.S (100%)
rename board/{cds => freescale}/mpc8548cds/mpc8548cds.c (100%)
rename board/{cds => freescale}/mpc8548cds/u-boot.lds (97%)
rename board/{cds/mpc8541cds => freescale/mpc8555cds}/Makefile (100%)
rename board/{cds => freescale}/mpc8555cds/config.mk (100%)
rename board/{cds/mpc8541cds => freescale/mpc8555cds}/init.S (100%)
rename board/{cds => freescale}/mpc8555cds/mpc8555cds.c (100%)
rename board/{cds/mpc8541cds => freescale/mpc8555cds}/u-boot.lds (97%)
diff --git a/Makefile b/Makefile
index 92632b9..a0f35df 100644
--- a/Makefile
+++ b/Makefile
@@ -1945,7 +1945,7 @@ MPC8541CDS_config: unconfig
echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
echo "... legacy" ; \
fi
- @$(MKCONFIG) -a MPC8541CDS ppc mpc85xx mpc8541cds cds
+ @$(MKCONFIG) -a MPC8541CDS ppc mpc85xx mpc8541cds freescale
MPC8544DS_config: unconfig
@$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8544ds freescale
@@ -1958,7 +1958,7 @@ MPC8548CDS_config: unconfig
echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
echo "... legacy" ; \
fi
- @$(MKCONFIG) -a MPC8548CDS ppc mpc85xx mpc8548cds cds
+ @$(MKCONFIG) -a MPC8548CDS ppc mpc85xx mpc8548cds freescale
MPC8555CDS_legacy_config \
MPC8555CDS_config: unconfig
@@ -1968,7 +1968,7 @@ MPC8555CDS_config: unconfig
echo "#define CONFIG_LEGACY" >>$(obj)include/config.h ; \
echo "... legacy" ; \
fi
- @$(MKCONFIG) -a MPC8555CDS ppc mpc85xx mpc8555cds cds
+ @$(MKCONFIG) -a MPC8555CDS ppc mpc85xx mpc8555cds freescale
MPC8568MDS_config: unconfig
@$(MKCONFIG) $(@:_config=) ppc mpc85xx mpc8568mds freescale
[snip]
diff --git a/board/cds/mpc8541cds/u-boot.lds b/board/freescale/mpc8555cds/u-boot.lds
similarity index 97%
rename from board/cds/mpc8541cds/u-boot.lds
rename to board/freescale/mpc8555cds/u-boot.lds
index 7a5daef..df21ea8 100644
--- a/board/cds/mpc8541cds/u-boot.lds
+++ b/board/freescale/mpc8555cds/u-boot.lds
@@ -34,7 +34,7 @@ SECTIONS
.bootpg 0xFFFFF000 :
{
cpu/mpc85xx/start.o (.bootpg)
- board/cds/mpc8541cds/init.o (.bootpg)
+ board/freescale/mpc8555cds/init.o (.bootpg)
} = 0xffff
/* Read-only sections, merged into text segment: */
@@ -64,7 +64,7 @@ SECTIONS
.text :
{
cpu/mpc85xx/start.o (.text)
- board/cds/mpc8541cds/init.o (.text)
+ board/freescale/mpc8555cds/init.o (.text)
cpu/mpc85xx/traps.o (.text)
cpu/mpc85xx/interrupts.o (.text)
cpu/mpc85xx/cpu_init.o (.text)
--
1.5.3.4
next reply other threads:[~2007-11-29 16:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-29 16:57 Kumar Gala [this message]
2007-11-29 17:44 ` problem with git detecting proper renames Linus Torvalds
2007-11-29 19:06 ` Kumar Gala
2007-11-29 19:27 ` Linus Torvalds
2007-11-29 19:32 ` Kumar Gala
2007-11-29 20:27 ` Kumar Gala
2007-11-29 21:30 ` Fix a pathological case in " Linus Torvalds
2007-11-29 23:03 ` Linus Torvalds
2007-11-29 23:52 ` Jeff King
2007-11-30 0:41 ` Linus Torvalds
2007-11-30 0:48 ` Jeff King
2007-11-30 1:18 ` Kumar Gala
2007-11-30 0:40 ` Junio C Hamano
2007-11-30 0:21 ` problem with " Jakub Narebski
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=Pine.LNX.4.64.0711291050440.1711@blarg.am.freescale.net \
--to=galak@kernel.crashing.org \
--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 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).