* Re: [PATCH] gitignore: warn about pointless syntax
From: Jeff King @ 2012-01-09 22:33 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Jan Engelhardt, git, trast
In-Reply-To: <7vhb04ek6e.fsf@alter.siamese.dyndns.org>
On Mon, Jan 09, 2012 at 11:43:21AM -0800, Junio C Hamano wrote:
> >> +static inline void check_bogus_wildcard(const char *file, const char *p)
> >> +{
> >> + if (strstr(p, "**") == NULL)
> >> + return;
> >> + warning(_("Pattern \"%s\" from file \"%s\": Double asterisk does not "
> >> + "have a special meaning and is interpreted just like a single "
> >> + "asterisk.\n"), file, p);
> >
> > Wouldn't this also match the meaningful "foo\**"?
>
> Yes.
>
> But trying to catch that false positive by checking one before "**"
> against a backslash is not a way to do so as it will then turn "foo\\**"
> into a false negative, and you would end up reimplementing fnmatch if you
> really want to avoid false positives nor negatives. At that point, you may
> be better off implementing git_fnmatch() instead that understands the
> double-asterisk that works as some people may expect it to work ;-).
You only have to implement proper backslash decoding, so I think it is
not as hard as reimplementing fnmatch:
enum { NORMAL, QUOTED, WILDCARD } context = NORMAL;
for (i = 0; p[i]; i++) {
if (context == QUOTED)
context = NORMAL;
else if (p[i] == '\\')
context = QUOTED;
else if (p[i] == '*') {
if (context == WILDCARD) {
warning(...);
return;
}
context = WILDCARD;
}
else
context = NORMAL;
}
That being said, if this is such a commonly-requested feature that we
need to be detecting and complaining about its absence, I would be much
more in favor of simply implementing it. Surely fnmatch is not that hard
to write, or we could lift code from glibc or even rsync.
Which perhaps was what you are getting at, but I am happy to say it more
explicitly. :)
-Peff
^ permalink raw reply
* Re: [PATCH v2 2/3] index-pack: eliminate recursion in find_unresolved_deltas
From: Junio C Hamano @ 2012-01-09 22:10 UTC (permalink / raw)
To: Nguyễn Thái Ngọc Duy; +Cc: git, Shawn O. Pearce
In-Reply-To: <1326081546-29320-3-git-send-email-pclouds@gmail.com>
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
I find both the original and the updated code rather dense to read without
annotation, but from a cursory look all changes look good.
Thanks.
^ permalink raw reply
* Re: [PATCH v2 1/3] Eliminate recursion in setting/clearing marks in commit list
From: Junio C Hamano @ 2012-01-09 22:09 UTC (permalink / raw)
To: Nguyễn Thái Ngọc Duy; +Cc: git, Shawn O. Pearce
In-Reply-To: <1326081546-29320-2-git-send-email-pclouds@gmail.com>
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
> Recursion in a DAG is generally a bad idea because it could be very
> deep. Be defensive and avoid recursion in mark_parents_uninteresting()
> and clear_commit_marks().
>
> mark_parents_uninteresting() learns a trick from clear_commit_marks()
> to avoid malloc() in (dorminant) single-parent case.
Looks cleanly done.
This retains the depth-firstness of the (supposedly less common case)
recursion in mark_parents_uninteresting() from the original code, by
adding the already parsed parent at the beginning of the queue. I suspect
that the original went depth-first primarily because that was the most
straightforward way to code it, but now you have more flexibility, I
wonder if there is a difference if we made it width-first, and if so, if
the difference is positive or detrimental.
Thanks.
^ permalink raw reply
* Re: [PATCH/RFC] gitweb: Fix actionless dispatch for non-existent objects
From: Jakub Narebski @ 2012-01-09 22:05 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7v8vlgef7o.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> Jakub Narebski <jnareb@gmail.com> writes:
>
> > When gitweb URL does not provide action explicitly, e.g.
> >
> > http://git.example.org/repo.git/branch
> >
> > dispatch() tries to guess action (view to be used) based on remaining
> > parameters. Among others it is based on the type of requested object,
> > which gave problems when asking for non-existent branch or file (for
> > example misspelt name)
, because git_get_type() returns undef when
requested object does not exist, and $action was left undefined.
This resulted in Perl generating the "Use of unitialized value" warnings,
which made it in error.log. Additionally gitweb returned "400 Bad Request"
error instead of more informative "404 Not Found".
>
> Ok. "gave problems" is a bit unclear to see why explicitly calling
> die_error() is an improvement, though. What is the nature of the
> "problems"? Giving a server error 500 because later codepaths tried to
> call an undefined subroutine?
>
> > Now undefined $action from dispatch() should not result in problems.
>
> Again, unspecified "problems" here. I'd like this sentence to end with
> "should not result in X but gives an explicit '404 not found' error".
This is about second chunk of change to gitweb/gitweb.perl, which is
responsible about silencing this warning:
gitweb.perl: Use of uninitialized value in pattern match (m//) at ../gitweb.perl line 2397.
It was present even with the '$action or die_error(404,...)' short-circut,
as this was in the part responsible for generating page header, which is
the same for normal page and for error page.
Perhaps better solution would be to set action to 'object' if requested
object is not found (a valid action in itself). Hmmm...
--
Jakub Narebski
Poland
^ permalink raw reply
* Re: [PATCH/RFC] gitweb: Fix actionless dispatch for non-existent objects
From: Junio C Hamano @ 2012-01-09 21:30 UTC (permalink / raw)
To: Jakub Narebski; +Cc: git
In-Reply-To: <20120107104552.26867.41282.stgit@localhost.localdomain>
Jakub Narebski <jnareb@gmail.com> writes:
> When gitweb URL does not provide action explicitly, e.g.
>
> http://git.example.org/repo.git/branch
>
> dispatch() tries to guess action (view to be used) based on remaining
> parameters. Among others it is based on the type of requested object,
> which gave problems when asking for non-existent branch or file (for
> example misspelt name).
Ok. "gave problems" is a bit unclear to see why explicitly calling
die_error() is an improvement, though. What is the nature of the
"problems"? Giving a server error 500 because later codepaths tried to
call an undefined subroutine?
> Now undefined $action from dispatch() should not result in problems.
Again, unspecified "problems" here. I'd like this sentence to end with
"should not result in X but gives an explicit '404 not found' error".
Thanks.
^ permalink raw reply
* Re: [PATCH][RFC] git on Mac OS and precomposed unicode
From: Torsten Bögershausen @ 2012-01-09 20:47 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Torsten Bögershausen, git
In-Reply-To: <7vty44eksp.fsf@alter.siamese.dyndns.org>
On 01/09/2012 08:29 PM, Junio C Hamano wrote:
> Torsten Bögershausen<tboegi@web.de> writes:
>
>> On 08.01.12 03:46, Junio C Hamano wrote:
>> ...
>>> That also sounds sensible, but...
>>>
>>>> This is done in git.c by calling argv_precompose() for all commands
>>>> except "git commit".
>>>
>>> ... I think it generally is a bad idea to say "all except foo". There may
>>> be a reason why "foo" happens to be special in today's code, but who says
>>> there won't be another command "bar" that shares the same reason with
>>> "foo" to be treated specially? Or depending on the options, perhaps some
>>> codepath of "foo" may not want the special casing and want to go through
>>> the argv_precompose(), no?
>>>
>>> After all, "git commit -- pathspec" will have to get the pathspec from the
>>> command line,...
>>
>> Thanks Junio for catching this.
>> I added a new test case as well as fixed the code.
>
> I think you are sidestepping the real issue I raised, which is:
>
> What is the reason why you do not want to feed the precompose helper
> with some arguments to 'git commit', while it is OK to pass all
> arguments to other commands through precomposition?
>
> I admit it was my fault that I did not spell it out clearly in my
> response.
>
> I understand that arguments other than pathspec and revs could be left in
> decomposed form, but is there any harm in canonicalizing any and all
> command line parameters given in decomposed form consistently into
> precomposed form? What problem are you trying to solve by special casing
> "git commit"? That is the real question to be answered, as there may be
> other commands some of whose arguments may not want to be canonicalized
> due to the same reason, but you simply overlooked them. When other people
> need to fix that oversight, they need a clearly written criterion what
> kind of arguments should not be fixed and why.
>
> And the reason cannot be a desire to pass the value to "--message"
> argument intact [*1*]; it is not like osx cannot handle text in
> precomposed form, right?
The short answer for treating "git commit" special:
The test suite didn't pass any more. (t4201-shortlog.sh)
This seems more and more to be a bad excuse...
The long answer:
I have to look into that more deeply.
Thanks for your replies.
/Torsten
(And yes, Mac OS can handle precomposed unicode (at least the
western european code points))
[snip]
^ permalink raw reply
* Re: Please support add -p with a new file, to add only part of the file
From: Jonathan Nieder @ 2012-01-09 20:47 UTC (permalink / raw)
To: Josh Triplett; +Cc: git, Wincent Colaiuta, Thomas Rast, Jeff King
In-Reply-To: <20120109105134.1239.39047.reportbug@leaf>
(+cc: Wincent who brought us the "add -p" shortcut --- thanks!; Thomas,
who expanded its scope to git checkout et al; and Jeff, who has done
some hacking on it)
Hi Josh,
Josh Triplett wrote:
> I recently found myself with a new file that I needed to check in part
> of with several commits. I wanted to use "git add -p newfile" and use
> 'e' to add and commit several times (along with corresponding bits in
> existing files). However, "git add -p" does not work on a new file,
> only an existing file.
Yep. A workaround is to use "git add -N newfile" before running
"git add -p newfile".
I imagine "git add -p '*.c'" should also offer to add hunks from
source files that git doesn't know about yet, too.
Here's a quick demo (untested) that might _almost_ do the right thing.
Unfortunately it leaves intent-to-add entries around even for files
the operator rejects. Anyway, maybe it can be a good starting point
for playing around.
Hope that helps,
Jonathan
git-add--interactive.perl | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 8f0839d2..6e99ff1b 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -1619,6 +1619,10 @@ sub main_loop {
process_args();
refresh();
if ($patch_mode) {
+ if ($patch_mode eq 'stage') {
+ # NEEDSWORK: should use "git update-index --intent-to-add"
+ system(qw(git add --intent-to-add --), @ARGV);
+ }
patch_update_cmd();
}
else {
--
1.7.8.2
^ permalink raw reply related
* Re: [PATCH] rebase --fix: interactive fixup mode
From: Clemens Buchacher @ 2012-01-09 20:33 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <7vfwfpg5st.fsf@alter.siamese.dyndns.org>
On Sun, Jan 08, 2012 at 02:58:42PM -0800, Junio C Hamano wrote:
> Clemens Buchacher <drizzd@aon.at> writes:
> >
> > In order to determine a suitable range automatically, it is a reasonable
> > heuristic to rebase onto the most recent merge commit.
>
> I understand the problem you are trying to solve, but I am not sure if
> this is a good idea from the UI point of view for two reasons.
>
> - "We want to limit the extent of the operation to commits since the last
> merge" is by itself a reasonable thing to ask, and I do not think it
> should be limited to "rebase". If we had an extended SHA-1 syntax to
> express it, for example, you may want to say "I want to see what I did
> since the last merge" and run "git log $last_merge_before_HEAD..".
> Perhaps HEAD~{merge} or something?
Ok, sounds reasonable.
I am not sure what to do if the history has no merges, though. If it's
just rev-parse HEAD~{merge} I suppose I could return nothing, or an
error. But what about the HEAD~{merge}..HEAD range? I think it would be
useful if that were not an error but the entire history.
> - If your "rebase --fix" is to "fix" things, what is "rebase -i" about?
I would have suggested this to be the default behavior for rebase -i
without an <upstream> argument, but unfortunately we already handle this
case using @{upstream}.
^ permalink raw reply
* Re: [PATCH] rebase --fix: interactive fixup mode
From: Clemens Buchacher @ 2012-01-09 20:16 UTC (permalink / raw)
To: Thomas Rast; +Cc: git, Junio C Hamano
In-Reply-To: <878vlh1bnm.fsf@thomas.inf.ethz.ch>
On Mon, Jan 09, 2012 at 10:13:33AM +0100, Thomas Rast wrote:
>
> Given the name I would expect --fix to rebase far enough to make recent
> fixup!/squash! commits take effect. Perhaps name it --recent?
Sure, I am not particular about the name.
> (And I also think that the 20 is rather arbitrary...)
Well, I need some kind of limit. Otherwise we will list the entire
history up to the root commit in case of repos with only linear history.
And that can be rather slow.
Clemens
^ permalink raw reply
* Re: [RFC][PATCH v2] git on Mac OS and precomposed unicode
From: Junio C Hamano @ 2012-01-09 19:52 UTC (permalink / raw)
To: Torsten Bögershausen; +Cc: git
In-Reply-To: <201201091745.30415.tboegi@web.de>
Torsten Bögershausen <tboegi@web.de> writes:
> diff --git a/builtin/init-db.c b/builtin/init-db.c
> index 0dacb8b..88c9de1 100644
> --- a/builtin/init-db.c
> +++ b/builtin/init-db.c
> @@ -290,6 +290,28 @@ static int create_default_files(const char *template_path)
> strcpy(path + len, "CoNfIg");
> if (!access(path, F_OK))
> git_config_set("core.ignorecase", "true");
> +#if defined (PRECOMPOSED_UNICODE)
> + {
> +...
> +#endif
I'd prefer just a single, unconditional call here:
probe_utf8_pathname_composition(path, len);
with something like this at the top of the file:
#ifndef PRECOMPOSED_UNICODE
#define probe_utf8_pathname_composition(a,b) /* nothing */
#else
void probe_utf8_pathname_composition(char *, int);
#endif
and implementation of the function body in compat/darwin.c (Didn't I see a
comment on the name of this file, by the way? What was the conclusion of
the discussion?).
> +void
> +argv_precompose(int argc, const char **argv)
Style.
> +{
> + int i = 0;
> + int first_arg = 0; /* convert everything */
> + const char *oldarg;
> + char *newarg;
> + iconv_t ic_precompose;
> +
> + git_config(precomposed_unicode_config, NULL);
Hmmmmm. Is it safe to call git_config() this early in the program? Have
we determined if we are in a git managed repository and where its $GIT_DIR
is?
^ permalink raw reply
* Re: [PATCH] gitignore: warn about pointless syntax
From: Junio C Hamano @ 2012-01-09 19:43 UTC (permalink / raw)
To: Jeff King; +Cc: Jan Engelhardt, git, trast
In-Reply-To: <20120109162802.GA2374@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
> On Mon, Jan 09, 2012 at 04:40:47PM +0100, Jan Engelhardt wrote:
>
>> +static inline void check_bogus_wildcard(const char *file, const char *p)
>> +{
>> + if (strstr(p, "**") == NULL)
>> + return;
>> + warning(_("Pattern \"%s\" from file \"%s\": Double asterisk does not "
>> + "have a special meaning and is interpreted just like a single "
>> + "asterisk.\n"), file, p);
>
> Wouldn't this also match the meaningful "foo\**"?
Yes.
But trying to catch that false positive by checking one before "**"
against a backslash is not a way to do so as it will then turn "foo\\**"
into a false negative, and you would end up reimplementing fnmatch if you
really want to avoid false positives nor negatives. At that point, you may
be better off implementing git_fnmatch() instead that understands the
double-asterisk that works as some people may expect it to work ;-).
^ permalink raw reply
* Re: [PATCH v2 0/3] nd/index-pack-no-recurse
From: Junio C Hamano @ 2012-01-09 19:30 UTC (permalink / raw)
To: Nguyễn Thái Ngọc Duy; +Cc: git, Shawn O. Pearce
In-Reply-To: <1326081546-29320-1-git-send-email-pclouds@gmail.com>
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
> Resend to incorporate the fixup commit from pu, no other changes.
>
> Nguyễn Thái Ngọc Duy (3):
> Eliminate recursion in setting/clearing marks in commit list
> index-pack: eliminate recursion in find_unresolved_deltas
> index-pack: eliminate unlimited recursion in get_delta_base()
>
> builtin/index-pack.c | 141 ++++++++++++++++++++++++++++++++------------------
> commit.c | 13 ++++-
> revision.c | 45 ++++++++++------
> 3 files changed, 131 insertions(+), 68 deletions(-)
Thanks.
^ permalink raw reply
* Re: [PATCH][RFC] git on Mac OS and precomposed unicode
From: Junio C Hamano @ 2012-01-09 19:29 UTC (permalink / raw)
To: Torsten Bögershausen; +Cc: git
In-Reply-To: <4F0B196B.8010904@web.de>
Torsten Bögershausen <tboegi@web.de> writes:
> On 08.01.12 03:46, Junio C Hamano wrote:
> ...
>> That also sounds sensible, but...
>>
>>> This is done in git.c by calling argv_precompose() for all commands
>>> except "git commit".
>>
>> ... I think it generally is a bad idea to say "all except foo". There may
>> be a reason why "foo" happens to be special in today's code, but who says
>> there won't be another command "bar" that shares the same reason with
>> "foo" to be treated specially? Or depending on the options, perhaps some
>> codepath of "foo" may not want the special casing and want to go through
>> the argv_precompose(), no?
>>
>> After all, "git commit -- pathspec" will have to get the pathspec from the
>> command line,...
>
> Thanks Junio for catching this.
> I added a new test case as well as fixed the code.
I think you are sidestepping the real issue I raised, which is:
What is the reason why you do not want to feed the precompose helper
with some arguments to 'git commit', while it is OK to pass all
arguments to other commands through precomposition?
I admit it was my fault that I did not spell it out clearly in my
response.
I understand that arguments other than pathspec and revs could be left in
decomposed form, but is there any harm in canonicalizing any and all
command line parameters given in decomposed form consistently into
precomposed form? What problem are you trying to solve by special casing
"git commit"? That is the real question to be answered, as there may be
other commands some of whose arguments may not want to be canonicalized
due to the same reason, but you simply overlooked them. When other people
need to fix that oversight, they need a clearly written criterion what
kind of arguments should not be fixed and why.
And the reason cannot be a desire to pass the value to "--message"
argument intact [*1*]; it is not like osx cannot handle text in
precomposed form, right?
In general, I do not want to see ugly code that says "this one potentially
names a path so we add a call to fix it from decomposed form, but that
other one is not a path and we take it intact" sprinkled all over in the
codebase, without a good reason.
It may seem that one alternative to munging argv[] is to have the
precomposition [*2*] applied inside get_pathspec() and have it take effect
only on the pathspecs, which after all ought to be the only place where
this matters, but I doubt it would result in maintainable code. The names
of branches and tags taken from the command line that are used as revision
names will also be compared with results from readdir in $GIT_DIR/refs/
and need to be canonicalized, for example. So I tend to agree with your
"brute force" approach to canonicalize argv[] before any real part of git
sees them; that is where my suggestion to wrap main() to do so came from.
Also some commands (e.g. "rev-list --stdin") take pathspecs and revs from
their standard input stream, so you would need to be careful about them.
[Footnotes]
*1* Also as other commands like "git merge" also take textual message, and
you do pass the helper to canonicalize it. No, I am not suggesting you to
special case "git merge".
*2* By the way, this may need a better name if the patch touches anywhere
outside compat/osx --- it is about "canonicalize pathname and pathspec
given from the command line into the form used internally by git", and
from an osx person's point of view, the only difference might be
decomposed vs precomposed, but on other odd systems it might be that
pathnames on the filesystem may be using a different encoding from what is
used for pathnames in the index).
^ permalink raw reply
* git-send-email: bug with sendemail.multiedit
From: Jean-Francois Dagenais @ 2012-01-09 19:09 UTC (permalink / raw)
To: Pierre Habouzit, pierre.habouzit; +Cc: git
Bonjour Pierre! ... and all git developers!
I think there is a bug with git-send-email.perl's evaluation of the sendemail.multiedit config variable.
I was only able to make the "do_edit()" function detect it as false by setting the variable to "0" instead
of "false", like so:
git config --global sendemail.multiedit 0
otherwise do_edit evaluates it as true and invokes the editor with all files as argument.
All other git config boolean variables are set to either "true" or "false", not "0" or "1".
Not being too familiar with the perl language, I don't know how to fix this without spending an hour, which
is probably the amount of time I already spent narrowing the problem down already. So I leave this into
more capable hands.
cheers.
^ permalink raw reply
* git grep doesn't follow symbolic link
From: Bertrand BENOIT @ 2012-01-09 16:54 UTC (permalink / raw)
To: git
Hi,
I've not found information about that in documentation, so I do a report.
When using git grep, symbolic links are not followed.
Is it a wanted behavior ?
I've tested with a symbolic link:
- 'ignored'
- NOT staged for commit
- to be commited
- commited
Anytime -> no result when asking on symbolic link
Example:
# git grep foo mySrc
-> OK answer [...]
# ln -s mySrc test
# git grep foo test
-> KO: No answer
# git add test
# git grep foo test
-> KO: No answer
# git commit -m "DO NOT PUSH" test
# git grep foo test
-> KO: No answer
Best Regards,
Bertrand
^ permalink raw reply
* Re: [PATCH][RFC] git on Mac OS and precomposed unicode
From: Torsten Bögershausen @ 2012-01-09 16:44 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Torsten Bögershausen
In-Reply-To: <7vboqehpxm.fsf@alter.siamese.dyndns.org>
On 08.01.12 03:46, Junio C Hamano wrote:
> Torsten Bögershausen <tboegi@web.de> writes:
>
>> Implementation:
>> Two files are added to the "compat" directory, darwin.h and darwin.c.
>> They implement basically 3 new functions:
>> darwin_opendir(), darwin_readdir() and darwin_closedir().
>
> I haven't looked at the patch yet but that sounds exactly the right way to
> go about this. Nice.
>
>> No decomposed file names in a git repository:
>> In order to prevent that ever a file name in decomposed unicode is entering
>> the index, a "brute force" attempt is taken:
>> all arguments into git (technically argv[1]..argv[n]) are converted into
>> precomposed unicode.
>
> That also sounds sensible, but...
>
>> This is done in git.c by calling argv_precompose() for all commands
>> except "git commit".
>
> ... I think it generally is a bad idea to say "all except foo". There may
> be a reason why "foo" happens to be special in today's code, but who says
> there won't be another command "bar" that shares the same reason with
> "foo" to be treated specially? Or depending on the options, perhaps some
> codepath of "foo" may not want the special casing and want to go through
> the argv_precompose(), no?
>
> After all, "git commit -- pathspec" will have to get the pathspec from the
> command line, and match them against the paths in the index, the latter of
> which you are keeping in the canonical form, so you would want the argv[]
> also be in the same form, and applying your argv_precompose() would be a
> sensible way to do so, no?
Thanks Junio for catching this.
I added a new test case as well as fixed the code.
> I would also suspect that the cleanest way to implement it is to replace
> the main() entry point (see how compat/mingw.h does this).
We only need to that argv conversion in git.c, (and not in daemon.c), so I sticked
to the old model for V1.
I send a new patch soon
/Torsten
^ permalink raw reply
* Re: [PATCH][RFC] git on Mac OS and precomposed unicode
From: Torsten Bögershausen @ 2012-01-09 16:42 UTC (permalink / raw)
To: Miles Bader; +Cc: git
In-Reply-To: <87vcomravs.fsf@catnip.gol.com>
On 08.01.12 07:01, Miles Bader wrote:
> BTW, about the names, e.g. "darwin.c" etc -- is this code actually
> Darwin-specific, or simply Systems-that-happen-to-force-decomposed-
> unicode specific?
>
> If the latter, maybe more generic names might be better.
>
> Thanks,
>
> -Miles
>
As far as I know, Mac OS (darwin) is the only existing OS which likes
decomposed unicode so much, that forces decomposed unicode that way.
/Torsten
^ permalink raw reply
* [RFC][PATCH v2] git on Mac OS and precomposed unicode
From: Torsten Bögershausen @ 2012-01-09 16:45 UTC (permalink / raw)
To: git; +Cc: tboegi
Allow git on Mac OS to store file names in the index in precomposed unicode,
while the file system used decomposed unicode.
When a file called "LATIN CAPITAL LETTER A WITH DIAERESIS"
(in utf-8 encoded as 0xc3 0x84) is created,
the filesystem converts "precomposed unicode" into "decomposed unicode",
which means that readdir() will return 0x41 0xcc 0x88.
When true, git reverts the unicode decomposition of filenames.
This is useful when pulling/pushing from repositories containing utf-8
encoded filenames using precomposed utf-8 (like Linux).
This feature is automatically switched on when "git init" is run,
and the file system is doing UTF-8 decompostion.
(Which has been observed on HFS+, SMBFS and VFAT, but not on NFS)
It can be switched off by setting core.macosforcenfc=false
It is implemented by re-defining the readdir() functions.
File names are converted into precomposed UTF-8.
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
---
Documentation/config.txt | 9 ++
Makefile | 3 +
builtin/init-db.c | 22 +++++
compat/darwin.c | 208 ++++++++++++++++++++++++++++++++++++++++++
compat/darwin.h | 31 ++++++
git-compat-util.h | 8 ++
git.c | 1 +
t/t0050-filesystem.sh | 1 +
t/t3910-mac-os-precompose.sh | 117 +++++++++++++++++++++++
9 files changed, 400 insertions(+), 0 deletions(-)
create mode 100644 compat/darwin.c
create mode 100644 compat/darwin.h
create mode 100755 t/t3910-mac-os-precompose.sh
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2959390..01b9465 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -175,6 +175,15 @@ The default is false, except linkgit:git-clone[1] or linkgit:git-init[1]
will probe and set core.ignorecase true if appropriate when the repository
is created.
+core.precomposedunicode::
+ This option is only used by Mac OS implementation of git.
+ When core.precomposedunicode=true,
+ git reverts the unicode decomposition of filenames done by Mac OS.
+ This is useful when pulling/pushing from repositories containing utf-8
+ encoded filenames using precomposed unicode (like Linux).
+ When false, file names are handled fully transparent by git.
+ If in doubt, set core.precomposedunicode=false.
+
core.trustctime::
If false, the ctime differences between the index and the
working tree are ignored; useful when the inode change time
diff --git a/Makefile b/Makefile
index b21d2f1..596900e 100644
--- a/Makefile
+++ b/Makefile
@@ -519,6 +519,7 @@ LIB_H += compat/bswap.h
LIB_H += compat/cygwin.h
LIB_H += compat/mingw.h
LIB_H += compat/obstack.h
+LIB_H += compat/darwin.h
LIB_H += compat/win32/pthread.h
LIB_H += compat/win32/syslog.h
LIB_H += compat/win32/poll.h
@@ -884,6 +885,8 @@ ifeq ($(uname_S),Darwin)
endif
NO_MEMMEM = YesPlease
USE_ST_TIMESPEC = YesPlease
+ COMPAT_OBJS += compat/darwin.o
+ BASIC_CFLAGS += -DPRECOMPOSED_UNICODE
endif
ifeq ($(uname_S),SunOS)
NEEDS_SOCKET = YesPlease
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 0dacb8b..88c9de1 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -290,6 +290,28 @@ static int create_default_files(const char *template_path)
strcpy(path + len, "CoNfIg");
if (!access(path, F_OK))
git_config_set("core.ignorecase", "true");
+#if defined (PRECOMPOSED_UNICODE)
+ {
+ const static char *auml_nfc = "\xc3\xa4";
+ const static char *auml_nfd = "\x61\xcc\x88";
+ int output_fd;
+ path[len] = 0;
+ strcpy(path + len, auml_nfc);
+ output_fd = open(path, O_CREAT|O_EXCL|O_RDWR, 0600);
+ if (output_fd >=0) {
+ close(output_fd);
+ path[len] = 0;
+ strcpy(path + len, auml_nfd);
+ if (0 == access(path, R_OK))
+ git_config_set("core.precomposedunicode", "true");
+ else
+ git_config_set("core.precomposedunicode", "false");
+ path[len] = 0;
+ strcpy(path + len, auml_nfc);
+ unlink(path);
+ }
+ }
+#endif
}
return reinit;
diff --git a/compat/darwin.c b/compat/darwin.c
new file mode 100644
index 0000000..6cf73ca
--- /dev/null
+++ b/compat/darwin.c
@@ -0,0 +1,208 @@
+#define __DARWIN_C__
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdint.h>
+
+#include "../cache.h"
+#include "../utf8.h"
+
+#include "darwin.h"
+
+static int mac_os_precomposed_unicode;
+const static char *repo_encoding = "UTF-8";
+const static char *path_encoding = "UTF-8-MAC";
+
+
+/* Code borrowed from utf8.c */
+#if defined(OLD_ICONV) || (defined(__sun__) && !defined(_XPG6))
+ typedef const char * iconv_ibp;
+#else
+ typedef char * iconv_ibp;
+#endif
+static char *reencode_string_iconv(const char *in, size_t insz, iconv_t conv)
+{
+ size_t outsz, outalloc;
+ char *out, *outpos;
+ iconv_ibp cp;
+
+ outsz = insz;
+ outalloc = outsz + 1; /* for terminating NUL */
+ out = xmalloc(outalloc);
+ outpos = out;
+ cp = (iconv_ibp)in;
+
+ while (1) {
+ size_t cnt = iconv(conv, &cp, &insz, &outpos, &outsz);
+
+ if (cnt == -1) {
+ size_t sofar;
+ if (errno != E2BIG) {
+ free(out);
+ iconv_close(conv);
+ return NULL;
+ }
+ /* insz has remaining number of bytes.
+ * since we started outsz the same as insz,
+ * it is likely that insz is not enough for
+ * converting the rest.
+ */
+ sofar = outpos - out;
+ outalloc = sofar + insz * 2 + 32;
+ out = xrealloc(out, outalloc);
+ outpos = out + sofar;
+ outsz = outalloc - sofar - 1;
+ }
+ else {
+ *outpos = '\0';
+ break;
+ }
+ }
+ return out;
+}
+
+static size_t
+has_utf8(const char *s, size_t maxlen, size_t *strlen_c)
+{
+ const uint8_t *utf8p = (const uint8_t*) s;
+ size_t strlen_chars = 0;
+ size_t ret = 0;
+
+ if ((!utf8p) || (!*utf8p))
+ return 0;
+
+ while((*utf8p) && maxlen) {
+ if (*utf8p & 0x80)
+ ret++;
+ strlen_chars++;
+ utf8p++;
+ maxlen--;
+ }
+ if (strlen_c)
+ *strlen_c = strlen_chars;
+
+ return ret;
+}
+
+static int
+precomposed_unicode_config(const char *var, const char *value, void *cb)
+{
+ if (!strcasecmp(var, "core.precomposedunicode")) {
+ mac_os_precomposed_unicode = git_config_bool(var, value);
+ return 0;
+ }
+ return 1;
+}
+
+void
+argv_precompose(int argc, const char **argv)
+{
+ int i = 0;
+ int first_arg = 0; /* convert everything */
+ const char *oldarg;
+ char *newarg;
+ iconv_t ic_precompose;
+
+ git_config(precomposed_unicode_config, NULL);
+ if (!mac_os_precomposed_unicode)
+ return;
+
+ ic_precompose = iconv_open(repo_encoding, path_encoding);
+ if (ic_precompose == (iconv_t) -1)
+ return;
+
+ if (!strcmp("commit", argv[0])) {
+ first_arg = argc; /* default: convert nothing */
+
+ for (i = 0; i < argc; i++) {
+ if (!strcmp(argv[i], "--")) {
+ first_arg = i + 1; /* convert args after "--" */
+ i = argc;
+ break;
+ }
+ }
+ i = first_arg;
+ }
+ while (i < argc) {
+ size_t namelen;
+ oldarg = argv[i];
+ if (has_utf8(oldarg, (size_t)-1, &namelen)) {
+ newarg = reencode_string_iconv(oldarg, namelen, ic_precompose);
+ if (newarg)
+ argv[i] = newarg;
+ }
+ i++;
+ }
+ iconv_close(ic_precompose);
+}
+
+
+DARWIN_DIR *
+darwin_opendir(const char *dirname)
+{
+ DARWIN_DIR *darwin_dir;
+ darwin_dir = malloc(sizeof(DARWIN_DIR));
+ if (!darwin_dir)
+ return NULL;
+
+ darwin_dir->dirp = opendir(dirname);
+ if (!darwin_dir->dirp) {
+ free(darwin_dir);
+ return NULL;
+ }
+ darwin_dir->ic_precompose = iconv_open(repo_encoding, path_encoding);
+ if (darwin_dir->ic_precompose == (iconv_t) -1) {
+ closedir(darwin_dir->dirp);
+ free(darwin_dir);
+ return NULL;
+ }
+
+ return darwin_dir;
+}
+
+struct dirent *
+darwin_readdir(DARWIN_DIR *darwin_dirp)
+{
+ struct dirent *res;
+ size_t namelen = 0;
+
+ res = readdir(darwin_dirp->dirp);
+ if (!res || !mac_os_precomposed_unicode || !has_utf8(res->d_name, (size_t)-1, &namelen))
+ return res;
+ else {
+ int olderrno = errno;
+ size_t outsz = sizeof(darwin_dirp->dirent_nfc.d_name) - 1; /* one for \0 */
+ char *outpos = darwin_dirp->dirent_nfc.d_name;
+ iconv_ibp cp;
+ size_t cnt;
+ size_t insz = namelen;
+ cp = (iconv_ibp)res->d_name;
+
+ /* Copy all data except the name */
+ memcpy(&darwin_dirp->dirent_nfc, res,
+ sizeof(darwin_dirp->dirent_nfc)-sizeof(darwin_dirp->dirent_nfc.d_name));
+ errno = 0;
+
+ cnt = iconv(darwin_dirp->ic_precompose, &cp, &insz, &outpos, &outsz);
+ if (cnt < sizeof(darwin_dirp->dirent_nfc.d_name) -1) {
+ *outpos = 0;
+ errno = olderrno;
+ return &darwin_dirp->dirent_nfc;
+ }
+ errno = olderrno;
+ return res;
+ }
+}
+
+
+int
+darwin_closedir(DARWIN_DIR *darwin_dirp)
+{
+ int ret_value;
+ ret_value = closedir(darwin_dirp->dirp);
+ if (darwin_dirp->ic_precompose != (iconv_t)-1)
+ iconv_close(darwin_dirp->ic_precompose);
+ free(darwin_dirp);
+ return ret_value;
+}
diff --git a/compat/darwin.h b/compat/darwin.h
new file mode 100644
index 0000000..094f930
--- /dev/null
+++ b/compat/darwin.h
@@ -0,0 +1,31 @@
+#ifndef __DARWIN_H__
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <iconv.h>
+
+
+typedef struct {
+ iconv_t ic_precompose;
+ DIR *dirp;
+ struct dirent dirent_nfc;
+} DARWIN_DIR;
+
+char *str_precompose(const char *in, iconv_t ic_precompose);
+
+void argv_precompose(int argc, const char **argv);
+
+DARWIN_DIR *darwin_opendir(const char *dirname);
+struct dirent *darwin_readdir(DARWIN_DIR *dirp);
+int darwin_closedir(DARWIN_DIR *dirp);
+
+#ifndef __DARWIN_C__
+#define opendir(n) darwin_opendir(n)
+#define readdir(d) darwin_readdir(d)
+#define closedir(d) darwin_closedir(d)
+#define DIR DARWIN_DIR
+
+#endif /* __DARWIN_C__ */
+
+#define __DARWIN_H__
+#endif /* __DARWIN_H__ */
diff --git a/git-compat-util.h b/git-compat-util.h
index 230e198..859dfcf 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -90,6 +90,14 @@
#include <windows.h>
#endif
+#if defined (PRECOMPOSED_UNICODE)
+#include "compat/darwin.h"
+#else
+#define str_precompose(in,i_nfd2nfc) (NULL)
+#define argv_precompose(c,v)
+
+#endif
+
#include <unistd.h>
#include <stdio.h>
#include <sys/stat.h>
diff --git a/git.c b/git.c
index 8e34903..6b2ffb7 100644
--- a/git.c
+++ b/git.c
@@ -298,6 +298,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
startup_info->have_repository) /* get_git_dir() may set up repo, avoid that */
trace_repo_setup(prefix);
}
+ argv_precompose(argc, argv);
commit_pager_choice();
if (!help && p->option & NEED_WORK_TREE)
diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index 1542cf6..befe39e 100755
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@ -126,6 +126,7 @@ test_expect_success "setup unicode normalization tests" '
test_create_repo unicode &&
cd unicode &&
+ git config core.precomposedunicode false &&
touch "$aumlcdiar" &&
git add "$aumlcdiar" &&
git commit -m initial &&
diff --git a/t/t3910-mac-os-precompose.sh b/t/t3910-mac-os-precompose.sh
new file mode 100755
index 0000000..439e266
--- /dev/null
+++ b/t/t3910-mac-os-precompose.sh
@@ -0,0 +1,117 @@
+#!/bin/sh
+#
+# Copyright (c) 2012 Torsten Bögershausen
+#
+
+test_description='utf-8 decomposed (nfd) converted to precomposed (nfc)'
+
+. ./test-lib.sh
+
+Adiarnfc=`printf '\303\204'`
+Odiarnfc=`printf '\303\226'`
+Adiarnfd=`printf 'A\314\210'`
+Odiarnfd=`printf 'O\314\210'`
+
+mkdir junk &&
+>junk/"$Adiarnfc" &&
+case "$(cd junk && echo *)" in
+ "$Adiarnfd")
+ test_nfd=1
+ ;;
+ *) ;;
+esac
+rm -rf junk
+
+if test "$test_nfd"
+then
+ test_expect_success "detect if nfd needed" '
+ precomposedunicode=`git config --bool core.precomposedunicode` &&
+ test "$precomposedunicode" = true
+ '
+ test_expect_success "setup" '
+ >x &&
+ git add x &&
+ git commit -m "1st commit" &&
+ git rm x &&
+ git commit -m "rm x"
+ '
+ test_expect_success "setup case mac" '
+ git checkout -b mac_os
+ '
+ # This will test nfd2nfc in readdir()
+ test_expect_success "add file Adiarnfc" '
+ echo f.Adiarnfc >f.$Adiarnfc &&
+ git add f.$Adiarnfc &&
+ git commit -m "add f.$Adiarnfc"
+ '
+ # This will test nfd2nfc in git stage()
+ test_expect_success "stage file d.Adiarnfd/f.Adiarnfd" '
+ mkdir d.$Adiarnfd &&
+ echo d.$Adiarnfd/f.$Adiarnfd >d.$Adiarnfd/f.$Adiarnfd &&
+ git stage d.$Adiarnfd/f.$Adiarnfd &&
+ git commit -m "add d.$Adiarnfd/f.$Adiarnfd"
+ '
+ test_expect_success "add link Adiarnfc" '
+ ln -s d.$Adiarnfd/f.$Adiarnfd l.$Adiarnfc &&
+ git add l.$Adiarnfc &&
+ git commit -m "add l.Adiarnfc"
+ '
+ # This will test git log
+ test_expect_success "git log f.Adiar" '
+ git log f.$Adiarnfc > f.Adiarnfc.log &&
+ git log f.$Adiarnfd > f.Adiarnfd.log &&
+ test -s f.Adiarnfc.log &&
+ test -s f.Adiarnfd.log &&
+ test_cmp f.Adiarnfc.log f.Adiarnfd.log &&
+ rm f.Adiarnfc.log f.Adiarnfd.log
+ '
+ # This will test git ls-files
+ test_expect_success "git lsfiles f.Adiar" '
+ git ls-files f.$Adiarnfc > f.Adiarnfc.log &&
+ git ls-files f.$Adiarnfd > f.Adiarnfd.log &&
+ test -s f.Adiarnfc.log &&
+ test -s f.Adiarnfd.log &&
+ test_cmp f.Adiarnfc.log f.Adiarnfd.log &&
+ rm f.Adiarnfc.log f.Adiarnfd.log
+ '
+ # This will test git mv
+ test_expect_success "git mv" '
+ git mv f.$Adiarnfd f.$Odiarnfc &&
+ git mv d.$Adiarnfd d.$Odiarnfc &&
+ git mv l.$Adiarnfd l.$Odiarnfc &&
+ git commit -m "mv Adiarnfd Odiarnfc"
+ '
+ # Files can be checked out as nfc
+ # And the link has been corrected from nfd to nfc
+ test_expect_success "git checkout nfc" '
+ rm f.$Odiarnfc &&
+ git checkout f.$Odiarnfc
+ '
+ # Make it possible to checkout files with their NFD names
+ test_expect_success "git checkout file nfd" '
+ rm -f f.* &&
+ git checkout f.$Odiarnfd
+ '
+ # Make it possible to checkout links with their NFD names
+ test_expect_success "git checkout link nfd" '
+ rm l.* &&
+ git checkout l.$Odiarnfd
+ '
+ test_expect_success "setup case mac2" '
+ git checkout master &&
+ git reset --hard &&
+ git checkout -b mac_os_2
+ '
+ # This will test nfd2nfc in git commit
+ test_expect_success "commit file d2.Adiarnfd/f.Adiarnfd" '
+ mkdir d2.$Adiarnfd &&
+ echo d2.$Adiarnfd/f.$Adiarnfd >d2.$Adiarnfd/f.$Adiarnfd &&
+ git add d2.$Adiarnfd/f.$Adiarnfd &&
+ git commit -m "add d2.$Adiarnfd/f.$Adiarnfd" -- d2.$Adiarnfd/f.$Adiarnfd
+ '
+else
+ say "Skipping nfc/nfd tests"
+fi
+ #git commit -m "add d2.$Adiarnfd/f.$Adiarnfd" -- d2.$Adiarnfd/f.$Adiarnfd
+
+test_done
--
1.7.8.rc0.43.gb49a8
^ permalink raw reply related
* [RFC][PATCH v2] git on Mac OS and precomposed unicode
From: Torsten Bögershausen @ 2012-01-09 16:45 UTC (permalink / raw)
To: git; +Cc: tboegi
Changes since last version:
- Improved testcase t/t3910-mac-os-precompose.sh:
test "git commit -- pathspec" (Thanks Junio)
- Improved the converting of argv[] for "git commit"
===============
Purpose:
This patch is a suggestion to work around the unpleasenties
when Mac OS is decomposing unicode filenames.
The suggested change:
a) is only used under Mac OS
b) can be switched off by a configuration variable
c) is optimized to handle ASCII only filename
d) will improve the interwork between Mac OS, Linux and Windows*
via git push/pull, using USB sticks (technically speaking VFAT)
or mounted network shares using samba.
* (Not all Windows versions support UTF-8 yet:
Msysgit needs the unicode branch, cygwin supports UTF-8 since 1.7)
Runtime configuration:
A new confguration variable is added: "core.precomposedunicode"
This variable is only used on Mac OS.
If set to false, git behaves exactly as older versions of git.
When a new git version is installed and there is a repository
where the configuration "core.precomposedunicode" is not present,
the new git is backward compatible.
When core.precomposedunicode=true, all filenames are stored in precomposed
unicode in the index (technically speaking precomposed UTF-8).
Even when readdir() under Mac OS returns filenames as decomposed.
Implementation:
Two files are added to the "compat" directory, darwin.h and darwin.c.
They implement basically 3 new functions:
darwin_opendir(), darwin_readdir() and darwin_closedir().
Compile time configuration:
A new compiler option PRECOMPOSED_UNICODE is introduced in the Makefile,
so that the patch can be switched off completely at compile time.
No decomposed file names in a git repository:
In order to prevent that ever a file name in decomposed unicode is entering
the index, a "brute force" attempt is taken:
all arguments into git (technically argv[1]..argv[n]) are converted into
precomposed unicode.
This is done in git.c by calling argv_precompose() for all commands:
For "git commit" all args after "--" are converted,
for all other commands all argv[] is converted.
This function is actually a #define, and it is only defined under Mac OS.
Nothing is converted on any other OS.
Implementation details:
The main work is done in darwin_readdir() and argv_precompose().
The conversion into precomposed unicode is done by using iconv,
where decomposed is denoted by "UTF-8-MAC" and precomposed is "UTF-8".
When already precomposed unicode is precomposed, the string is returned
unchanged.
Thread save:
Since there is no need for argv_precompose()to be thread-save, one iconv
instance is created at the beginning and kept for all conversions.
Even readdir() is not thread-save, so that darwin_opendir() will call
iconv_open() once and keep the instance for all calls of darwin_readdir()
until darwin_close() is called.
Auto sensing:
When creating a new git repository with "git init" or "git clone", the
"core.precomposedunicode" will be set automatically to "true" or "false".
Typically core.precomposedunicode is "true" on HFS and VFAT.
It is even true for file systems mounted via SAMBA onto a Linux box,
and "false" for drives mounted via NFS onto a Linux box.
New test case:
The new t3910-mac-os-precompose.sh is added to check if a filename
can be reached either in precomposed or decomposed unicode (NFC or NFD).
Torsten Bögershausen (1):
git on Mac OS and precomposed unicode
Documentation/config.txt | 9 ++
Makefile | 3 +
builtin/init-db.c | 22 +++++
compat/darwin.c | 208 ++++++++++++++++++++++++++++++++++++++++++
compat/darwin.h | 31 ++++++
git-compat-util.h | 8 ++
git.c | 1 +
t/t0050-filesystem.sh | 1 +
t/t3910-mac-os-precompose.sh | 117 +++++++++++++++++++++++
9 files changed, 400 insertions(+), 0 deletions(-)
create mode 100644 compat/darwin.c
create mode 100644 compat/darwin.h
create mode 100755 t/t3910-mac-os-precompose.sh
--
1.7.8.rc0.43.gb49a8
^ permalink raw reply
* Re: [PATCH] gitignore: warn about pointless syntax
From: Jeff King @ 2012-01-09 16:28 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: git, trast
In-Reply-To: <1326123647-18352-2-git-send-email-jengelh@medozas.de>
On Mon, Jan 09, 2012 at 04:40:47PM +0100, Jan Engelhardt wrote:
> +static inline void check_bogus_wildcard(const char *file, const char *p)
> +{
> + if (strstr(p, "**") == NULL)
> + return;
> + warning(_("Pattern \"%s\" from file \"%s\": Double asterisk does not "
> + "have a special meaning and is interpreted just like a single "
> + "asterisk.\n"), file, p);
Wouldn't this also match the meaningful "foo\**"?
-Peff
^ permalink raw reply
* gitignore warn about ** submission
From: Jan Engelhardt @ 2012-01-09 15:40 UTC (permalink / raw)
To: git; +Cc: trast
The following changes since commit eac2d83247ea0a265d923518c26873bb12c33778:
Git 1.7.9-rc0 (2012-01-06 12:51:09 -0800)
are available in the git repository at:
git://dev.medozas.de/git master
Jan Engelhardt (1):
gitignore: warn about pointless syntax
dir.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
^ permalink raw reply
* [PATCH] gitignore: warn about pointless syntax
From: Jan Engelhardt @ 2012-01-09 15:40 UTC (permalink / raw)
To: git; +Cc: trast
In-Reply-To: <1326123647-18352-1-git-send-email-jengelh@medozas.de>
Add a warning to the gitignore parser if it sees "**". Git, using
fnmatch, does not consider the double-asterisk anything special like
rsync/zsh. Remind users of that, since too many seem to be Doing It
Wrong™.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
dir.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/dir.c b/dir.c
index 0a78d00..60f65cb 100644
--- a/dir.c
+++ b/dir.c
@@ -376,6 +376,15 @@ void free_excludes(struct exclude_list *el)
el->excludes = NULL;
}
+static inline void check_bogus_wildcard(const char *file, const char *p)
+{
+ if (strstr(p, "**") == NULL)
+ return;
+ warning(_("Pattern \"%s\" from file \"%s\": Double asterisk does not "
+ "have a special meaning and is interpreted just like a single "
+ "asterisk.\n"), file, p);
+}
+
int add_excludes_from_file_to_list(const char *fname,
const char *base,
int baselen,
@@ -427,6 +436,7 @@ int add_excludes_from_file_to_list(const char *fname,
if (buf[i] == '\n') {
if (entry != buf + i && entry[0] != '#') {
buf[i - (i && buf[i-1] == '\r')] = 0;
+ check_bogus_wildcard(fname, entry);
add_exclude(entry, base, baselen, which);
}
entry = buf + i + 1;
--
1.7.7
^ permalink raw reply related
* Re: submodule add -f errs on un-ignored path
From: Thomas Rast @ 2012-01-09 15:40 UTC (permalink / raw)
To: Neal Kreitzinger; +Cc: git
In-Reply-To: <jeaip7$meo$1@dough.gmane.org>
"Neal Kreitzinger" <neal@rsss.com> writes:
> $ git submodule add -f file:///home/me/super/Images.git WebPortal/Images
> Usage: git submodule [--quiet] add [-b branch] [--reference <repository>] [--] repository [<path>]
AFAICT this works since 1.7.2 (d27b876 to be precise). Before that the
-f option didn't exist, and wasn't in the docs either.
--
Thomas Rast
trast@{inf,student}.ethz.ch
^ permalink raw reply
* Re: [patch] gitignore: warn about pointless syntax
From: Thomas Rast @ 2012-01-09 13:44 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: git
In-Reply-To: <alpine.LNX.2.01.1201091233050.28805@frira.zrqbmnf.qr>
Jan Engelhardt <jengelh@medozas.de> writes:
> parent eac2d83247ea0a265d923518c26873bb12c33778 (v1.7.9-rc0)
> commit b629bde461aeb178b257ab7e0f6c180f69f98cb0
> Author: Jan Engelhardt <jengelh@medozas.de>
> Date: Mon Jan 9 12:30:07 2012 +0100
>
> gitignore: warn about pointless syntax
[...]
> --
> # Created with git-export-patch
Are you the author of this tool? The format is bogus in so far as it
causes git-am to insert the above lines into the git commit message, as
in:
$ git am -3 < gitignore-patch.mbox
Applying: gitignore: warn about pointless syntax
$ git show
commit 59bea4d9a1de3b3b9c0139de4298ffd9d9431457
Author: Jan Engelhardt <jengelh@medozas.de>
Date: Mon Jan 9 12:34:12 2012 +0100
gitignore: warn about pointless syntax
parent eac2d83247ea0a265d923518c26873bb12c33778 (v1.7.9-rc0)
commit b629bde461aeb178b257ab7e0f6c180f69f98cb0
Author: Jan Engelhardt <jengelh@medozas.de>
Date: Mon Jan 9 12:30:07 2012 +0100
gitignore: warn about pointless syntax
[...]
So using this tool over format-patch is just a pointless cause of manual
fixup work.
--
Thomas Rast
trast@{inf,student}.ethz.ch
^ permalink raw reply
* [RFC/PATCH 3/3] git-gui: support for reverting hunks and lines
From: Bert Wesarg @ 2012-01-09 13:43 UTC (permalink / raw)
To: Pat Thoyts; +Cc: git, Bert Wesarg
In-Reply-To: <cccd6193cf3bfe170e14270204d735a842bb8563.1326116492.git.bert.wesarg@googlemail.com>
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
---
git-gui.sh | 106 +++++++++++++++++++++++++++++++++++++++------------------
lib/diff.tcl | 23 ++++++++++---
2 files changed, 90 insertions(+), 39 deletions(-)
diff --git a/git-gui.sh b/git-gui.sh
index ba4e5c1..955cbf8 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -3289,36 +3289,35 @@ pack .vpane.lower.commarea.buffer -side left -fill y
# -- Commit Message Buffer Context Menu
#
-set ctxm .vpane.lower.commarea.buffer.ctxm
-menu $ctxm -tearoff 0
-$ctxm add command \
+set ui_comm_ctxm .vpane.lower.commarea.buffer.ctxm
+menu $ui_comm_ctxm -tearoff 0
+$ui_comm_ctxm add command \
-label [mc Cut] \
-command {tk_textCut $ui_comm}
-$ctxm add command \
+$ui_comm_ctxm add command \
-label [mc Copy] \
-command {tk_textCopy $ui_comm}
-$ctxm add command \
+$ui_comm_ctxm add command \
-label [mc Paste] \
-command {tk_textPaste $ui_comm}
-$ctxm add command \
+$ui_comm_ctxm add command \
-label [mc Delete] \
-command {catch {$ui_comm delete sel.first sel.last}}
-$ctxm add separator
-$ctxm add command \
+$ui_comm_ctxm add separator
+$ui_comm_ctxm add command \
-label [mc "Select All"] \
-command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
-$ctxm add command \
+$ui_comm_ctxm add command \
-label [mc "Copy All"] \
-command {
$ui_comm tag add sel 0.0 end
tk_textCopy $ui_comm
$ui_comm tag remove sel 0.0 end
}
-$ctxm add separator
-$ctxm add command \
+$ui_comm_ctxm add separator
+$ui_comm_ctxm add command \
-label [mc "Sign Off"] \
-command do_signoff
-set ui_comm_ctxm $ctxm
# -- Diff Header
#
@@ -3366,9 +3365,9 @@ tlabel .vpane.lower.diff.header.path \
pack .vpane.lower.diff.header.status -side left
pack .vpane.lower.diff.header.file -side left
pack .vpane.lower.diff.header.path -fill x
-set ctxm .vpane.lower.diff.header.ctxm
-menu $ctxm -tearoff 0
-$ctxm add command \
+set hctxm .vpane.lower.diff.header.ctxm
+menu $hctxm -tearoff 0
+$hctxm add command \
-label [mc Copy] \
-command {
clipboard clear
@@ -3377,8 +3376,8 @@ $ctxm add command \
-type STRING \
-- $current_diff_path
}
-lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
-bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
+lappend diff_actions [list $hctxm entryconf [$hctxm index last] -state]
+bind_button3 .vpane.lower.diff.header.path "tk_popup $hctxm %X %Y"
# -- Diff Body
#
@@ -3491,29 +3490,61 @@ proc create_common_diff_popup {ctxm} {
-command do_options
}
-set ctxm .vpane.lower.diff.body.ctxm
-menu $ctxm -tearoff 0
-$ctxm add command \
+set ctxmw .vpane.lower.diff.body.ctxmw
+menu $ctxmw -tearoff 0
+$ctxmw add command \
-label [mc "Apply/Reverse Hunk"] \
-command {apply_hunk $cursorX $cursorY}
-set ui_diff_applyhunk [$ctxm index last]
-lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
-$ctxm add command \
+set ui_diff_applyhunk [$ctxmw index last]
+lappend diff_actions [list $ctxmw entryconf $ui_diff_applyhunk -state]
+$ctxmw add command \
-label [mc "Apply/Reverse Line"] \
-command {apply_range_or_line $cursorX $cursorY; do_rescan}
-set ui_diff_applyline [$ctxm index last]
-lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
-$ctxm add separator
-$ctxm add command \
+set ui_diff_applyline [$ctxmw index last]
+lappend diff_actions [list $ctxmw entryconf $ui_diff_applyline -state]
+$ctxmw add separator
+$ctxmw add command \
+ -label [mc "Revert Hunk"] \
+ -command {apply_hunk $cursorX $cursorY 1}
+lappend diff_actions [list $ctxmw entryconf $ui_diff_applyhunk -state]
+$ctxmw add command \
+ -label [mc "Revert Line"] \
+ -command {apply_range_or_line $cursorX $cursorY 1; do_rescan}
+set ui_diff_revertline [$ctxmw index last]
+lappend diff_actions [list $ctxmw entryconf $ui_diff_applyline -state]
+$ctxmw add separator
+$ctxmw add command \
-label [mc "Show Less Context"] \
-command show_less_context
-lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
-$ctxm add command \
+lappend diff_actions [list $ctxmw entryconf [$ctxmw index last] -state]
+$ctxmw add command \
-label [mc "Show More Context"] \
-command show_more_context
-lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
-$ctxm add separator
-create_common_diff_popup $ctxm
+lappend diff_actions [list $ctxmw entryconf [$ctxmw index last] -state]
+$ctxmw add separator
+create_common_diff_popup $ctxmw
+
+set ctxmi .vpane.lower.diff.body.ctxmi
+menu $ctxmi -tearoff 0
+$ctxmi add command \
+ -label [mc "Apply/Reverse Hunk"] \
+ -command {apply_hunk $cursorX $cursorY}
+lappend diff_actions [list $ctxmi entryconf $ui_diff_applyhunk -state]
+$ctxmi add command \
+ -label [mc "Apply/Reverse Line"] \
+ -command {apply_range_or_line $cursorX $cursorY; do_rescan}
+lappend diff_actions [list $ctxmi entryconf $ui_diff_applyline -state]
+$ctxmi add separator
+$ctxmi add command \
+ -label [mc "Show Less Context"] \
+ -command show_less_context
+lappend diff_actions [list $ctxmi entryconf [$ctxmi index last] -state]
+$ctxmi add command \
+ -label [mc "Show More Context"] \
+ -command show_more_context
+lappend diff_actions [list $ctxmi entryconf [$ctxmi index last] -state]
+$ctxmi add separator
+create_common_diff_popup $ctxmi
set ctxmmg .vpane.lower.diff.body.ctxmmg
menu $ctxmmg -tearoff 0
@@ -3581,7 +3612,7 @@ proc has_textconv {path} {
}
}
-proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
+proc popup_diff_menu {ctxmw ctxmi ctxmmg ctxmsm x y X Y} {
global current_diff_path file_states
set ::cursorX $x
set ::cursorY $y
@@ -3597,6 +3628,7 @@ proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
} else {
set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
if {$::ui_index eq $::current_diff_side} {
+ set ctxm $ctxmi
set l [mc "Unstage Hunk From Commit"]
if {$has_range} {
set t [mc "Unstage Lines From Commit"]
@@ -3604,11 +3636,14 @@ proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
set t [mc "Unstage Line From Commit"]
}
} else {
+ set ctxm $ctxmw
set l [mc "Stage Hunk For Commit"]
if {$has_range} {
set t [mc "Stage Lines For Commit"]
+ set r [mc "Revert Lines"]
} else {
set t [mc "Stage Line For Commit"]
+ set r [mc "Revert Line"]
}
}
if {$::is_3way_diff
@@ -3624,10 +3659,13 @@ proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
}
$ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
$ctxm entryconf $::ui_diff_applyline -state $s -label $t
+ if {$::ui_workdir eq $::current_diff_side} {
+ $ctxm entryconf $::ui_diff_revertline -state $s -label $r
+ }
tk_popup $ctxm $X $Y
}
}
-bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y]
+bind_button3 $ui_diff [list popup_diff_menu $ctxmw $ctxmi $ctxmmg $ctxmsm %x %y %X %Y]
# -- Status Bar
#
diff --git a/lib/diff.tcl b/lib/diff.tcl
index a750ea7..83e6f6a 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -544,7 +544,7 @@ proc read_diff {fd conflict_size cont_info} {
}
}
-proc apply_hunk {x y} {
+proc apply_hunk {x y {revert 0}} {
global current_diff_path current_diff_header current_diff_side
global ui_diff ui_index file_states
@@ -561,7 +561,12 @@ proc apply_hunk {x y} {
return
}
} else {
- set failed_msg [mc "Failed to stage selected hunk."]
+ if {$revert} {
+ set failed_msg [mc "Failed to revert selected hunk."]
+ set apply_cmd {apply --reverse --whitespace=nowarn}
+ } else {
+ set failed_msg [mc "Failed to stage selected hunk."]
+ }
if {[string index $mi 1] ne {M}} {
unlock_index
return
@@ -604,6 +609,8 @@ proc apply_hunk {x y} {
if {$current_diff_side eq $ui_index} {
set mi ${o}M
+ } elseif {$revert} {
+ set mi "[string index $mi 0]$o"
} elseif {[string index $mi 0] eq {_}} {
set mi M$o
} else {
@@ -617,7 +624,7 @@ proc apply_hunk {x y} {
}
}
-proc apply_range_or_line {x y} {
+proc apply_range_or_line {x y {revert 0}} {
global current_diff_path current_diff_header current_diff_side
global ui_diff ui_index file_states
@@ -654,8 +661,14 @@ proc apply_range_or_line {x y} {
return
}
} else {
- set failed_msg [mc "Failed to stage selected line."]
- set to_context {-}
+ if {$revert} {
+ set failed_msg [mc "Failed to revert selected line."]
+ set apply_cmd {apply --reverse --whitespace=nowarn}
+ set to_context {+}
+ } else {
+ set failed_msg [mc "Failed to stage selected line."]
+ set to_context {-}
+ }
if {[string index $mi 1] ne {M}} {
unlock_index
return
--
1.7.8.1.873.gfea665
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox