On 3/14/2011 8:32 PM, Jeff King wrote:
On Mon, Mar 14, 2011 at 03:29:51PM -0500, Neal Kreitzinger wrote:
Is there a way to only reset the file permissions of the
working-tree to match HEAD file permissions without resetting the
content of the files?
Not directly, but you could munge a patch to do so and apply it in
reverse. For example:
git diff "$@" | perl -ne ' if (/^diff/) { $diff = $_ } elsif (/^old
mode/) { print $diff, $_ } elsif (/^new mode/) { print $_ } ' | git
apply -R
Which seems a little more complicated than it needs to be, but we
don't (AFAIK) have a way to say "show me only the mode changes from
this diff in an applicable form". The closest would be "git diff
--summary", but you cannot directly apply it (and I would hesitate to
recommend parsing it).
You could also use "git checkout -p", which is designed for exactly
this sort of picking-apart of a patch, but it has no way to specify
"say yes to all of the mode changes, no to everything else"; you have
to manually approve each hunk. Which doesn't work if you have a lot
of these files.
I guess for mode changes, you don't care if you chmod something that
is already fine. So yet another way to do it would be:
git ls-files -sz | perl -0ne ' /100(\d+).*?\t(.*)/ or next; -e $2 or
next; chmod(oct($1), $2) or die "chmod failed: $!"; '
You are right about git checkout -p because there are alot of code
changes to alot of files. I haven't used git patches and I don't know
perl. However, your reasoning about the last example seems the most
straight-forward so I used it. I symptomatically validated my re-keying
of the syntax as follows since TTBOMK I couldn't copy+paste your example
due to whitespace:
git ls-files -sz | perl -0ne '/100(\d+).*?\t(.*)/
or next; -e $2 or next; chmod(oct($1), $2) or die "chmod failed: $!";'
(0) repo contains bad modes in working tree only.
(1) make a copy of the repo (cp -rp repo repoX)
(2) add and commit (via superuser and git-commit --no-verify) the "bad"
modes.
(3) make another copy of the repo (repoY)
(4) run your perl script on repoY working-tree
(5) git diff | grep "old mode" (shows no occurences)
(6) commit "good" modes.
(7) make repox "bad" modes branch a remote of repoy and fetched the bad
modes commit (git remote add -t bad-mode-branch repo-X /opt/me/repoX).
(8) diffed the bad modes commit vs the good modes commit and saw that
only the modes differed.
Thanks!
v/r,
neal
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html