Re: Recording the current branch on each commit?

2014-04-28 Thread David Kastrup
Johan Herland jo...@herland.net writes: Obviously, the feature would necessarily have to be optional, simply because Git would have to keep understanding the old commit object format for a LONG time (probably indefinitely), and there's nothing you can do to prevent others from creating

git version 1.9.0 missing git-http-push?

2014-04-28 Thread Silvola Tuomas
Hello, I installed git for windows 1.9.0 but any push operation I tried with it produced an error message saying git: 'http-push' is not a git command. Other commands like pull, add, and commit worked just fine. At the end of this day I noticed that C:\Program Files (x86)\Git\libexec\git-core

A failing attempt to use Git in a centralized environment

2014-04-28 Thread Marat Radchenko
Setup: 20 people (programmers, artists, designers) with prior SVN knowledge and a desire to use Git for a new project (mostly on programmers side). Non-programmers used TortoiseSVN before so choosing TortoiseGit as a GUI was an obvios step. We made an in-house presentation introducing basic

RE: Recording the current branch on each commit?

2014-04-28 Thread Max Kirillov
Hi. Obviously, the feature would necessarily have to be optional, simply because Git would have to keep understanding the old commit object format for a LONG time (probably indefinitely), and there's nothing you can do to prevent others from creating old-style commit objects. Doesn't git

RE: Recording the current branch on each commit?

2014-04-28 Thread Max Kirillov
Personally, I am _strongly_ opposed. How I name and juggle my private branches is nobody else's business in a distributed version control system. They are private. My personal workflow. Not part of a commit. Mercurial inherits the branch label from previous commit, unless it's specified

Re: Recording the current branch on each commit?

2014-04-28 Thread Christian Couder
From: Johan Herland jo...@herland.net Subject: Re: Recording the current branch on each commit? Date: Mon, 28 Apr 2014 01:39:26 +0200 On Sun, Apr 27, 2014 at 10:55 PM, Jeremy Morton ad...@game-point.net wrote: On 27/04/2014 20:33, Johan Herland wrote: On Sun, Apr 27, 2014 at 7:38 PM, Jeremy

Re: git version 1.9.0 missing git-http-push?

2014-04-28 Thread Marat Radchenko
Silvola Tuomas wrote Hello, I installed git for windows 1.9.0 but any push operation I tried with it produced an error message saying git: 'http-push' is not a git command. Other commands like pull, add, and commit worked just fine. At the end of this day I noticed that C:\Program Files

Re: [RFC/PATCH 1/2] trailer: fix to ignore any line starting with '#'

2014-04-28 Thread Christian Couder
On Mon, Apr 28, 2014 at 7:58 AM, Michael Haggerty mhag...@alum.mit.edu wrote: On 04/27/2014 10:12 PM, Christian Couder wrote: It looks like the commit-msg hook is passed a commit message that can contain lines starting with a '#'. Those comment lines will be removed from the commit message

[PATCH] PAGER_ENV: remove 'S' from $LESS by default

2014-04-28 Thread Matthieu Moy
By default, Git used to set $LESS to -FRSX if $LESS was not set by the user. The FRX flags actually make sense for Git (F and X because Git sometimes pipes short output to less, and R because Git pipes colored output). The S flag (chop long lines), on the other hand, is not related to Git and is a

[PATCH] Sleep 1 millisecond in poll() to avoid busy wait

2014-04-28 Thread Stepan Kasal
From: theoleblond theodore.lebl...@gmail.com Date: Wed, 16 May 2012 06:52:49 -0700 I played around with this quite a bit. After trying some more complex schemes, I found that what worked best is to just sleep 1 millisecond between iterations. Though it's a very short time, it still completely

Re: Recording the current branch on each commit?

2014-04-28 Thread Felipe Contreras
Jeremy Morton wrote: On 27/04/2014 09:51, Robin Rosenberg wrote: Currently, git records a checksum, author, commit date/time, and commit message with every commit (as get be seen from 'git log'). I think it would be useful if, along with the Author and Date, git recorded the name of the

Re: [PATCH] PAGER_ENV: remove 'S' from $LESS by default

2014-04-28 Thread David Kastrup
Matthieu Moy matthieu@imag.fr writes: By default, Git used to set $LESS to -FRSX if $LESS was not set by the user. The FRX flags actually make sense for Git (F and X because Git sometimes pipes short output to less, and R because Git pipes colored output). The S flag (chop long lines), on

Re: Recording the current branch on each commit?

2014-04-28 Thread Jeremy Morton
On 28/04/2014 09:32, Felipe Contreras wrote: some people to is to always merge with --no-ff, that way you see the branch name in the merge commit. But surely, it's recommended with Git that you try to avoid doing --no-ff merges to avoid commit noise? Nope. Different people have different

Re: git version 1.9.0 missing git-http-push?

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 9:36 AM, Marat Radchenko ma...@slonopotamus.org wrote: Silvola Tuomas wrote Hello, I installed git for windows 1.9.0 but any push operation I tried with it produced an error message saying git: 'http-push' is not a git command. Other commands like pull, add, and

Re: Recording the current branch on each commit?

2014-04-28 Thread Jeremy Morton
On 28/04/2014 03:30, Sitaram Chamarty wrote: On 04/28/2014 01:03 AM, Johan Herland wrote: Yeah, sure. Author and Date (and Committer, for that matter) is just metadata, and the current branch name is simply just another kind of metadata. All of them are more-or-less free-form text fields, and

Re: [PATCH] PAGER_ENV: remove 'S' from $LESS by default

2014-04-28 Thread Matthieu Moy
David Kastrup d...@gnu.org writes: There seem to be a few more occurences (git-sh-setup.sh and pager.c): Not since f82c3ffd862c7 (Wed Feb 5 2014, move LESS/LV pager environment to Makefile). Searching for LESS seems to implicate a few more possible candidates in contrib/examples:

Re: Recording the current branch on each commit?

2014-04-28 Thread Felipe Contreras
Jeremy Morton wrote: On 27/04/2014 10:09, Johan Herland wrote: On Sun, Apr 27, 2014 at 1:56 AM, Jeremy Mortonad...@game-point.net wrote: Currently, git records a checksum, author, commit date/time, and commit message with every commit (as get be seen from 'git log'). I think it would

Re: Recording the current branch on each commit?

2014-04-28 Thread Jeremy Morton
On 28/04/2014 07:45, Christian Couder wrote: Yes, it's possible. Yesterday, I sent the following patch: [RFC/PATCH 2/2] trailer: add examples to the documentation and it shows a commit-msg hook to do something like that: $ cat.git/hooks/commit-msgEOF #!/bin/sh git interpret-trailers

Re: git version 1.9.0 missing git-http-push?

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 10:48 AM, Erik Faye-Lund kusmab...@gmail.com wrote: So it seems that 08900987 (Decide whether to build http-push in the Makefile) makes a bad assumption about the availability of curl-config on new libcurl installations; it's not present on stock Windows builds. I

Re: Recording the current branch on each commit?

2014-04-28 Thread David Kastrup
Jeremy Morton ad...@game-point.net writes: On 28/04/2014 09:32, Felipe Contreras wrote: some people to is to always merge with --no-ff, that way you see the branch name in the merge commit. But surely, it's recommended with Git that you try to avoid doing --no-ff merges to avoid commit

Re: [PATCH] Sleep 1 millisecond in poll() to avoid busy wait

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 10:39 AM, Stepan Kasal ka...@ucw.cz wrote: From: theoleblond theodore.lebl...@gmail.com Date: Wed, 16 May 2012 06:52:49 -0700 I played around with this quite a bit. After trying some more complex schemes, I found that what worked best is to just sleep 1 millisecond

Re: Recording the current branch on each commit?

2014-04-28 Thread Felipe Contreras
Johan Herland wrote: On Sun, Apr 27, 2014 at 7:38 PM, Jeremy Morton ad...@game-point.net wrote: Whatsmore, tracking down which branch a commit pertains to is still rather difficult using this approach. You can go back through the history and find Merge branch 'pacman-minigame', but how do

Re: Recording the current branch on each commit?

2014-04-28 Thread Johan Herland
On Mon, Apr 28, 2014 at 11:01 AM, Jeremy Morton ad...@game-point.net wrote: On 28/04/2014 07:45, Christian Couder wrote: Yes, it's possible. Yesterday, I sent the following patch: [RFC/PATCH 2/2] trailer: add examples to the documentation and it shows a commit-msg hook to do something like

Re: Recording the current branch on each commit?

2014-04-28 Thread Jeremy Morton
On 28/04/2014 10:02, David Kastrup wrote: Jeremy Mortonad...@game-point.net writes: On 28/04/2014 09:32, Felipe Contreras wrote: some people to is to always merge with --no-ff, that way you see the branch name in the merge commit. But surely, it's recommended with Git that you try to avoid

Re: Recording the current branch on each commit?

2014-04-28 Thread Felipe Contreras
Jeremy Morton wrote: On 27/04/2014 20:33, Johan Herland wrote: The problem is not really less tidy commit trees - by which I gather you mean history graphs that are non-linear. IMHO, the history graph should reflect parallel/branched development when that is useful. Blindly rebasing

Re: Recording the current branch on each commit?

2014-04-28 Thread Jeremy Morton
On 28/04/2014 10:09, Johan Herland wrote: On Mon, Apr 28, 2014 at 11:01 AM, Jeremy Mortonad...@game-point.net wrote: On 28/04/2014 07:45, Christian Couder wrote: Yes, it's possible. Yesterday, I sent the following patch: [RFC/PATCH 2/2] trailer: add examples to the documentation and it

Re: Recording the current branch on each commit?

2014-04-28 Thread Jeremy Morton
On 28/04/2014 10:01, Felipe Contreras wrote: Jeremy Morton wrote: On 27/04/2014 20:33, Johan Herland wrote: The problem is not really less tidy commit trees - by which I gather you mean history graphs that are non-linear. IMHO, the history graph should reflect parallel/branched development

Re: Recording the current branch on each commit?

2014-04-28 Thread Felipe Contreras
Jeremy Morton wrote: On 28/04/2014 10:01, Felipe Contreras wrote: Jeremy Morton wrote: On 27/04/2014 20:33, Johan Herland wrote: The problem is not really less tidy commit trees - by which I gather you mean history graphs that are non-linear. IMHO, the history graph should reflect

Re: Recording the current branch on each commit?

2014-04-28 Thread Jeremy Morton
On 28/04/2014 10:17, Felipe Contreras wrote: I don't seem to what? I'm the one arguing for change, and I sent the patches to fix this default behavior. Well maybe you should work on phrasing things better - you come across as quite negative. -- Best regards, Jeremy Morton (Jez) -- To

Re: git version 1.9.0 missing git-http-push?

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 11:01 AM, Erik Faye-Lund kusmab...@gmail.com wrote: On Mon, Apr 28, 2014 at 10:48 AM, Erik Faye-Lund kusmab...@gmail.com wrote: So it seems that 08900987 (Decide whether to build http-push in the Makefile) makes a bad assumption about the availability of curl-config on

Re: Recording the current branch on each commit?

2014-04-28 Thread Sitaram Chamarty
On 04/28/2014 02:22 PM, Jeremy Morton wrote: On 28/04/2014 03:30, Sitaram Chamarty wrote: On 04/28/2014 01:03 AM, Johan Herland wrote: Yeah, sure. Author and Date (and Committer, for that matter) is just metadata, and the current branch name is simply just another kind of metadata. All of them

Re: Recording the current branch on each commit?

2014-04-28 Thread Sitaram Chamarty
On 04/28/2014 11:37 AM, David Kastrup wrote: Johan Herland jo...@herland.net writes: Obviously, the feature would necessarily have to be optional, simply because Git would have to keep understanding the old commit object format for a LONG time (probably indefinitely), and there's nothing you

Re: [PATCH v10 11/12] Documentation: add documentation for 'git interpret-trailers'

2014-04-28 Thread Michael Haggerty
On 04/25/2014 11:07 PM, Christian Couder wrote: From: Michael Haggerty mhag...@alum.mit.edu +OPTIONS +--- +--trim-empty:: + If the 'value' part of any trailer contains only whitespace, + the whole trailer will be removed from the resulting message. Does this apply to existing

[PATCH 04/32] read-cache: new API write_locked_index instead of write_index/write_cache

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/add.c| 6 ++ builtin/apply.c | 9 - builtin/checkout-index.c | 3 +-- builtin/checkout.c | 11 --- builtin/clone.c | 7 +++ builtin/commit.c | 33

[PATCH 00/32] Split index mode for very large indexes

2014-04-28 Thread Nguyễn Thái Ngọc Duy
I hinted about it earlier [1]. It now passes the test suite and with a design that I'm happy with (thanks to Junio for a suggestion about the rename problem). From the user point of view, this reduces the writable size of index down to the number of updated files. For example my webkit index v4

[PATCH 03/32] sequencer: do not update/refresh index if the lock cannot be held

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index bde5f04..7b886a6 100644 --- a/sequencer.c +++ b/sequencer.c @@ -679,7 +679,7 @@ static void read_and_refresh_cache(struct

[PATCH 01/32] ewah: fix constness of ewah_read_mmap

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- ewah/ewah_io.c | 4 ++-- ewah/ewok.h| 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ewah/ewah_io.c b/ewah/ewah_io.c index f7f700e..1c2d7af 100644 --- a/ewah/ewah_io.c +++ b/ewah/ewah_io.c @@ -110,9 +110,9 @@ int

[PATCH 05/32] read-cache: relocate and unexport commit_locked_index()

2014-04-28 Thread Nguyễn Thái Ngọc Duy
This function is now only used by write_locked_index(). Move it to read-cache.c (because read-cache.c will need to be aware of alternate_index_output later) and unexport it. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- cache.h | 1 - lockfile.c | 20

[PATCH 10/32] resolve-undo: be specific what part of the index has changed

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- cache.h| 1 + resolve-undo.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cache.h b/cache.h index 4133797..7155052 100644 --- a/cache.h +++ b/cache.h @@ -272,6 +272,7 @@ static inline unsigned int

[PATCH 08/32] read-cache: be specific what part of the index has changed

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- cache.h | 4 read-cache.c | 11 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cache.h b/cache.h index 57ad318..d692b74 100644 --- a/cache.h +++ b/cache.h @@ -268,6 +268,10 @@ static inline unsigned

[PATCH 11/32] unpack-trees: be specific what part of the index has changed

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- unpack-trees.c | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index 97fc995..a722685 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -246,7 +246,9 @@ static int

[PATCH 12/32] cache-tree: mark istate-cache_changed on cache tree invalidation

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/blame.c| 2 +- builtin/update-index.c | 4 ++-- cache-tree.c | 15 +++ cache-tree.h | 2 +- cache.h| 1 + read-cache.c | 6 +++--- unpack-trees.c | 2

[PATCH 09/32] update-index: be specific what part of the index has changed

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/update-index.c | 6 +++--- cache.h| 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index 42cbe4b..e0e881b 100644 --- a/builtin/update-index.c +++

[PATCH 07/32] read-cache: be strict about changed in remove_marked_cache_entries()

2014-04-28 Thread Nguyễn Thái Ngọc Duy
remove_marked_cache_entries() deletes entries marked with CE_REMOVE. But if there is no such entry, do not mark the index as changed because that could trigger an index update unnecessarily. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- read-cache.c | 2 ++ 1 file changed, 2

[PATCH 06/32] read-cache: store in-memory flags in the first 12 bits of ce_flags

2014-04-28 Thread Nguyễn Thái Ngọc Duy
We're running out of room for in-memory flags. But since b60e188 (Strip namelen out of ce_flags into a ce_namelen field - 2012-07-11), we copy the namelen (first 12 bits) to ce_namelen field. So those bits are free to use. Just make sure we do not accidentally write any in-memory flags back.

[PATCH 13/32] cache-tree: mark istate-cache_changed on cache tree update

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- cache-tree.c | 25 +++-- cache-tree.h | 2 +- merge-recursive.c | 4 +--- sequencer.c| 4 +--- test-dump-cache-tree.c | 7 --- 5 files changed, 18 insertions(+), 24

[PATCH 17/32] read-cache: split-index mode

2014-04-28 Thread Nguyễn Thái Ngọc Duy
This split-index mode is designed to keep write cost proportional to the number of changes the user has made, not the size of the work tree. (Read cost is another matter, to be dealt separately.) This mode stores index info in a pair of $GIT_DIR/index and $GIT_DIR/sharedindex.SHA-1. sharedindex

[PATCH 22/32] split-index: the reading part

2014-04-28 Thread Nguyễn Thái Ngọc Duy
CE_REMOVE'd entries are removed here because only parts of the code base (unpack_trees in fact) test this bit when they look for the presence of an entry. Leaving them may confuse the code ignores this bit and expects to see a real entry. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com ---

[PATCH 21/32] split-index: the writing part

2014-04-28 Thread Nguyễn Thái Ngọc Duy
prepare_to_write_split_index() does the major work, classifying deleted, updated and added entries. write_link_extension() then just writes it down. An observation is, deleting an entry, then adding it back is recorded as entry X is deleted, entry X is added, not entry X is replaced. This is

[PATCH 14/32] cache-tree: mark istate-cache_changed on prime_cache_tree()

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/read-tree.c | 2 +- builtin/reset.c | 2 +- cache-tree.c| 9 + cache-tree.h| 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/builtin/read-tree.c b/builtin/read-tree.c index

[PATCH 23/32] split-index: do not invalidate cache-tree at read time

2014-04-28 Thread Nguyễn Thái Ngọc Duy
We are sure that after merge_base_index() is done. cache-tree can still be used with the final index. So don't destroy cache tree. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- cache.h | 1 + read-cache.c | 3 ++- split-index.c | 1 + 3 files changed, 4 insertions(+), 1

[PATCH 19/32] read-cache: save deleted entries in split index

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Entries that belong to the base index should not be freed. Mark CE_REMOVE to track them. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- read-cache.c | 14 -- split-index.c | 12 split-index.h | 1 + 3 files changed, 21 insertions(+), 6 deletions(-) diff

[PATCH 24/32] split-index: strip pathname of on-disk replaced entries

2014-04-28 Thread Nguyễn Thái Ngọc Duy
We know the positions of replaced entries via the replace bitmap in link extension, so the name path does not have to be stored (it's still in the shared index). With this, we also have a way to distinguish additions vs replacements at load time and can catch broken link extensions.

[PATCH 20/32] read-cache: mark updated entries for split index

2014-04-28 Thread Nguyễn Thái Ngọc Duy
The large part of this patch just follows CE_ENTRY_CHANGED marks. replace_index_entry() is updated to update split_index-base-cache[] as well so base-cache[] does not reference to a freed entry. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/update-index.c | 2 ++ cache.h

[PATCH 31/32] t2104: make sure split index mode is off for the version test

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Version tests only make sense when all entries are in the same file, so we can see if version is downgraded to 2 if 3 is not required. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- t/t2104-update-index-skip-worktree.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git

[PATCH 29/32] read-tree: note about dropping split-index mode or index version

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/read-tree.c | 9 + 1 file changed, 9 insertions(+) diff --git a/builtin/read-tree.c b/builtin/read-tree.c index 3204c62..e7e1c33 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -155,6 +155,15 @@ int

[PATCH 32/32] t1700: new tests for split-index mode

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- .gitignore | 1 + Makefile| 1 + cache.h | 2 + read-cache.c| 3 +- t/t1700-split-index.sh (new +x) | 194

[PATCH 16/32] read-cache: save index SHA-1 after reading

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Also update SHA-1 after writing. If we do not do that, the second read_index() will see initialized variable already set and not read .git/index again, which is fine, except istate-sha1 now has a stale value. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- cache.h| 1 +

[PATCH 30/32] read-cache: force split index mode with GIT_TEST_SPLIT_INDEX

2014-04-28 Thread Nguyễn Thái Ngọc Duy
This could be used to run the whole test suite with split indexes. Index splitting is carried out at random. git read-tree also resets the index and forces splitting at the next update. I had a lot of headaches with the test suite, which proves it exercises split index pretty good.

[PATCH 25/32] update-index: new options to enable/disable split index mode

2014-04-28 Thread Nguyễn Thái Ngọc Duy
If you have a large work tree but only make changes in a subset, then $GIT_DIR/index's size should be stable after a while. If you change branches that touch something else, $GIT_DIR/index's size may grow large that it becomes as slow as the unified index. Do --split-index again occasionally to

[PATCH 28/32] read-tree: force split-index mode off on --index-output

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Just a (paranoid?) safety measure.. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- read-cache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/read-cache.c b/read-cache.c index f9fc3a5..568bc20 100644 --- a/read-cache.c +++ b/read-cache.c @@ -2070,7 +2070,8 @@

[PATCH 18/32] read-cache: mark new entries for split index

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Make sure entry addition does not lead to unifying the index. We don't need to explicitly keep track of new entries. If ce-index is zero, they're new. Otherwise it's unlikely that they are new, but we'll do a through check later at writing time. Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH 26/32] update-index --split-index: do not split if $GIT_DIR is read only

2014-04-28 Thread Nguyễn Thái Ngọc Duy
If $GIT_DIR is read only, we can't write $GIT_DIR/sharedindex. This could happen when $GIT_INDEX_FILE is set to somehwere outside $GIT_DIR. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- read-cache.c | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git

[PATCH 15/32] entry.c: update cache_changed if refresh_cache is set in checkout_entry()

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Other fill_stat_cache_info() is on new entries, which should set CE_ENTRY_ADDED in cache_changed, so we're safe. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/apply.c | 8 +--- builtin/checkout-index.c | 1 + builtin/checkout.c | 1 + cache.h

[PATCH 27/32] rev-parse: add --shared-index-path to get shared index path

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Normally scripts do not have to be aware about split indexes because all shared indexes are in $GIT_DIR. A simple mv $tmp_index $GIT_DIR/somewhere is enough. Scripts that generate temporary indexes and move them across repos must be aware about split index and copy the shared file as well. This

[PATCH 02/32] ewah: delete unused ewah_read_mmap_native declaration

2014-04-28 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- ewah/ewok.h | 1 - 1 file changed, 1 deletion(-) diff --git a/ewah/ewok.h b/ewah/ewok.h index 0556ca5..f6ad190 100644 --- a/ewah/ewok.h +++ b/ewah/ewok.h @@ -100,7 +100,6 @@ int ewah_serialize_native(struct ewah_bitmap *self, int fd);

Re: [PATCH] Sleep 1 millisecond in poll() to avoid busy wait

2014-04-28 Thread Stepan Kasal
Hello, On Mon, Apr 28, 2014 at 11:07:24AM +0200, Erik Faye-Lund wrote: compat/poll/poll.c comes from Gnulib, so it would be better to submit the patch there and update. well, the change is in gnulib since 2012-05-21. But the two versions has diverged a lot. Could you please just accept a

[PATCH] poll/select: prevent busy-waiting

2014-04-28 Thread Stepan Kasal
From: Paolo Bonzini bonz...@gnu.org Date: Mon, 21 May 2012 09:52:42 +0200 Backported from Gnulib. 2012-05-21 Paolo Bonzini bonz...@gnu.org poll/select: prevent busy-waiting. SwitchToThread() only gives away the rest of the current time slice to another thread in the current

Re: [PATCH] poll/select: prevent busy-waiting

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 1:42 PM, Stepan Kasal ka...@ucw.cz wrote: From: Paolo Bonzini bonz...@gnu.org Date: Mon, 21 May 2012 09:52:42 +0200 Backported from Gnulib. 2012-05-21 Paolo Bonzini bonz...@gnu.org poll/select: prevent busy-waiting. SwitchToThread() only gives away

Re: Recording the current branch on each commit?

2014-04-28 Thread David Kastrup
Felipe Contreras felipe.contre...@gmail.com writes: Jeremy Morton wrote: Sounds like the default behaviour of git pull might not be ideal if it easily causes these problems. It's not idea. Virtually everyone agrees with that, even Linus Torvalds, and we have the patches to fix it, but

Re: Recording the current branch on each commit?

2014-04-28 Thread David Kastrup
Jeremy Morton ad...@game-point.net writes: On 28/04/2014 10:02, David Kastrup wrote: Jeremy Mortonad...@game-point.net writes: On 28/04/2014 09:32, Felipe Contreras wrote: some people to is to always merge with --no-ff, that way you see the branch name in the merge commit. But surely,

Re: [PATCH] PAGER_ENV: remove 'S' from $LESS by default

2014-04-28 Thread David Kastrup
Matthieu Moy matthieu@grenoble-inp.fr writes: David Kastrup d...@gnu.org writes: There seem to be a few more occurences (git-sh-setup.sh and pager.c): Not since f82c3ffd862c7 (Wed Feb 5 2014, move LESS/LV pager environment to Makefile). The only upstream branch containing this commit

Tagging a branch as not fitted for branching ?

2014-04-28 Thread Jean-Noël Avila
Most manuals on git state that it is bad practice to push -f a branch after have meddled with its history, because this would risk to upset the repositories of the coworkers. On the other hand, some workflows use branches to propose modifications, and need some rewritting of the history after

Re: [PATCH] PAGER_ENV: remove 'S' from $LESS by default

2014-04-28 Thread Matthieu Moy
David Kastrup d...@gnu.org writes: Matthieu Moy matthieu@grenoble-inp.fr writes: David Kastrup d...@gnu.org writes: There seem to be a few more occurences (git-sh-setup.sh and pager.c): Not since f82c3ffd862c7 (Wed Feb 5 2014, move LESS/LV pager environment to Makefile). The only

[PATCH 01/14] t0001-init.sh: use the $( ... ) construct for command substitution

2014-04-28 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 10/14] t1002-read-tree-m-u-2way.sh: use the $( ... ) construct for command substitution

2014-04-28 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 02/14] t0010-racy-git.sh: use the $( ... ) construct for command substitution

2014-04-28 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 03/14] t0020-crlf.sh: use the $( ... ) construct for command substitution

2014-04-28 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 14/14] t1050-large.sh: use the $( ... ) construct for command substitution

2014-04-28 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 13/14] t1020-subdirectory.sh: use the $( ... ) construct for command substitution

2014-04-28 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 11/14] t1003-read-tree-prefix.sh: use the $( ... ) construct for command substitution

2014-04-28 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 04/14] t0025-crlf-auto.sh: use the $( ... ) construct for command substitution

2014-04-28 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 09/14] t1001-read-tree-m-2way.sh: use the $( ... ) construct for command substitution

2014-04-28 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 08/14] t1000-read-tree-m-3way.sh: use the $( ... ) construct for command substitution

2014-04-28 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 05/14] t0026-eol-config.sh: use the $( ... ) construct for command substitution

2014-04-28 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 12/14] t1004-read-tree-m-u-wf.sh: use the $( ... ) construct for command substitution

2014-04-28 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 07/14] t0300-credentials.sh: use the $( ... ) construct for command substitution

2014-04-28 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

[PATCH 06/14] t0030-stripspace.sh: use the $( ... ) construct for command substitution

2014-04-28 Thread Elia Pinto
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular,

Re: git version 1.9.0 missing git-http-push?

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 11:01 AM, Erik Faye-Lund kusmab...@gmail.com wrote: On Mon, Apr 28, 2014 at 10:48 AM, Erik Faye-Lund kusmab...@gmail.com wrote: So it seems that 08900987 (Decide whether to build http-push in the Makefile) makes a bad assumption about the availability of curl-config on

Re: [msysGit] Re: git version 1.9.0 missing git-http-push?

2014-04-28 Thread Johannes Schindelin
Hi kusma, On Mon, 28 Apr 2014, Erik Faye-Lund wrote: On Mon, Apr 28, 2014 at 10:48 AM, Erik Faye-Lund kusmab...@gmail.com wrote: So it seems that 08900987 (Decide whether to build http-push in the Makefile) makes a bad assumption about the availability of curl-config on new libcurl

Re: [msysGit] Re: git version 1.9.0 missing git-http-push?

2014-04-28 Thread Erik Faye-Lund
On Mon, Apr 28, 2014 at 3:20 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi kusma, On Mon, 28 Apr 2014, Erik Faye-Lund wrote: On Mon, Apr 28, 2014 at 10:48 AM, Erik Faye-Lund kusmab...@gmail.com wrote: So it seems that 08900987 (Decide whether to build http-push in the

Opensource programs. ReactOS Community Edition.

2014-04-28 Thread Victor Martinez
As you may know ReactOS is now working in the new ReactOS Community Edition. It's a new OS, with new features, redesigned image, powered by the new ReactOS kernel which boosts its compatibility with apps and drivers. You can see a comparative, and the new site here:

Re: [msysGit] Re: git version 1.9.0 missing git-http-push?

2014-04-28 Thread Marat Radchenko
On Mon, Apr 28, 2014 at 03:20:46PM +0200, Johannes Schindelin wrote: That way, upstream Git does not have anything to change (and we avoid discussing five versions of essentially the same patch :-P). This bug isn't specific to msysGit but also affects all environments where curl-config is not

[PATCH 01/12] MINGW: config.mak.uname: add explicit way to request MinGW-build

2014-04-28 Thread Marat Radchenko
When crosscompiling, one cannot rely on `uname` from host system. Thus, add an option to use `make MINGW=1` for building MinGW build from non-MinGW host (Linux, for example). Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 5 + 1 file changed, 5 insertions(+)

[PATCH 02/12] MINGW: compat/bswap.h: include stdint.h

2014-04-28 Thread Marat Radchenko
bswap.h uses uint32_t type which might not be defined. This patch adds direct include so bswap.h can be safely included. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/bswap.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat/bswap.h b/compat/bswap.h index

[PATCH 05/12] MINGW: git-compat-util.h: use inttypes.h for printf macros.

2014-04-28 Thread Marat Radchenko
Also, pass -D__USE_MINGW_ANSI_STDIO=0 to select MSVCRT-compatible macro definitions. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- compat/mingw.h| 2 -- compat/msvc.h | 3 +++ config.mak.uname | 3 ++- git-compat-util.h | 11 ++- 4 files changed, 11 insertions(+),

[PATCH 07/12] MINGW: config.mak.uname: reorganize MINGW settings

2014-04-28 Thread Marat Radchenko
HAVE_LIBCHARSET_H and NO_R_TO_GCC_LINKER are not specific to msysGit, they're general MinGW settings. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index

[PATCH 09/12] MINGW: config.mak.uname: drop -DNOGDI

2014-04-28 Thread Marat Radchenko
On MinGW-W64, MsgWaitForMultipleObjects is guarded with #ifndef NOGDI. Unfortunately, including wingdi.h brings in #define ERROR 0 which conflicts with several Git internal enums. So, #undef ERROR. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 4 ++--

[PATCH 08/12] MINGW: config.mak.uname allow using CURL for non-msysGit builds

2014-04-28 Thread Marat Radchenko
Also, fix `warning: passing argument 2 of 'mingw_main' from incompatible pointer type` in http-fetch.c and remote-curl.c. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 2 -- http-fetch.c | 5 +++-- remote-curl.c| 2 +- 3 files changed, 4 insertions(+), 5

[PATCH 06/12] MSVC: config.mak.uname: drop -D__USE_MINGW_ACCESS from compile definitions

2014-04-28 Thread Marat Radchenko
-D__USE_MINGW_ACCESS only affects MinGW and does nothing when MSVC is used. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mak.uname b/config.mak.uname index e5edae6..dc87e21 100644 ---

  1   2   3   >