On Fri, Feb 7, 2014 at 1:10 AM, Junio C Hamano gits...@pobox.com wrote:
Christian Couder chrisc...@tuxfamily.org writes:
diff --git a/git.c b/git.c
index 3799514..1420b58 100644
--- a/git.c
+++ b/git.c
@@ -383,6 +383,7 @@ static void handle_internal_command(int argc, const char
**argv)
Hi,
I think I have found a bug related to submodules and directory diff.
See the details at hXXp://stackoverflow.com/q/21623155/337621.
If you need any further details, just ask.
Regards,
Gábor Lipták
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Thanks for your clear response. I can see where I went wrong now.
On Thu, Feb 6, 2014 at 4:10 PM, David Kastrup d...@gnu.org wrote:
Vincent van Ravesteijn v...@lyx.org writes:
The commits that are in the log for master and which are not in the
log for originssh/master are merged in at 6833fd4
On Fri, Feb 07, 2014 at 09:43:46AM +, Francis Stephens wrote:
Thanks for your clear response. I can see where I went wrong now.
Maybe something like this would help avoid confusion a bit in the
future? This toy patch puts a horizontal line as a break between two
commits if they are not
On 7 February 2014 18:26, Duy Nguyen pclo...@gmail.com wrote:
On Fri, Feb 07, 2014 at 09:43:46AM +, Francis Stephens wrote:
Thanks for your clear response. I can see where I went wrong now.
Maybe something like this would help avoid confusion a bit in the
future? This toy patch puts a
On Feb 6, 2014, at 10:31 PM, Andrew Keller wrote:
When displaying a blob in gitweb, if it's an image, specify constraints for
maximum display width and height to prevent the image from overflowing the
frame of the enclosing page_body div.
This change assumes that it is more desirable to see
Junio C Hamano gitster at pobox.com writes:
Instead of adding a boolean --break-ok that is hidden, why not
adding an exposed boolean --daemonize, and let auto-gc run in the
background? With the recent do not let more than one gc run at the
same time, that should give a lot more pleasant end
On Fri, Feb 7, 2014 at 4:31 AM, Andrew Keller and...@kellerfarm.com wrote:
I recently used Git to archive a set of scanned photos, and I used gitweb to
provide access to them. Overall, everything worked well, but I found it
undesirable that I had to zoom out in my browser on every photo to
Hello
Rockstar Energy Drink seeks people, truck drivers and all car owners above
20 years old to getpaid driving their car for advertisement you only do advert
for Rockstar Energy Drink plastered on there cars . The ads are typically
vinyl also known as auto wraps that almost seem to be
On Fri, Feb 7, 2014 at 7:36 PM, chris j...@hotmail.com wrote:
Junio C Hamano gitster at pobox.com writes:
Instead of adding a boolean --break-ok that is hidden, why not
adding an exposed boolean --daemonize, and let auto-gc run in the
background? With the recent do not let more than one gc
On Feb 7, 2014, at 7:35 AM, Vincent van Ravesteijn v...@lyx.org wrote:
On Fri, Feb 7, 2014 at 4:31 AM, Andrew Keller and...@kellerfarm.com wrote:
I recently used Git to archive a set of scanned photos, and I used gitweb to
provide access to them. Overall, everything worked well, but I found
Andrew Keller and...@kellerfarm.com wrote:
With that said, I don't think it's unreasonable for a software project
to contain images larger than a browser window. And, when that happens,
I'm pretty confident that the default behavior should be to scale the
image down so the user can see the
Dear One,
How are you and your family, hope all is well ? As the world is
defined as a global village, I don't want you to get this letter as a
surprise but as an opportunity that will put smile on your face. With
due respect I propose this business to you, to make it brief I want to
transfer $3.5
Duy Nguyen pclouds at gmail.com writes:
On Fri, Feb 7, 2014 at 7:36 PM, chris jugg at hotmail.com wrote:
Junio C Hamano gitster at pobox.com writes:
Instead of adding a boolean --break-ok that is hidden, why not
adding an exposed boolean --daemonize, and let auto-gc run in the
background?
Here I'm preparing tree-diff.c to be ready for the new tree-walker, so that the
final change is tractable and looks good and non noisy. Some small speedups
are gained along the way. The final bits are almost ready, but I don't want to
release them in a hurry.
Please apply and thanks,
Kirill
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
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 commit this will allow to reduce intermediate calls, when
recursing into subtrees - at that stage we know only subtree sha1, and
it is natural for tree walker to start from that phase. For now we do
diff_tree
show_path
diff_tree_sha1
diff_tree
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
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
Since 74aa4a18 (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.
Signed-off-by:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
index b0fa738..fb11073 100755
--- a/t/t5537-fetch-shallow.sh
+++ b/t/t5537-fetch-shallow.sh
@@ -200,5 +200,29 @@ EOF
)
'
+# This test is tricky. We need large enough
Christian Couder christian.cou...@gmail.com writes:
On Fri, Feb 7, 2014 at 1:10 AM, Junio C Hamano gits...@pobox.com wrote:
Christian Couder chrisc...@tuxfamily.org writes:
diff --git a/git.c b/git.c
index 3799514..1420b58 100644
--- a/git.c
+++ b/git.c
@@ -383,6 +383,7 @@ static void
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.
Christian Couder chrisc...@tuxfamily.org writes:
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
execute command from ... is fine, but I wish there were more
details before S-o-b line. Is is not worth explaining what happens
to the output, and what the facility is used for in general?
Duy Nguyen wrote:
Don't take it the wrong way. I was just summarizing the last round. It
surprised me though that this went under my radar. Perhaps a bug
tracker is not a bad idea after all (if Jeff went missing, this bug
could fall under the crack)
I'm happy to plug
-
Jonathan Nieder jrnie...@gmail.com writes:
Duy Nguyen wrote:
Don't take it the wrong way. I was just summarizing the last round. It
surprised me though that this went under my radar. Perhaps a bug
tracker is not a bad idea after all (if Jeff went missing, this bug
could fall under the
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):
- 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
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
Junio C Hamano gits...@pobox.com writes:
... RUN_SETUP at 7/14 and then change the same line to have RUN_SETUP
when you start to need it could be an option; I am *not* suggesting
that.
Sorry, typo. s/could be an option;/;/
--
To unsubscribe from this list: send the line unsubscribe git in
Am 07.02.2014 10:15, schrieb Gábor Lipták:
I think I have found a bug related to submodules and directory diff.
See the details at hXXp://stackoverflow.com/q/21623155/337621.
Let's inline the recipe one finds after decrypting this link:
~/Projects/MAINMODULE/platform/SUBMODULE [master]$ git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
The tip of 'master' has been tagged as v1.9.0-rc3. As a workaround
to make life easier for third-party tools, the upcoming major
release will
A release candidate Git v1.9.0-rc3 is now available for testing
at the usual places. Hopefully this will be the last one before the
final, scheduled to happen sometime late next week.
The release tarballs are found at:
http://code.google.com/p/git-core/downloads/list
and their SHA-1
Am 04.02.2014 01:01, schrieb Jonathan Nieder:
Jens Lehmann wrote:
--- /dev/null
+++ b/Documentation/recurse-submodules-update.txt
@@ -0,0 +1,8 @@
+--[no-]recurse-submodules::
+Using --recurse-submodules will update the work tree of all
+initialized submodules according to the commit
Am 03.02.2014 23:23, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de writes:
This commit adds the functions and files needed for configuration,
Please just say Add the functions and files needed for
Roger that.
+++ b/Documentation/recurse-submodules-update.txt
@@ -0,0 +1,8
Am 03.02.2014 23:40, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de writes:
This new option will allow the user to not only reset the work tree of
the superproject but to also update the work tree of all initialized
submodules (so they match the SHA-1 recorded in the superproject)
Golang is quickly becoming one of the major programming languages.
This change switches on golang syntax highlight support by default
in gitweb rather than asking the users to do it using config files.
Signed-off-by: Pavan Kumar Sunkara pavan.sss1...@gmail.com
---
gitweb/gitweb.perl |2 +-
Am 03.02.2014 23:56, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de writes:
+set_config_update_recurse_submodules(
+
parse_update_recurse_submodules_arg(--recurse-submodules-default,
+recurse_submodules_default),
+
Am 04.02.2014 00:01, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de writes:
This new option will allow the user to not only update the work tree of
the superproject according to the merge result but to also update the
work tree of all initialized submodules (so they match the SHA-1
Am 03.02.2014 21:10, schrieb W. Trevor King:
On Mon, Feb 03, 2014 at 08:52:49PM +0100, Jens Lehmann wrote:
Implement the functionality needed to enable work tree manipulating
commands to that a deleted submodule should not only affect the index
(leaving all the files of the submodule in the
Am 03.02.2014 21:19, schrieb W. Trevor King:
On Mon, Feb 03, 2014 at 08:54:17PM +0100, Jens Lehmann wrote:
Implement the functionality needed to enable work tree manipulating
commands so that an changed submodule does not only affect the index but
it also updates the work tree of any
Am 04.02.2014 01:11, schrieb Duy Nguyen:
On Tue, Feb 4, 2014 at 2:54 AM, Jens Lehmann jens.lehm...@web.de wrote:
Implement the functionality needed to enable work tree manipulating
commands so that an changed submodule does not only affect the index but
it also updates the work tree of any
The highlight project which is being used by gitweb supports this. I
checked it before submitting the patch.
Thanks
On Sat, Feb 8, 2014 at 3:24 AM, Junio C Hamano gits...@pobox.com wrote:
Pavan Kumar Sunkara pavan.sss1...@gmail.com writes:
Golang is quickly becoming one of the major
Pavan Kumar Sunkara pavan.sss1...@gmail.com writes:
Golang is quickly becoming one of the major programming languages.
This change switches on golang syntax highlight support by default
in gitweb rather than asking the users to do it using config files.
Looks trivially harmless ;-)
I
Sorry. I misunderstood your message. Yes, I guess lazy loading the
supported file extensions would be better. But not all highlighters
support `-p` option. So, I think its better to leave it to the user.
Thanks
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a
Jens Lehmann jens.lehm...@web.de writes:
I think the user needs to sort things out, just like she has to do
when a file has a merge conflict. But unfortunately we cannot use
conflict markers here, so I'd propose the following:
* When merge proposes a merge resolution (which it does today by
On Fri, Feb 07, 2014 at 02:00:23PM -0800, Junio C Hamano wrote:
Jens Lehmann jens.lehm...@web.de writes:
I think the user needs to sort things out, just like she has to do
when a file has a merge conflict. But unfortunately we cannot use
conflict markers here, so I'd propose the following:
Pavan Kumar Sunkara pavan.sss1...@gmail.com writes:
Sorry. I misunderstood your message. Yes, I guess lazy loading the
supported file extensions would be better. But not all highlighters
support `-p` option. So, I think its better to leave it to the user.
Yes, those highlighters that do not
Yeah. I agree with you.
I am currently looking into allowing users to customize the parameters
given to their highlighter. I will try to look into this.
Thanks
On Sat, Feb 8, 2014 at 4:31 AM, Junio C Hamano gits...@pobox.com wrote:
Pavan Kumar Sunkara pavan.sss1...@gmail.com writes:
Sorry. I
On Fri, Feb 07, 2014 at 10:01:08AM -0800, Junio C Hamano wrote:
Here is the difference between the posted series and what I queued
after applying the changes suggested during the review.
Thanks.
I was going to send a reroll after the received comments. Could you
put this on top of 6/6, just
On Thu, Feb 06, 2014 at 02:35:33PM -0500, Jeff King wrote:
On Thu, Feb 06, 2014 at 10:10:35PM +0700, Nguyễn Thái Ngọc Duy wrote:
Originally I had t5537 use port 5536 and 5538 use port 5537(!). Then
Jeff found my fault so I changed port in t5537 from 5536 to 5537 in
3b32a7c (t5537: fix
On Mon, Feb 03, 2014 at 01:42:06PM -0800, Junio C Hamano wrote:
+ --gpg-sign)
+ gpg_sign_opt=-S
+ ;;
+ --gpg-sign=*)
+ # Try to quote only the argument, as this will appear in
human-readable
+ # output as well as being passed to commands.
2014-02-08 Junio C Hamano gits...@pobox.com:
A release candidate Git v1.9.0-rc3 is now available for testing
at the usual places. Hopefully this will be the last one before the
final, scheduled to happen sometime late next week.
The following changes since commit
Hello,
I am a git and CVS newbie, I bought and red most of the excellent Pro
Git book by Scott Chacon, but I still have a doubt. I have a package
that I distribute in two versions differing only in one library:
version_A uses this library, version_B uses my own code to replace it.
For
On Sat, Feb 08, 2014 at 02:06:41AM +, Carlos Pereira wrote:
Hello,
I am a git and CVS newbie, I bought and red most of the excellent
Pro Git book by Scott Chacon, but I still have a doubt. I have a
package that I distribute in two versions differing only in one
library: version_A uses
Since recent documentation uses terms like 'staged' and 'staging area',
--staged is more in line with other documentation and to be pfeferred
over --cached.
Signed-off-by: Soren Brinkmann soren.brinkm...@xilinx.com
---
Documentation/git-diff.txt | 6 +++---
1 file changed, 3 insertions(+), 3
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
cache.h | 1 +
daemon.c | 30 --
setup.c | 24
3 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/cache.h b/cache.h
index dc040fb..264b6f1 100644
--- a/cache.h
+++
`gc --auto` takes time and can block the user temporarily (but not any
less annoyingly). Make it run in background on systems that support
it. The only thing lost with running in background is printouts. But
gc output is not really interesting. You can keep it in foreground by
changing
(Dropped some CC as this becomes a different topic)
On Sat, Feb 8, 2014 at 2:20 AM, Jonathan Nieder jrnie...@gmail.com wrote:
Duy Nguyen wrote:
Don't take it the wrong way. I was just summarizing the last round. It
surprised me though that this went under my radar. Perhaps a bug
tracker is
On Sat, Feb 8, 2014 at 6:47 AM, Jeff King p...@peff.net wrote:
Thinking on this more, I wonder if we should just do something like
this:
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index bfdff2a..c82b4ee 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -64,7 +64,9 @@ case $(uname) in
61 matches
Mail list logo
