On Fri, Mar 29, 2013 at 4:48 AM, Jeff King p...@peff.net wrote:
- return fnmatch_icase(pattern, name, FNM_PATHNAME) == 0;
+ return fnmatch_icase_mem(pattern, patternlen,
+name, namelen,
+FNM_PATHNAME) == 0;
}
I
On Fri, Mar 29, 2013 at 3:45 PM, Duy Nguyen pclo...@gmail.com wrote:
On Fri, Mar 29, 2013 at 4:48 AM, Jeff King p...@peff.net wrote:
- return fnmatch_icase(pattern, name, FNM_PATHNAME) == 0;
+ return fnmatch_icase_mem(pattern, patternlen,
+name,
This is a consolidated series replacing jk/t7800-modernize. The patches
here have been rebased on master.
Patch 1 is new and moves the test added by commit 02c5631 (difftool
--dir-diff: symlink all files matching the working tree) to the end of
the test file. This means that once this is
This will group the tests more logically when we introduce a helper to
run most --dir-diff tests with both --symlinks and --no-symlinks.
Signed-off-by: John Keeping j...@keeping.me.uk
---
t/t7800-difftool.sh | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
After running the user's diff tool, git-difftool will copy any files
that differ between the working tree and the temporary tree. This is
useful when the user edits the file in their diff tool but is wrong if
they edit the working tree file while examining the diff.
Instead of copying
Remove the stdin_contains and stdin_doesnt_contain helper functions
which add nothing but hide the output of grep, hurting debugging.
Suggested-by: Johannes Sixt j.s...@viscovery.net
Signed-off-by: John Keeping j...@keeping.me.uk
---
t/t7800-difftool.sh | 44
When 'git difftool --dir-diff' is using --no-symlinks (either explicitly
or implicitly because it's running on Windows), any working tree files
that have been copied to the temporary directory are copied back after
the difftool completes.
Because an earlier test uses git add ., the output file
Currently the difftool --dir-diff tests may or may not use symlinks
depending on the operating system on which they are run. In one case
this has caused a test failure to be noticed only on Windows when the
test also fails on Linux when difftool is invoked with --no-symlinks.
Rewrite these tests
On 29.03.13 11:03, Duy Nguyen wrote:
On Fri, Mar 29, 2013 at 3:45 PM, Duy Nguyen pclo...@gmail.com wrote:
On Fri, Mar 29, 2013 at 4:48 AM, Jeff King p...@peff.net wrote:
- return fnmatch_icase(pattern, name, FNM_PATHNAME) == 0;
+ return fnmatch_icase_mem(pattern, patternlen,
+
On Fri, Mar 29, 2013 at 6:32 PM, Torsten Bögershausen tbo...@web.de wrote:
Just tested. t0003 and t3001 on 'pu' work for me because I have
USE_WILDMATCH on (which turns FNM_PATHNAME to WM_PATHNAME). Both break
without USE_WILDMATCH.
Hm, tested what?
Tested t0003 and t3001 with and without
On Fri, Mar 29, 2013 at 03:45:35PM +0700, Nguyen Thai Ngoc Duy wrote:
On Fri, Mar 29, 2013 at 4:48 AM, Jeff King p...@peff.net wrote:
- return fnmatch_icase(pattern, name, FNM_PATHNAME) == 0;
+ return fnmatch_icase_mem(pattern, patternlen,
+name,
On Fri, Mar 29, 2013 at 08:05:40AM -0400, Jeff King wrote:
On Fri, Mar 29, 2013 at 03:45:35PM +0700, Nguyen Thai Ngoc Duy wrote:
On Fri, Mar 29, 2013 at 4:48 AM, Jeff King p...@peff.net wrote:
- return fnmatch_icase(pattern, name, FNM_PATHNAME) == 0;
+ return
Every time the object hash table grows, all entries must be
rearranged. The few last times could be really expensive when the
table contains a lot of entries.
When we do --all --objects we know in advance we may need to hash
all objects. Just prepare the hash table big enough, so there won't be
If a position in object hash table is taken, we currently check out
the next one. This could potentially create long object chains. We
could create linked lists instead and leave the next slot alone.
This patch relies on the fact that pointers are usually aligned more
than one byte and it uses
On Fri, Mar 29, 2013 at 08:20:10PM +0700, Nguyen Thai Ngoc Duy wrote:
Every time the object hash table grows, all entries must be
rearranged. The few last times could be really expensive when the
table contains a lot of entries.
When we do --all --objects we know in advance we may need to
On Fri, Mar 29, 2013 at 10:12 PM, Jeff King p...@peff.net wrote:
This feels weirdly specific, and like we should just be tuning our hash
table growth better. You show a 3.2% speedup here. I was able to get a
2.8% speedup just by doing this:
It also uses a lot more memory. 5.8m entries for .. *
git cherry-pick -x normally just appends the cherry picked from commit
line at the end of the message, which is fine. However, in case the
original commit message had only one line, first append a newline,
otherwise the second line won't be empty, which is against
recommendations.
---
sequencer.c
Jeff King p...@peff.net writes:
This feels weirdly specific, and like we should just be tuning our hash
table growth better. You show a 3.2% speedup here. I was able to get a
2.8% speedup just by doing this:
diff --git a/object.c b/object.c
index 20703f5..8e5e12c 100644
--- a/object.c
+++
Duy Nguyen pclo...@gmail.com writes:
So we would want to do any adjustment to the fix when we merge up to
maint.
OK. Then Junio, you may need to resolve the conflict with something
like this. Originally match_basename uses fnmatch, not wildmatch. But
using wildmatch there too should be
On Fri, Mar 29, 2013 at 09:29:14AM -0700, Phil Haack wrote:
If you run the following set of commands:
git checkout -b some-branch
git push origin some-branch
git branch --set-upstream-to origin/some-branch
git branch --unset-upstream some-branch
git branch
On Fri, Mar 29, 2013 at 09:44:32AM -0700, Junio C Hamano wrote:
Duy Nguyen pclo...@gmail.com writes:
So we would want to do any adjustment to the fix when we merge up to
maint.
OK. Then Junio, you may need to resolve the conflict with something
like this. Originally match_basename
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
If a position in object hash table is taken, we currently check out
the next one. This could potentially create long object chains. We
could create linked lists instead and leave the next slot alone.
In the current code, not just the logic in
Jeff King p...@peff.net writes:
I think what happens is that the config editor runs
through the files linearly, munging whatever lines necessary for the
requested operation, and leaving everything else untouched (as it must,
to leave comments and whitespace intact). But it does not keep a
On Fri, Mar 29, 2013 at 06:20:28PM +0100, Thomas Rast wrote:
Jeff King p...@peff.net writes:
I think what happens is that the config editor runs
through the files linearly, munging whatever lines necessary for the
requested operation, and leaving everything else untouched (as it must,
Miklos Vajna vmik...@suse.cz writes:
git cherry-pick -x normally just appends the cherry picked from commit
line at the end of the message, which is fine. However, in case the
original commit message had only one line, first append a newline,
otherwise the second line won't be empty, which is
Phil Haack haac...@gmail.com writes:
Hello there! Please /cc me with responses as I'm not on the mailing list.
I'm using git version 1.8.1.msysgit.1 and I ran into a very minor issue. It
doesn't actually seem to affect operations, but I thought I'd report it in
case
someone felt it was
Jeff King p...@peff.net writes:
On Fri, Mar 29, 2013 at 09:44:32AM -0700, Junio C Hamano wrote:
...
With the merge-fix, fnmatch_icase_mem() calls into wildmatch(), but
fnmatch_icase() still calls into fnmatch().
The latter's flags are meant to be taken from FNM_* family, but the
former
On Fri, Mar 29, 2013 at 10:35:17AM -0700, Junio C Hamano wrote:
This may be just the matter of naming.
It smelled wrong to me only because the fnmatch in the helper
fnmatch_icase_mem() told me that it should forever use fnmatch
semantics. After reading its (only) two callsites, they are
I use git mostly for game-development which means I have to deal with a
lot of binary files (images, sound files etc).
When I came to a point where I had run image optimization on a branch, I
wanted to know of course how much smaller the new branch was in
comparison to master.
Problem was
Junio C Hamano gits...@pobox.com writes:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
If a position in object hash table is taken, we currently check out
the next one. This could potentially create long object chains. We
could create linked lists instead and leave the next slot alone.
On Fri, Mar 29, 2013 at 07:07:32PM +0100, Matthias Krüger wrote:
I use git mostly for game-development which means I have to deal with
a lot of binary files (images, sound files etc).
When I came to a point where I had run image optimization on a
branch, I wanted to know of course how much
Jeff King p...@peff.net writes:
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 3c96fda..d62facb 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -1087,4 +1087,36 @@ test_expect_success 'barf on incomplete string' '
grep line 3 error
'
+#
Jeff King p...@peff.net writes:
I use git mostly for game-development which means I have to deal with
a lot of binary files (images, sound files etc).
When I came to a point where I had run image optimization on a
branch, I wanted to know of course how much smaller the new branch
was in
On Fri, Mar 29, 2013 at 11:51:51AM -0700, Junio C Hamano wrote:
+ cat expect -\EOF
+ # some intervening lines
+ # that should be saved
+ EOF
I do not know if I agree with this expectation.
Most likely these comments are about the section, and possibly even
are specific to
Junio C Hamano gits...@pobox.com writes:
... If we _were_ to remove the section header at this point,
we should be removing the comment two out of three cases (if it is
about section.key, it should go when section.key goes; if it is
about section, it should go when section goes; if it is a
John Keeping j...@keeping.me.uk writes:
After running the user's diff tool, git-difftool will copy any files
that differ between the working tree and the temporary tree. This is
useful when the user edits the file in their diff tool but is wrong if
they edit the working tree file while
Jeff King p...@peff.net writes:
Here it is with the updated expectation. I don't care _that_ much, so if
you feel strongly and want to drop the first test, feel free.
As long as we are adding expect_failure without an immediate fix,
let's document the ideal, with this patch on top.
Hi,
On Fri, Mar 29, 2013 at 10:41:17AM -0700, Brandon Casey draf...@gmail.com
wrote:
Sign-off?
Indeed, I forgot about it, my bad.
I think this is part of the bc/append-signed-off-by topic that is
about to graduate to 'master'; more specifically, b971e04f54e7
(sequencer.c: always
Miklos Vajna vmik...@suse.cz writes:
On Fri, Mar 29, 2013 at 10:41:17AM -0700, Brandon Casey draf...@gmail.com
wrote:
I think this is part of the bc/append-signed-off-by topic that is
about to graduate to 'master'; more specifically, b971e04f54e7
(sequencer.c: always separate (cherry
Torsten Bögershausen tbo...@web.de writes:
optimize set_shared_perm() in path.c:
- sometimes the chown() function is called even when not needed.
(This can be provoced by running t1301, and adding some debug code)
Save a chmod from 400 to 400, or from 600-600 on these files:
On Fri, Mar 29, 2013 at 01:20:50PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
After running the user's diff tool, git-difftool will copy any files
that differ between the working tree and the temporary tree. This is
useful when the user edits the file in their
After running the user's diff tool, git-difftool will copy any files
that differ between the working tree and the temporary tree. This is
useful when the user edits the file in their diff tool but is wrong if
they edit the working tree file while examining the diff.
Instead of copying
What's cooking in git.git (Mar 2013, #08; Fri, 29)
--
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
A handful of topics that have been
Is it possible to somehow fetch the reflog of a remote?
I would like to delegate some post-receive actions to an automatically
mirrored clone of some repositories. Mirrored repositories don't
maintain a reflog, even with core.logAllRefUpdates = true, so to be able
to know what was pushed per
Dennis Kaarsemaker den...@kaarsemaker.net writes:
... Mirrored repositories don't
maintain a reflog, even with core.logAllRefUpdates = true,...
Are you sure about this? When log_all_ref_updates is not set, by
default we do not log for bare repositories, but other than that, we
do not do
On vr, 2013-03-29 at 15:45 -0700, Junio C Hamano wrote:
Dennis Kaarsemaker den...@kaarsemaker.net writes:
... Mirrored repositories don't
maintain a reflog, even with core.logAllRefUpdates = true,...
Are you sure about this? When log_all_ref_updates is not set, by
default we do not log
Dennis Kaarsemaker den...@kaarsemaker.net writes:
On vr, 2013-03-29 at 15:45 -0700, Junio C Hamano wrote:
Dennis Kaarsemaker den...@kaarsemaker.net writes:
... Mirrored repositories don't
maintain a reflog, even with core.logAllRefUpdates = true,...
Are you sure about this? When
On vr, 2013-03-29 at 15:58 -0700, Junio C Hamano wrote:
Dennis Kaarsemaker den...@kaarsemaker.net writes:
On vr, 2013-03-29 at 15:45 -0700, Junio C Hamano wrote:
Dennis Kaarsemaker den...@kaarsemaker.net writes:
... Mirrored repositories don't
maintain a reflog, even with
I hope I did not introduce more problems than I fixed in this revision ;)
On 03/28/2013 11:33 PM, Junio C Hamano wrote:
It would be much easier to read if it were unless we are not
looking at the very first byte, the previous byte must be LF, i.e.
if (found != buf found[-1] != '\n')
Signed-off-by: Sebastian Götte ja...@physik-pool.tu-berlin.de
---
commit.c | 34 --
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/commit.c b/commit.c
index e94d122..48f09e9 100644
--- a/commit.c
+++ b/commit.c
@@ -1027,27 +1027,33 @@ static struct
Signed-off-by: Sebastian Götte ja...@physik-pool.tu-berlin.de
---
commit.c| 59 +
commit.h| 9 ++
gpg-interface.h | 8 +
pretty.c| 91 +
4 files changed, 89 insertions(+),
When --verify-signatures is specified, abort the merge in case a good
GPG signature from an untrusted key is encountered.
Signed-off-by: Sebastian Götte ja...@physik-pool.tu-berlin.de
---
Documentation/merge-options.txt| 4 ++--
builtin/merge.c| 2 ++
commit.c
Expand %G? in pretty format strings to 'N' in case of no GPG signature
and 'U' in case of a good but untrusted GPG signature in addition to
the previous 'G'ood and 'B'ad. This eases writing anyting parsing
git-log output.
Signed-off-by: Sebastian Götte ja...@physik-pool.tu-berlin.de
---
When --verify-signatures is specified on the command-line of git-merge
or git-pull, check whether the commits being merged have good gpg
signatures and abort the merge in case they do not. This allows e.g.
auto-deployment from untrusted repo hosts.
Signed-off-by: Sebastian Götte
On Fri, Mar 29, 2013 at 01:35:22PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
Here it is with the updated expectation. I don't care _that_ much, so if
you feel strongly and want to drop the first test, feel free.
As long as we are adding expect_failure without an
On Sat, Mar 30, 2013 at 12:15 AM, Junio C Hamano gits...@pobox.com wrote:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
If a position in object hash table is taken, we currently check out
the next one. This could potentially create long object chains. We
could create linked lists instead
On Fri, Mar 29, 2013 at 09:44:32AM -0700, Junio C Hamano wrote:
I tend to think in the longer term it may be a good idea to build
with USE_WILDMATCH unconditionally (we can lose compat/fnmatch), so
in the end this may not matter that much
I was thinking about that yesterday. After all, it's
Sebastian Götte ja...@physik.tu-berlin.de writes:
static void parse_gpg_output(struct signature_check *sigc)
{
- const char *buf = sigc-gpg_status;
int i;
+ /* Iterate over all search strings */
for (i = 0; i ARRAY_SIZE(sigcheck_gpg_status); i++) {
+
Sebastian Götte ja...@physik.tu-berlin.de writes:
@@ -230,4 +231,12 @@ extern void print_commit_list(struct commit_list *list,
const char *format_cur,
const char *format_last);
+/*
+ * Check the signature of the given commit. The
Sebastian Götte ja...@physik.tu-berlin.de writes:
+ OPT_BOOLEAN(0, verify-signatures, verify_signatures,
+ N_(Verify that the named commit has a valid GPG signature)),
Please use OPT_BOOL() in new code. Verifying existing OPT_BOOLEAN()
can safely converted to OPT_BOOL() and
On 03/28/2013 05:52 PM, Junio C Hamano wrote:
You could force rev-parse to resolve the input to an existing
object, with something like this:
git rev-parse --verify $ARG^{}
It will unwrap a tag, so the output may end up pointing at a object
that is different from $ARG in such a
Michael Haggerty mhag...@alum.mit.edu writes:
1. An SHA1 is a canonical representation of the argument, useful for
example as the key in a hash map for for looking for the presence of a
commit in a rev-list output.
2. An SHA1 is persistent. For example, I use them when caching
benchmark
Junio C Hamano gits...@pobox.com writes:
3. Verifying arguments at one spot centralizes error-checking at the
start of a script and eliminates one reason for random git commands to
fail later (when error recovery is perhaps more difficult).
Not necessarily, unless your script is a very
Kochi along with Trivandrum are the actual popular websites meant for
searching with this specific The lord's Distinctive Condition. Searching
Along with Tamil Nadu. This particular handicrafts associated with Tamil
Nadu may get rid of the drop inside your budget. Towards the top of superb
along
On 03/30/2013 05:09 AM, Junio C Hamano wrote:
So why not verify arguments while making sure of their type early
with 'rev-parse --verify $userinput^{desiredtype}?
Yes, that's a better solution in almost all cases. Thanks for the tip.
(It doesn't change my opinion that the documentation for
This is a reasonably irritating thing should you ever're unable to choose a
great reward * thomas sabo charms http://www.cheapthomassaboukshop.co.uk/
* goods in your personalized buddy and also cherished one particular,
becoming transferred in nearly special day. The initial thomas sabo charms
66 matches
Mail list logo
