From: Michael J Gruber <git@drmicha.warpmail.net>
To: Peter Krefting <peter@softwolves.pp.se>
Cc: Johannes Sixt <j6t@kdbg.org>, Git List <git@vger.kernel.org>
Subject: Re: Problems with filters and git status - reproduction steps
Date: Wed, 12 Aug 2009 10:55:04 +0200 [thread overview]
Message-ID: <4A828368.5010206@drmicha.warpmail.net> (raw)
In-Reply-To: <alpine.DEB.2.00.0908120856110.30907@ds9.cixit.se>
Peter Krefting venit, vidit, dixit 12.08.2009 10:36:
> ORIGINREPO=git://git.debian.org/users/peterk/gitfilterproblem.git
> DESTINATIONREPO=gitfilterproblem-testrepo
>
> # Set up repository
> echo -- Cloning
> git clone ${ORIGINREPO} ${DESTINATIONREPO}
> cd ${DESTINATIONREPO}
>
> # Status should be clean
> echo -- After cloning, status should be clean
> git status
>
> # Set up filter
> echo -- Set up filter, status should be clean
> ./reposetup.sh
> git status
I get "Changed but not updated" already here!
Also, what's your git version? There have been some fix-ups recently
regarding the interaction between filters/textconv and assumptions of
the code about dirtiness of the worktree.
>
> # Create tracking branch
> echo -- Create tracking branch for changed file, status should be clean
> git branch --track changed-text-files origin/changed-text-files
> git status
>
> # Merge the branch
> echo -- Merge the changes from the branch, now status gets unclean
> git merge changed-text-files
> echo
> git status
> git diff
Do you really want the date in the checked-in version of the file? I
would assume otherwise. Then your clean filter should really be the
smudge filter, and you would need a clean filter to go with it (remove
the date and restore the keyword).
Michael
next prev parent reply other threads:[~2009-08-12 8:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-09 19:37 Implementing $Date$ substitution - problem with git status Peter Krefting
2009-08-09 20:52 ` Johannes Sixt
2009-08-10 4:41 ` Peter Krefting
2009-08-12 6:54 ` Peter Krefting
2009-08-12 8:36 ` Problems with filters and git status - reproduction steps Peter Krefting
2009-08-12 8:55 ` Michael J Gruber [this message]
2009-08-12 9:25 ` Peter Krefting
2009-08-13 6:47 ` Implementing $Date$ substitution - solution using pre-commit Peter Krefting
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=4A828368.5010206@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=peter@softwolves.pp.se \
/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