Trøst af skoen er høflighed på de teknologisk avancerede Nike Air Max
Cushioning system. Denne plan er placeret under sko på er bedst til at
absorbere stød genereret i virkningen. Dette er ikke overført på runner
såvel som konklusion resultatet er virkelig en sko, Nike Free 5.0 Sko
Billigt
On Tue, Jan 28, 2014 at 01:21:43AM -0800, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
The git-repack command always passes `--honor-pack-keep`
to pack-objects. This has traditionally been a good thing,
as we do not want to duplicate those objects in a new pack,
and we are not
Trøst af skoen er høflighed på de teknologisk avancerede Nike Air Max
Cushioning system. Denne plan er placeret under sko på er bedst til at
absorbere stød genereret i virkningen. Dette er ikke overført på runner
såvel som konklusion resultatet er virkelig en sko, Nike Free 5.0 Sko
Billigt
On 02/21/2014 07:21 PM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
cache.h | 16
1 file changed, 16 insertions(+)
diff --git a/cache.h b/cache.h
index dc040fb..0ecd1c8 100644
---
Hi there,
I'm fairly new to git and I wanted to ask about a certain behavior
that I want to fix myself (if you agree with me that it is a
misbehavior)... since I've never contributed to open source and it'll
be an important step for me to start and get something done.
In general, whenever
On Mon, Feb 24, 2014 at 12:24:42PM +0800, Tay Ray Chuan wrote:
What happens here when there is an alternate status format _and_
--verbose is used? If I say git commit --porcelain it should imply
--dry-run. But git commit --porcelain --verbose no longer does so
after your patch.
I
Nicolas, thanks for the very fast feedback!
On 02/21/2014 06:33 PM, Nicolas Pitre wrote:
On Fri, 21 Feb 2014, Michael Haggerty wrote:
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Minor nits below.
---
object.c | 23 ++-
object.h | 7 +++
2 files
Hi there,
I'm fairly new to git and I wanted to ask about a certain behavior that
I want to fix myself (if you agree with me that it is a misbehavior)...
since I've never contributed to open source and it'll be an important
step for me to start and get something done.
In general, whenever
On Mon, Feb 24, 2014 at 12:10:04AM -0500, Jack Nagel wrote:
There seems to be a difference in the behavior of git push depending
on whether remote.pushdefault is defined before or after
branch.name.pushremote in .git/config.
[...]
I would expect the order that things are defined in the
On Mon, Feb 24, 2014 at 08:55:41PM +1300, Chris Packham wrote:
Thanks for the response. I did set this environment variable in my
.bashrc like so:
export GIT_PAGER=less
However after I do a 'git log' it is just spitting it out all at once
and not entering the pager.
Um OK
On Fri, Feb 21, 2014 at 5:32 PM, Michael Haggerty mhag...@alum.mit.edu wrote:
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
cache.h | 16
1 file changed, 16 insertions(+)
diff --git a/cache.h b/cache.h
index dc040fb..0ecd1c8 100644
--- a/cache.h
+++ b/cache.h
I used to repack older part of history manually with a deeper depth,
mark the result with the .keep bit, and then repack the whole thing
again to have the remainder in a shallower depth. Something like:
git rev-list --objects v1.5.3 |
git pack-objects --depth=128
On 02/24/2014 10:24 AM, Christian Couder wrote:
On Fri, Feb 21, 2014 at 5:32 PM, Michael Haggerty mhag...@alum.mit.edu
wrote:
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
cache.h | 16
1 file changed, 16 insertions(+)
diff --git a/cache.h b/cache.h
index
Johan Herland jo...@herland.net wrote on 02/24/2014 02:29:10:
On Wed, Feb 19, 2014 at 12:10 AM, Duy Nguyen pclo...@gmail.com wrote:
On Tue, Feb 18, 2014 at 9:46 PM, Johan Herland jo...@herland.net wrote:
On Mon, Feb 17, 2014 at 11:48 AM, yann.dir...@bertin.fr wrote:
The recent git-note
On Mon, Feb 24, 2014 at 11:27 AM, ydir...@free.fr wrote:
Johan Herland jo...@herland.net wrote on 02/24/2014 02:29:10:
I've been thinking about this for a while now, and I find myself
agreeing more and more with Junio's argument in the linked thread.
I think notes are fundamentally - like
Omar:
On Mon, Feb 24, 2014 at 3:32 AM, Omar Othman omar.oth...@booking.com wrote:
In general, whenever something a user should do, git always tells. So, for
example, when things go wrong with a merge, you have the option to abort.
When you are doing a rebase, git tells you to do git commit
Move code for finding paths for which diff(commit,parent_i) is not-empty
for all parents to separate function - at present we have generic (and
slow) code for this job, which translates 1 n-parent problem to n
1-parent problems and then intersect results, and will be adding another
limited, but
Hello up there.
Here go combine-diff speedup patches in form of first reworking diff
tree-walker to work in general case - when a commit have several parents, not
only one - we are traversing all 1+nparent trees in parallel.
Then we are taking advantage of the new diff tree-walker for speeding
Judging from sample outputs and tests nothing changes in diff -c output,
and this change will help later patches, when we'll be refactoring paths
scanning into its own function with several variants - the
show_log_first logic / code will stay common to all of them.
NOTE: only now we have to take
We reworked all its users to use the functionality through
diff_tree_sha1 variant in recent patches (see tree-diff: allow
diff_tree_sha1 to accept NULL sha1 and what comes next).
diff_tree() is now not used outside tree-diff.c - make it static.
Signed-off-by: Kirill Smelkov k...@mns.spb.ru
---
Since previous commit, this function does not compare entry hashes, and
mode are compared fully outside of it. So what it does is compare entry
names and DIR bit in modes. Reflect this in its name.
Add documentation stating the semantics, and move the note about
files/dirs comparison to it.
Since an earlier Finally switch over tree descriptors to contain a
pre-parsed entry, we can safely access all tree_desc-entry fields
directly instead of first extracting them through
tree_entry_extract.
Use it. The code generated stays the same - only it now visually looks
cleaner.
Currently both compare_tree_entry() and show_path() invoke opt diff
callbacks (opt-add_remove() and opt-change()), and also they both have
code which decides whether to recurse into sub-tree, and whether to emit
a tree as separate entry if DIFF_OPT_TREE_IN_RECURSIVE is set.
I.e. we have code
via teaching tree_entry_pathcmp() how to compare empty tree descriptors:
While walking trees, we iterate their entries from lowest to highest in
sort order, so empty tree means all entries were already went over.
If we artificially assign +infinity value to such tree entry, it will
go after all
Brandon McCaig bamcc...@gmail.com writes:
Unlike a merge, when you pop a stash that history is lost. If you
screw up the merge and the stash is dropped then there's generally no
reliable way to get it back. I think that it's correct behavior for
the stash to not be dropped if the merge
It is neither used there as input, nor the output written through it, is
used outside.
Signed-off-by: Kirill Smelkov k...@mns.spb.ru
Signed-off-by: Junio C Hamano gits...@pobox.com
---
( re-posting without change )
tree-diff.c | 17 -
1 file changed, 8 insertions(+), 9
As was recently shown in combine-diff: optimize
combine_diff_path sets intersection, combine-diff runs very slowly. In
that commit we optimized paths sets intersection, but that accounted
only for ~ 25% of the slowness, and as my tracing showed, for linux.git
v3.10..v3.11, for merges a lot of time
As described in previous commit, when recursing into sub-trees, we can
use lower-level tree walker, since its interface is now sha1 based.
The change is ok, because diff_tree_sha1() only invokes
__diff_tree_sha1(), and also, if base is empty, try_to_follow_renames().
But base is not empty here,
In the next patch we'll have to use alloca() for performance reasons,
but since alloca is non-standardized and is not portable, let's have a
trick with compatibility wrappers:
1. at configure time, determine, do we have working alloca() through
alloca.h, and define
#define HAVE_ALLOCA_H
Because if there is, such two tree entries would never be compared as
equal - the code in base_name_compare() explicitly compares modes, if
there is a change for dir bit, even for equal paths, entries would
compare as different.
The code I'm removing here is from 2005 April 262e82b4 (Fix
We don't need special code for showing added/removed subtree, because we
can do the same via diff_tree_sha1, just passing NULL for absent tree.
And compared to show_tree(), which was calling show_entry() for every
tree entry, that would lead to the same show_entry() callings:
show_tree(t):
Previously diff_tree(), which is now named __diff_tree_sha1(), was
generating diff_filepair(s) for two trees t1 and t2, and that was
usually used for a commit as t1=HEAD~, and t2=HEAD - i.e. to see changes
a commit introduces.
In Git, however, we have fundamentally built flexibility in that a
We moved all action-taking code below show_path() in recent HEAD~~
(tree-diff: move all action-taking code out of compare_tree_entry).
Signed-off-by: Kirill Smelkov k...@mns.spb.ru
Signed-off-by: Junio C Hamano gits...@pobox.com
---
( re-posting without change )
tree-diff.c | 3 ---
1 file
- let it do only comparison.
This way the code is cleaner and more structured - cmp function only
compares, and the driver takes action based on comparison result.
There should be no change in performance, as effectively, we just move
if series from on place into another, and merge it to
It does, but we'll be reworking it in the next patch after it won't, and
besides it is better to stick to standard
strcmp/memcmp/base_name_compare/etc... convention, where comparison
function returns 0, =0, 0
Regarding performance, comparing for 0, =0, 0 should be a little bit
faster, than
instead of allocating it all the time for every subtree in
__diff_tree_sha1, let's allocate it once in diff_tree_sha1, and then all
callee just use it in stacking style, without memory allocations.
This should be faster, and for me this change gives the following
slight speedups for
git log
Jeff King p...@peff.net writes:
On Sat, Feb 22, 2014 at 10:29:22AM +0700, Nguyễn Thái Ngọc Duy wrote:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
The new prereq GNULINUX is an ugly workaround until people provide
strverscmp compat implementation. I hope that will happen soon
David,
Thanks for the helpful reply.
As you suggested, I modified the .gitconfig file to have:
[difftool test]
cmd = echo \$LOCAL\ \$REMOTE\
and ran
$ git difftool -t test
An example of the the resulting console output is:
C:/Users/Paul/AppData/Local/Temp/I8L2Bc_WriteTestParameters.vi
Max Horn m...@quendi.de writes:
On 21.02.2014, at 19:04, Junio C Hamano gits...@pobox.com wrote:
Isn't it possible for some helpers to _do_ want to
tell us that it did not have to force after all by _not_ saying
forced update and overwrite -forced_update with zero?
Yes to the first part,
Junio C Hamano gits...@pobox.com writes:
But I think I was worried too much into the future---I agree that
the code can stay as you proposed until such a remote-helper needs
more support, because overwrite with zero is necessary but is
probably not sufficient---it also may need to be able to
Michael Haggerty mhag...@alum.mit.edu writes:
Contrariwise, I thought about it again and believe that it *is*
important for the docstring to mention explicitly that the return value
is architecture-dependent
As it gives an internal hash value which should not leak to the
outside world (e.g.
Jeff King p...@peff.net writes:
On Fri, Feb 21, 2014 at 12:21:13PM -0800, Junio C Hamano wrote:
Tay Ray Chuan rcta...@gmail.com writes:
In particular, show that --short and --porcelain, while implying
--dry-run, do not return the same exit code as --dry-run. This is due to
the
Duy Nguyen pclo...@gmail.com writes:
On Mon, Feb 17, 2014 at 07:15:32PM +0700, Nguyễn Thái Ngọc Duy wrote:
@@ -777,6 +778,8 @@ static int prepare_to_commit(const char *index_file,
const char *prefix,
_(Please enter the commit message for your
changes.
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
definitely better than raw numbers but not really important
I would appreciate if it were an optional feature.
diff --git a/diff.c b/diff.c
index 8e4a6a9..ca2b92a 100644
---
Thomas Rast t...@thomasrast.ch writes:
I spoke too soon; it breaks the test I wrote to cover this case, for a
reason that gives me a headache.
When we hit the conditional
- if (!one-sha1_valid ||
- reuse_worktree_file(name, one-sha1, 1)) {
+ if (!S_ISGITLINK(one-mode)
+
Robin H. Johnson robb...@gentoo.org writes:
The only other clean alternative would be implementing ONLY
--sparse-checkout-from, and letting uses use fds creatively:
--sparse-checkout-from (echo X; echo Y)
Not all POSIX shells have such an abomination that is process
substitution. You can
David Aguilar dav...@gmail.com writes:
Modern versions of git submodule use .git-files to setup the
submodule directory. When run in a git submodule-created
repository git difftool --dir-diff dies with the following
error:
$ git difftool -d HEAD~
fatal: This operation must be
Richard Lowe richl...@richlowe.net writes:
Bitfields need to specify their signedness explicitly or the compiler is
free to default as it sees fit. With compilers that default 'unsigned'
(SUNWspro 12 seems to do this) the tri-state nature of is_binary
vanishes and all files are treated as
Am 24.02.2014 um 18:06 schrieb Junio C Hamano gits...@pobox.com:
Junio C Hamano gits...@pobox.com writes:
But I think I was worried too much into the future---I agree that
the code can stay as you proposed until such a remote-helper needs
more support, because overwrite with zero is
Jeff King p...@peff.net writes:
Yes, with a few exceptions, we usually try to make the ordering in the
config file irrelevant. This is a bug. The patch below should fix it.
Looks good. Thanks.
-- 8 --
Subject: remote: handle pushremote config in any order
The remote we push can be
Thomas Gummerer t.gumme...@gmail.com writes:
previous round was at $gmane/242198.
Since then I've squashed the fixes suggested by Junio, added a test
showing what should happen if an index file is present and
GIT_INDEX_VERSION is set and fixed the typo found by Eric.
Looks good; thanks.
--
John Marshall j...@sanger.ac.uk writes:
Document --keep-index's short form -k in both main synopsis and
the save synopsis in the Options section.
Signed-off-by: John Marshall j...@sanger.ac.uk
---
Looks good; thanks.
A very small documentation patch: I'd not read the main synopsis
Michael Haggerty mhag...@alum.mit.edu writes:
I was reading around in the neighborhood of fsck, objects, and packs
and I had the familiar and discouraging experience of having to read
code all the way up and down the callstack to understand *anything*.
Please let's all make more of an effort
Michael Haggerty mhag...@alum.mit.edu writes:
Junio, what would be easiest for you? I suggest that I rebase this
patch series back on top of mh/replace-refs-variable-rename when re-rolling.
Hmph, I suspect I do not care too deeply either way, as a mismerge
would be fairly obvious (nobody
Michael Haggerty wrote:
-/*
- * NOTE! This returns a statically allocated buffer, so you have to be
- * careful about using it. Do an xstrdup() if you need to save the
- * filename.
- *
- * Also note that this returns the location for creating. Reading
- * SHA1 file can happen from any
Jeff King p...@peff.net writes:
Sorry, this one slipped through the cracks. Here's a re-roll addressing
your comments.
...
- In the context of pack-objects, the name --honor-pack-keep
makes sense; it is understood that pack-objects will _not_ remove
kept packfile, so honoring can
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
git am already ignores the [PATCH X/Y] prefix that format-patch
adds. Is it possible to get it to ignore any additional prefix that a
bug tracker mangles into the subject line? i.e. bug #:?
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.17
On Mon, Feb 24, 2014 at 3:06 AM, Jeff King p...@peff.net wrote:
On Mon, Feb 24, 2014 at 08:55:41PM +1300, Chris Packham wrote:
Thanks for the response. I did set this environment variable in my
.bashrc like so:
export GIT_PAGER=less
However after I do a 'git log' it is just spitting
Junio C Hamano gits...@pobox.com writes:
Thomas Gummerer t.gumme...@gmail.com writes:
previous round was at $gmane/242198.
Since then I've squashed the fixes suggested by Junio, added a test
showing what should happen if an index file is present and
GIT_INDEX_VERSION is set and fixed the
Jeff King p...@peff.net writes:
If an ident line has a ridiculous date value like (2^64)+1,
we currently just pass ULONG_MAX along to the date code,
which can produce nonsensical dates.
On systems with a signed long time_t (e.g., 64-bit glibc
systems), this actually doesn't end up too bad.
Junio C Hamano gits...@pobox.com writes:
Junio C Hamano gits...@pobox.com writes:
Thomas Gummerer t.gumme...@gmail.com writes:
previous round was at $gmane/242198.
Since then I've squashed the fixes suggested by Junio, added a test
showing what should happen if an index file is present
On Mon, Feb 24, 2014 at 11:50:00AM -0800, Junio C Hamano wrote:
We also recognize overflow in the timezone field, which
could produce nonsensical results. In this case we show the
parsed date, but in UTC.
Both are good measures to fallback to sanity, but why is that
if/else? In other
On 02/24/2014 07:18 PM, Jakub Narębski wrote:
Michael Haggerty wrote:
-/*
- * NOTE! This returns a statically allocated buffer, so you have to be
- * careful about using it. Do an xstrdup() if you need to save the
- * filename.
- *
- * Also note that this returns the location for
Hi Phillip,
Phillip Susi wrote:
git am already ignores the [PATCH X/Y] prefix that format-patch
adds. Is it possible to get it to ignore any additional prefix that a
bug tracker mangles into the subject line? i.e. bug #:?
builtin/mailinfo.c is the place to start (see git-mailinfo(1)).
Hi,
Michael Haggerty wrote:
No, this hasn't changed. I've been documenting public functions in the
header files above the declaration, and private ones where they are
defined. So I moved the documentation for this function to cache.h:
+/*
+ * Return the name of the file in the local
Phillip Susi ps...@ubuntu.com writes:
git am already ignores the [PATCH X/Y] prefix that format-patch
adds. Is it possible to get it to ignore any additional prefix that a
bug tracker mangles into the subject line? i.e. bug #:?
I think applypatch-msg hook is your friend in a case like
Jeff King p...@peff.net writes:
On Mon, Feb 24, 2014 at 11:50:00AM -0800, Junio C Hamano wrote:
We also recognize overflow in the timezone field, which
could produce nonsensical results. In this case we show the
parsed date, but in UTC.
Both are good measures to fallback to sanity, but
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 2/24/2014 3:19 PM, Junio C Hamano wrote:
Phillip Susi ps...@ubuntu.com writes:
git am already ignores the [PATCH X/Y] prefix that
format-patch adds. Is it possible to get it to ignore any
additional prefix that a bug tracker mangles into the
Junio C Hamano gits...@pobox.com writes:
Jeff King p...@peff.net writes:
Yes, with a few exceptions, we usually try to make the ordering in the
config file irrelevant. This is a bug. The patch below should fix it.
Looks good. Thanks.
diff --git a/t/t5516-fetch-push.sh
On Mon, Feb 24, 2014 at 12:21:33PM -0800, Junio C Hamano wrote:
+if (date_overflows(date))
+date = 0;
+else {
+if (ident-tz_begin ident-tz_end)
+tz = strtol(ident-tz_begin, NULL, 10);
+if
Hi,
Phillip Susi wrote:
On 2/24/2014 3:19 PM, Junio C Hamano wrote:
Phillip Susi ps...@ubuntu.com writes:
git am already ignores the [PATCH X/Y] prefix that
format-patch adds. Is it possible to get it to ignore any
additional prefix that a bug tracker mangles into the subject
line? i.e.
On Mon, Feb 24, 2014 at 12:32:32PM -0800, Junio C Hamano wrote:
+test_expect_success 'branch.*.pushremote config order is irrelevant' '
+ mk_test one_repo heads/master
+ mk_test two_repo heads/master
+ test_config remote.one.url one_repo
+ test_config remote.two.url two_repo
+
Jeff King p...@peff.net writes:
On Mon, Feb 24, 2014 at 12:32:32PM -0800, Junio C Hamano wrote:
+test_expect_success 'branch.*.pushremote config order is irrelevant' '
+ mk_test one_repo heads/master
+ mk_test two_repo heads/master
+ test_config remote.one.url one_repo
+
Jeff King p...@peff.net writes:
On Mon, Feb 24, 2014 at 12:21:33PM -0800, Junio C Hamano wrote:
+ if (date_overflows(date))
+ date = 0;
+ else {
+ if (ident-tz_begin ident-tz_end)
+ tz = strtol(ident-tz_begin, NULL,
Am 24.02.2014 17:55, schrieb Junio C Hamano:
David Aguilar dav...@gmail.com writes:
Modern versions of git submodule use .git-files to setup the
submodule directory. When run in a git submodule-created
repository git difftool --dir-diff dies with the following
error:
$ git difftool
Thomas Gummerer t.gumme...@gmail.com writes:
Something along this line, perhaps?
Sorry about this, I didn't run the test suite without
TEST_GIT_INDEX_VERSION in config.mak which I obviously should have.
Yes, this looks good to me, thanks!
OK, will squash it (but using VAR:+isset instead of
On Mon, Feb 24, 2014 at 09:47:16AM -0800, Junio C Hamano wrote:
Robin H. Johnson robb...@gentoo.org writes:
The only other clean alternative would be implementing ONLY
--sparse-checkout-from, and letting uses use fds creatively:
--sparse-checkout-from (echo X; echo Y)
Not all POSIX shells
On Tue, Feb 25, 2014 at 12:20 AM, Junio C Hamano gits...@pobox.com wrote:
Duy Nguyen pclo...@gmail.com writes:
On Mon, Feb 17, 2014 at 07:15:32PM +0700, Nguyễn Thái Ngọc Duy wrote:
@@ -777,6 +778,8 @@ static int prepare_to_commit(const char *index_file,
const char *prefix,
On Mon, Feb 24, 2014 at 11:39 PM, Junio C Hamano gits...@pobox.com wrote:
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 1531c24..5e8c39a 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -771,6 +771,8 @@ case $(uname -s) in
;;
esac
+[ $(uname -o) = GNU/Linux ] test_set_prereq
On Tue, Feb 25, 2014 at 06:30:35AM +0700, Duy Nguyen wrote:
+[ $(uname -o) = GNU/Linux ] test_set_prereq GNULINUX
+
can pick up the value from GIT-BUILD-OPTIONS as a prerequisite (see the
way we handle NO_PERL for an example). Though if we can just grab the
glibc version as a
On Mon, Feb 24, 2014 at 11:21 PM, Kirill Smelkov k...@mns.spb.ru wrote:
Hello up there.
Here go combine-diff speedup patches in form of first reworking diff
tree-walker to work in general case - when a commit have several parents, not
only one - we are traversing all 1+nparent trees in
Duy Nguyen pclo...@gmail.com writes:
I think I described it incorrectly as conflict message while it's
not. This is the part to be cut out by the patch
# It looks like you may be committing a merge.
# If this is not correct, please remove the file.
# MERGE_HEAD
# and try again.
Robin H. Johnson robb...@gentoo.org writes:
On Mon, Feb 24, 2014 at 09:47:16AM -0800, Junio C Hamano wrote:
Robin H. Johnson robb...@gentoo.org writes:
The only other clean alternative would be implementing ONLY
--sparse-checkout-from, and letting uses use fds creatively:
Just a quick heads-up.
As the first wave for the post-1.9.0 development cycle, these topics
will be merged to 'master' (unless there are serious last minute
issues found) shortly:
+ kb/fast-hashmap 02-24/01-03
#18
+ nv/commit-gpgsign-config
Git help --all had listed all git commands, but no configured aliases.
This includes aliases as a separate listing, after commands in the main
git directory and other $PATH directories.
Signed-off-by: Joel Nothman joel.nothman at gmail.com
---
Documentation/git-help.txt | 4 +--
builtin/help.c
85 matches
Mail list logo
