I am responsible for generating a list of all files changed between two
successive releases of software. I was using 'git diff' but have run into a
problem.
Consider the following situation: A development branch comes off of commit A
and files are changed three times. A tag (REL1) is placed on the third
commit. Then the branch is merged back to master. At this point, master's
HEAD is at C (and it remains there). Two development branches are created
off of master, the first of which is not important here. In the second one,
there are files changed and a tag (REL2) applied.
---------------------[I]
/ {dev branch}
/
/
{master branch}
/
[A] ---------------------------------[B]------------------------------->[C]
master <HEAD>
\ filelist 6 / \
\ /
\
\ /
\
\ /
\
\ {development branch} /
\
\------->[D]----------------------->[E]-------------------[F]
\------[G]--------[H]
REL1
REL2
fileset 1 fileset 2 fileset 3
fileset 4 fileset 5
At this point, I run
'git diff -m --first-parent --pretty=fuller --decorate=short
--name-only REL2..REL2'
I expect to see only filesets 4 and 5 listed. I also see filesets 1, 2 and
3 showing up. This means that the git diff command is showing files that,in
fact, did not change between the two tags. By the way, I verified with a
file by file comparison that under REL2 and REL1, the files represented by
filesets 1, 2 and 3 had identical contents.
Is there a way around this behavior?
(Note: view the diagram in monospace case such as Courier)
Thanks,
Jack McRoberts
Configuration Management Software Specialist
General Atomics EMS Group
Work Phone: 858-522-8342
16969 Mesamint St, Room 86-1023G,
San Diego, CA 92127
************************************************************************
CONFIDENTIALITY NOTICE: This communication is intended to be confidential to
the
person(s) to whom it is addressed. If you are not the intended recipient or
the agent of the
intended recipient or if you are unable to deliver this communication to the
intended
recipient, you must not read, use or disseminate this information. If you
have received this
communication in error, please advise the sender immediately by telephone
and delete
this message and any attachments without retaining a copy.
**************************************************************************
<<attachment: smime.p7s>>
