Re: [RFC/PATCH] git-remote-mediawiki: reset private ref after non-dumb push

2013-08-27 Thread Matthieu Moy
Felipe Contreras felipe.contre...@gmail.com writes: On Mon, Aug 26, 2013 at 4:16 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@grenoble-inp.fr writes: Ideally, it

Re: [RFC/PATCH] git-remote-mediawiki: reset private ref after non-dumb push

2013-08-27 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@grenoble-inp.fr writes: git-remote-mediawiki is kind of a special case, as the remote side uses a very different data model, hence it can make sense to export+reimport to get locally what the remote side received. Hmm, I am

Eine große Überraschung für Sie

2013-08-27 Thread Elleern
Heute, Ihre ganz heißen Deal nike Free Schuhe innen online zu speichern. Das Markenzeichen von Nike Free betriebenen Schuhen passiert zu sein unglaublich prominent ausschließlich ein gutes Angebot über mehrere Jahre, All erwägen daher, präsentiert das Nike Free Run 2 Turnschuhe in einem der im

[PATCH] config: add _cb suffix to callback functions

2013-08-27 Thread Natanael Copa
Commit 4d8dd1494e9f3af2e9738edaca40ada096f7bf10 introduced a build regression on uClibc which defines fgetc as macro. To work around that we add a _cb suffix to the callback functions. Signed-off-by: Natanael Copa nc...@alpinelinux.org --- config.c | 32 1 file

Re: [PATCH] Add gui.displayuntracked option

2013-08-27 Thread Pat Thoyts
Max Kirillov m...@max630.net writes: When git is used to track only a subset of a directory, or there is no sure way to divide files to ignore from files to track, git user have to live with large number of untracked files. These files present in file list, and should always be scrolled through

Re: [PATCH] git-gui: right half window is paned

2013-08-27 Thread Pat Thoyts
Max Kirillov m...@max630.net writes: For long descriptions it would be nice to be able to resize the comment text field. Signed-off-by: Max Kirillov m...@max630.net --- git-gui/git-gui.sh | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/git-gui/git-gui.sh

Donation Funds

2013-08-27 Thread Gillian Adrian Bayford
My wife and i won £148.6 Million Pounds last year, and we have done lot of charity donation, so we decide to give 1.5Million Pounds each to 5 lucky people this June 2013, lucky for you, your email, was given to us by google managment as one of our lucky receipants. For verification process see

[PATCH] Document pack v4 format

2013-08-27 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- For my education but may help people who are interested in the format. Most is gathered from commit messages, except the delta tree entries. .idx is not documented yet, but it does not change much and not the focus right now anyway.

Re: [RFC/PATCH] Fix path prefixing in grep_object

2013-08-27 Thread Phil Hord
On Tue, Aug 27, 2013 at 12:07 AM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: Not necessarily. If the user is asking the question in a more natural way (I want to see where in 'next' branch's tip commit hits appear, by the way, I know I am only interested

[PATCH] remote: filter out invalid remote configurations

2013-08-27 Thread Carlos Martín Nieto
In remote's configuration callback, anything that looks like 'remote.name.*' creates a remote 'name'. This remote may not end up having any configuration for a remote, but it's still in the list, so 'git remote' shows it, which means something like [remote bogus] hocus = pocus will

Re: [PATCH/RFC] core.precomposeunicode is true by default

2013-08-27 Thread Torsten Bögershausen
(Sorry for the somewhat late reply, thanks for review) Torsten Bögershausen tbo...@web.de writes: When core.precomposeunicode was introduced, it was set to false by default, to be compatible with older versions of Git. Whenever UTF-8 file names are used in a mixed environment, the Mac OS

BUG: git subtree split - revert commit followed by a merge

2013-08-27 Thread Machiels, Brecht
Hello: I'm running into the problem described in this mailing list post: http://thread.gmane.org/gmane.comp.version-control.git/202645 'git subtree split' fails to reconstruct the history when a revert commit is followed by a merge commit. I have slightly adjusted the test script

[PATCH/RFC v2] Set core.precomposeunicode to true on e.g. HFS+

2013-08-27 Thread Torsten Bögershausen
When core.precomposeunicode was introduced in 76759c7d, it was set to false on a unicode decomposing file system like HFS+ to be compatible with older versions of Git. The Mac OS users need to find out that this configuration exist and change it manually from false to true. A smoother workflow

[PATCH] documentation: clarify notes for clean.requireForce

2013-08-27 Thread Jiang Xin
Add -i (interactive clean option) to clarify the documentation for clean.requireForce config variable. Also replace the example in `gitcli.txt` with safer git clean command. Signed-off-by: Jiang Xin worldhello@gmail.com --- Documentation/config.txt | 4 ++-- Documentation/gitcli.txt | 2 +-

Asymmetric default behavior of git stash

2013-08-27 Thread Uwe Storbeck
Hi, is there any reason why the default behavior of git stash is asymmetric? When I save my current state with 'git stash save' it saves the worktree changes and the index changes (and resets both). When I restore the state with 'git stash pop' it restores the worktree changes, but not the state

Re: [PATCH/RFC v2] Set core.precomposeunicode to true on e.g. HFS+

2013-08-27 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: When core.precomposeunicode was introduced in 76759c7d, it was set to false on a unicode decomposing file system like HFS+ to be compatible with older versions of Git. The Mac OS users need to find out that this configuration exist and change it

PATCH/RFC man git remote, use of remote vs name

2013-08-27 Thread Daniele Procida
I noticed that http://jk.gs/git-remote.html mostly refers to remotes as name, but in one case as remote. remote is clearer than name, and also follows the pattern of url, branch and so on. Here follows a patch in which the usage is made consistent, as remote rather than name. I hope the

Re: [PATCH/RFC] core.precomposeunicode is true by default

2013-08-27 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: ... see if that path can be seen under its alias. Why do we set it to false? Isn't this the true culprit? After all, this is not in the reinit codepath, so we know we are dealing with a repository that was created afresh. There is nothing wrong with

Re: [PATCH] remote: filter out invalid remote configurations

2013-08-27 Thread Junio C Hamano
Carlos Martín Nieto c...@elego.de writes: In remote's configuration callback, anything that looks like 'remote.name.*' creates a remote 'name'. This remote may not end up having any configuration for a remote, but it's still in the list, so 'git remote' shows it, which means something like

Re: [PATCH] config: add _cb suffix to callback functions

2013-08-27 Thread Junio C Hamano
Natanael Copa nc...@alpinelinux.org writes: Commit 4d8dd1494e9f3af2e9738edaca40ada096f7bf10 introduced a build regression on uClibc which defines fgetc as macro. To work around that we add a _cb suffix to the callback functions. Signed-off-by: Natanael Copa nc...@alpinelinux.org ---

Re: [PATCH 00/23] Preliminary pack v4 support

2013-08-27 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: Subject says it all... at last ! This can also be fetched here: git://git.linaro.org/people/nico/git Demonstration of what it does at the moment: http://article.gmane.org/gmane.comp.version-control.git/233038 I'd like to preserve the

Re: [PATCH/RFC] core.precomposeunicode is true by default

2013-08-27 Thread Torsten Bögershausen
On 27.08.13 16:49, Junio C Hamano wrote: Torsten Bögershausen tbo...@web.de writes: ... see if that path can be seen under its alias. Why do we set it to false? Isn't this the true culprit? After all, this is not in the reinit codepath, so we know we are dealing with a repository that was

Re: [PATCH 01/23] pack v4: initial pack dictionary structure and code

2013-08-27 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: Signed-off-by: Nicolas Pitre n...@fluxnic.net --- Was there a reason not to reuse the hash-table Linus did in hash.[ch]? It may not make much of a difference for something so small and isolated from the rest of the system, but if hash.[ch] can be easily

Eclipse

2013-08-27 Thread Ron Tregaskis - NOAA Federal
Does git work with Eclipse? Ron -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: Eclipse

2013-08-27 Thread Torsten Bögershausen
On 27.08.13 17:10, Ron Tregaskis - NOAA Federal wrote: Does git work with Eclipse? No. If the question is does Eclipse work with git: yes. For more information please feel free to spend some seconds using a seach engine. -- To unsubscribe from this list: send the line unsubscribe git in the

Re: [PATCH 05/23] pack v4: add commit object parsing

2013-08-27 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: Let's create another dictionary table to hold the author and committer entries. We use the same table format used for tree entries where the 16 bit data prefix is conveniently used to store the timezone value. In order to copy straight from a commit

Re: [PATCH 08/23] pack v4: basic references encoding

2013-08-27 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: Add variable length number encoding. Let's apply the same encoding currently used for the offset to base of OBJ_OFS_DELTA objects which is the most efficient way to do this, and apply it to everything with pack version 4. Also add SHA1 reference

Re: [PATCH 09/23] pack v4: commit object encoding

2013-08-27 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: This goes as follows: - Tree reference: either variable length encoding of the index into the SHA1 table or the literal SHA1 prefixed by 0 (see add_sha1_ref()). - Parent count: variable length encoding of the number of parents. This is normally

Re: [PATCH 10/23] pack v4: tree object encoding

2013-08-27 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: This goes as follows: - Number of tree entries: variable length encoded. Then for each tree entry: - Path component reference: variable length encoded index into the path string dictionary table which also covers the entry mode. To make the

Re: [PATCH 12/23] pack v4: creation code

2013-08-27 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: Let's actually open the destination pack file and write the header and the tables. The header isn't much different from pack v3, except for the pack version number of course. The first table is the sorted SHA1 table normally found in the pack index

Re: [PATCH 08/23] pack v4: basic references encoding

2013-08-27 Thread Nicolas Pitre
On Tue, 27 Aug 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: Add variable length number encoding. Let's apply the same encoding currently used for the offset to base of OBJ_OFS_DELTA objects which is the most efficient way to do this, and apply it to everything with

Re: [PATCH 14/23] pack v4: object data copy

2013-08-27 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: Blob and tag objects have no particular changes except for their object header. Delta objects are also copied as is, except for their delta base reference which is converted to the new way as used elsewhere in pack v4 encoding i.e. an index into the

Re: [PATCH 00/23] Preliminary pack v4 support

2013-08-27 Thread Nicolas Pitre
On Tue, 27 Aug 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: Subject says it all... at last ! This can also be fetched here: git://git.linaro.org/people/nico/git Demonstration of what it does at the moment:

Re: [PATCH 01/23] pack v4: initial pack dictionary structure and code

2013-08-27 Thread Nicolas Pitre
On Tue, 27 Aug 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: Signed-off-by: Nicolas Pitre n...@fluxnic.net --- Was there a reason not to reuse the hash-table Linus did in hash.[ch]? Well... Most likely because when I started that code (which used to be quite

Re: [PATCH/RFC] core.precomposeunicode is true by default

2013-08-27 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: 2) When we access a repo from Windows/Linux using SAMBA, You mean s/repo/repository that resides on HFS+/? Sorry being unclear here, trying being clearer with an example: I have a /data/Docs on my linux box, which is handled by git I export

Re: [PATCH] documentation: clarify notes for clean.requireForce

2013-08-27 Thread Junio C Hamano
Jiang Xin worldhello@gmail.com writes: Add -i (interactive clean option) to clarify the documentation for clean.requireForce config variable. Also replace the example in `gitcli.txt` with safer git clean command. Hmm, the former change may make sense, but I am not sure about the latter.

Re: [PATCH 00/23] Preliminary pack v4 support

2013-08-27 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: On Tue, 27 Aug 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: ... I'd like to preserve the author time stamps as they relate to where in the world I was when the corresponding code was written. You'll notice I didn't work on

Re: [PATCH 05/23] pack v4: add commit object parsing

2013-08-27 Thread Nicolas Pitre
On Tue, 27 Aug 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: Let's create another dictionary table to hold the author and committer entries. We use the same table format used for tree entries where the 16 bit data prefix is conveniently used to store the timezone

Re: [PATCH 09/23] pack v4: commit object encoding

2013-08-27 Thread Nicolas Pitre
On Tue, 27 Aug 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: This goes as follows: - Tree reference: either variable length encoding of the index into the SHA1 table or the literal SHA1 prefixed by 0 (see add_sha1_ref()). - Parent count: variable length

Re: Eclipse

2013-08-27 Thread stuart
On 8/27/2013 10:10 AM, Ron Tregaskis - NOAA Federal wrote: Does git work with Eclipse? Ron -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html I find that an

Re: [PATCH 05/23] pack v4: add commit object parsing

2013-08-27 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: Hmmm The problem I have with split_ident_line() right now is about the fact that it is too liberal with whitespaces. Here I must be sure I can deconstruct a commit object and be sure I still can regenerate it byte for byte in order to match its

[PATCH v2 0/11] Modernize user-manual

2013-08-27 Thread Thomas Ackermann
Hi, this is v2 of my patches for user-manual.txt. Thanks to Junio, Jonathan, Martin and Philip for your comments! I think Philips remarks should be part of a separate patch series which then also should address the current differences in layout between user-manual.html and user-manual.pdf.

[PATCH 01/11] Call it Git User Manual and remove reference to very old Git version

2013-08-27 Thread Thomas Ackermann
Reviewed-by: Jonathan Nieder jrnie...@gmail.com Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/user-manual.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index fe723e4..103ec9a 100644

[PATCH 02/11] Use current detached HEAD message

2013-08-27 Thread Thomas Ackermann
Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/user-manual.txt | 19 +-- 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 103ec9a..bdefd9a 100644 ---

[PATCH 03/11] Use current output for git repack

2013-08-27 Thread Thomas Ackermann
Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/user-manual.txt | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index bdefd9a..3f44ca0 100644 --- a/Documentation/user-manual.txt

[PATCH 04/11] Use git merge instead of git pull .

2013-08-27 Thread Thomas Ackermann
git pull . works, but git merge is the recommended way for new users to do things. (The old description also should have read The former is actually *not* very commonly used.) Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/user-manual.txt | 8 1 file changed, 4

[PATCH 05/11] Fix some typos and improve wording

2013-08-27 Thread Thomas Ackermann
Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/user-manual.txt | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 6241a43..465d9cb 100644 ---

[PATCH 07/11] Improve section Manipulating branches

2013-08-27 Thread Thomas Ackermann
Add some missing punctuation. Simplify description of git branch -d/-D. Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/user-manual.txt | 20 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/Documentation/user-manual.txt

[PATCH 10/11] Remove irrelevant reference from Tying it all together

2013-08-27 Thread Thomas Ackermann
Sorry Jon, but this might not be of any help to new Git users ;) Acked-by: Jon Loeliger j...@jdl.com Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/user-manual.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Documentation/user-manual.txt

[PATCH 11/11] git prune is safe

2013-08-27 Thread Thomas Ackermann
git prune is safe in case of concurrent accesses to a repository but using it in such a case is not recommended. Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/user-manual.txt | 12 +++- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git

[PATCH 08/11] Improve section Merging multiple trees

2013-08-27 Thread Thomas Ackermann
Remove unnecessary quoting. Simplify description of three-way merge. Signed-off-by: Jonathan Nieder jrnie...@gmail.com Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/user-manual.txt | 27 +-- 1 file changed, 13 insertions(+), 14 deletions(-) diff

Re: [PATCH] Document pack v4 format

2013-08-27 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- For my education but may help people who are interested in the format. Most is gathered from commit messages, except the delta tree entries. Thanks. diff --git

Re: [PATCH 14/23] pack v4: object data copy

2013-08-27 Thread Nicolas Pitre
On Tue, 27 Aug 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: Blob and tag objects have no particular changes except for their object header. Delta objects are also copied as is, except for their delta base reference which is converted to the new way as used

Re: [PATCH] Document pack v4 format

2013-08-27 Thread Nicolas Pitre
On Tue, 27 Aug 2013, Nguyễn Thái Ngọc Duy wrote: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- For my education but may help people who are interested in the format. Most is gathered from commit messages, except the delta tree entries. Excellent! That's the kind of thing I

Re: [PATCH 05/11] Fix some typos and improve wording

2013-08-27 Thread Junio C Hamano
Thomas Ackermann th.ac...@arcor.de writes: Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/user-manual.txt | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index

Re: [PATCH 06/11] Simplify How to make a commit

2013-08-27 Thread Junio C Hamano
Sounds good. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH 01/11] Call it Git User Manual and remove reference to very old Git version

2013-08-27 Thread Junio C Hamano
Thomas Ackermann th.ac...@arcor.de writes: Reviewed-by: Jonathan Nieder jrnie...@gmail.com Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- I tend to agree with Jonathan that this should be User's Manual. I've tentatively queued uncontroversial bits from v1 series already on 'pu', by

Re: [PATCH 04/11] Use git merge instead of git pull .

2013-08-27 Thread Junio C Hamano
Thomas Ackermann th.ac...@arcor.de writes: git pull . works, but git merge is the recommended way for new users to do things. (The old description also should have read The former is actually *not* very commonly used.) It does not matter that you are unaware other people use it often. I'd

Re: [PATCH 07/11] Improve section Manipulating branches

2013-08-27 Thread Junio C Hamano
Thomas Ackermann th.ac...@arcor.de writes: `git branch -d branch`:: - delete the branch `branch`; if the branch you are deleting - points to a commit which is not reachable from the current - branch, this command will fail with a warning. + delete the branch `branch`; if the

Re: [PATCH] Improve font rendering on retina macbooks

2013-08-27 Thread Pat Thoyts
Mads Dørup m...@dorup.dk writes: Hi there I've created a very small change to git gui that considerably improves the experience on my machine at least: diff --git a/git-gui/macosx/Info.plist b/git-gui/macosx/Info.plist index b3bf15f..1ade121 100644 --- a/git-gui/macosx/Info.plist +++

What's cooking in git.git (Aug 2013, #06; Tue, 27)

2013-08-27 Thread Junio C Hamano
What's cooking in git.git (Aug 2013, #06; Tue, 27) -- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Git 1.8.4 was tagged and released

Re: [PATCH 08/11] Improve section Merging multiple trees

2013-08-27 Thread Junio C Hamano
Thomas Ackermann th.ac...@arcor.de writes: Remove unnecessary quoting. Simplify description of three-way merge. Signed-off-by: Jonathan Nieder jrnie...@gmail.com Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- The update is good, but I wonder if this belongs to User's manual these

Re: [PATCH 09/11] Remove unnecessary historical note from Object storage format

2013-08-27 Thread Junio C Hamano
Good. Thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH 11/11] git prune is safe

2013-08-27 Thread Junio C Hamano
Thomas Ackermann th.ac...@arcor.de writes: git prune is safe in case of concurrent accesses to a repository but using it in such a case is not recommended. Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/user-manual.txt | 12 +++- 1 file changed, 3

Re: [PATCH/RFC] core.precomposeunicode is true by default

2013-08-27 Thread Torsten Bögershausen
On 2013-08-27 18.27, Junio C Hamano wrote: Torsten Bögershausen tbo...@web.de writes: 2) When we access a repo from Windows/Linux using SAMBA, You mean s/repo/repository that resides on HFS+/? Sorry being unclear here, trying being clearer with an example: I have a /data/Docs on my linux

Re: [PATCH 04/11] Use git merge instead of git pull .

2013-08-27 Thread Jonathan Nieder
On Tue, Aug 27, 2013 at 12:06:33PM -0700, Junio C Hamano wrote: Thomas Ackermann th.ac...@arcor.de writes: git pull . works, but git merge is the recommended way for new users to do things. (The old description also should have read The former is actually *not* very commonly used.)

Re: [PATCH] config: add _cb suffix to callback functions

2013-08-27 Thread Eric Sunshine
On Tue, Aug 27, 2013 at 10:54 AM, Junio C Hamano gits...@pobox.com wrote: Natanael Copa nc...@alpinelinux.org writes: Commit 4d8dd1494e9f3af2e9738edaca40ada096f7bf10 introduced a build regression on uClibc which defines fgetc as macro. To work around that we add a _cb suffix to the callback

[PATCH v2 1/5] replace: forbid replacing an object with one of a different type

2013-08-27 Thread Christian Couder
Users replacing an object with one of a different type were not prevented to do so, even if it was obvious, and stated in the doc, that bad things would result from doing that. To avoid mistakes, it is better to just forbid that though. There is no case where one object can be replaced with one

[PATCH v2 4/5] t6050-replace: add test to clean up all the replace refs

2013-08-27 Thread Christian Couder
Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- t/t6050-replace.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 5c352c4..05be228 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -276,4 +276,10 @@ test_expect_success

[PATCH v2 3/5] t6050-replace: test that objects are of the same type

2013-08-27 Thread Christian Couder
Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- t/t6050-replace.sh | 13 + 1 file changed, 13 insertions(+) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index decdc33..5c352c4 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -263,4 +263,17 @@

[PATCH v2 5/5] Documentation/replace: add Creating Replacement Objects section

2013-08-27 Thread Christian Couder
There were no hints in the documentation about how to create replacement objects. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Documentation/git-replace.txt | 16 1 file changed, 16 insertions(+) diff --git a/Documentation/git-replace.txt

[PATCH v2 2/5] Documentation/replace: state that objects must be of the same type

2013-08-27 Thread Christian Couder
A previous patch ensures that both the replaced and the replacement objects passed to git replace must be of the same type. While at it state that there is no other restriction on both objects. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Documentation/git-replace.txt | 7 ---

[PATCH v2 0/5] Check replacement object type and minor updates

2013-08-27 Thread Christian Couder
The only changes compared to the previous version are those suggested by Johannes: - the error message is now: Objects must be of the same type.\n '%s' points to a replaced object of type '%s'\n while '%s' points to a replacement object of type '%s'. - the test uses .

Re: [PATCH 09/23] pack v4: commit object encoding

2013-08-27 Thread Nicolas Pitre
On Tue, 27 Aug 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: + /* parse the tree line */ + if (in + 46 = tail || memcmp(in, tree , 5) || in[45] != '\n') + goto bad_data; + if (get_sha1_hex(in + 5, sha1) 0) + goto bad_data; Is this

Re: contrib/credential/netrc/git-credential-netrc: Use of uninitialized value in string

2013-08-27 Thread Jeff King
On Mon, Aug 26, 2013 at 08:56:23PM -0700, Junio C Hamano wrote: Antoine Pelisse apeli...@gmail.com writes: I've tried to use the netrc credential with git-send-email (v1.8.4-rc2), and I've had the following log (running with -d -v): Peff what do you think? From credential layer's point

Re: [PATCH 09/23] pack v4: commit object encoding

2013-08-27 Thread Junio C Hamano
Nicolas Pitre n...@fluxnic.net writes: On Tue, 27 Aug 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: + /* parse the tree line */ + if (in + 46 = tail || memcmp(in, tree , 5) || in[45] != '\n') + goto bad_data; + if (get_sha1_hex(in + 5, sha1) 0) +

Re: [PATCH v2 1/5] replace: forbid replacing an object with one of a different type

2013-08-27 Thread Junio C Hamano
Christian Couder chrisc...@tuxfamily.org writes: Users replacing an object with one of a different type were not prevented to do so, even if it was obvious, and stated in the doc, that bad things would result from doing that. To avoid mistakes, it is better to just forbid that though.

[PATCHv3] write_index: optionally allow broken null sha1s

2013-08-27 Thread Jeff King
On Mon, Aug 26, 2013 at 05:20:53PM -0400, Jeff King wrote: And by your rule above, the advice would be each of these tests should say setup in the description. That makes sense to me, and I don't mind doing it here. [...] I totally missed your original point, then. I don't mind combining

Re: [PATCH 04/11] Use git merge instead of git pull .

2013-08-27 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: On Tue, Aug 27, 2013 at 12:06:33PM -0700, Junio C Hamano wrote: Thomas Ackermann th.ac...@arcor.de writes: git pull . works, but git merge is the recommended way for new users to do things. (The old description also should have read The former

Re: What's cooking in git.git (Aug 2013, #06; Tue, 27)

2013-08-27 Thread Jeff King
On Tue, Aug 27, 2013 at 12:22:30PM -0700, Junio C Hamano wrote: * jk/config-int-range-check (2013-08-21) 2 commits (merged to 'next' on 2013-08-22 at 465efb3) + teach git-config to output large integers + config: properly range-check integer values Originally merged to 'next' on

Re: What's cooking in git.git (Aug 2013, #06; Tue, 27)

2013-08-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Aug 27, 2013 at 12:22:30PM -0700, Junio C Hamano wrote: * jk/config-int-range-check (2013-08-21) 2 commits (merged to 'next' on 2013-08-22 at 465efb3) + teach git-config to output large integers + config: properly range-check integer values

Re: [PATCH 01/11] Call it Git User Manual and remove reference to very old Git version

2013-08-27 Thread Lars Gullik Bjønnes
Junio C Hamano gits...@pobox.com writes: | Thomas Ackermann th.ac...@arcor.de writes: Reviewed-by: Jonathan Nieder jrnie...@gmail.com Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- | I tend to agree with Jonathan that this should be User's Manual. Not going into which one might be

Re: What's cooking in git.git (Aug 2013, #06; Tue, 27)

2013-08-27 Thread Antoine Pelisse
On Tue, Aug 27, 2013 at 9:22 PM, Junio C Hamano gits...@pobox.com wrote: * jh/remote-hg-fetch-fix (2013-07-25) 2 commits (merged to 'next' on 2013-07-25 at 33161ad) + Revert remotes-hg: bugfix for fetching non local remotes (merged to 'next' on 2013-07-24 at 9c96641) + remotes-hg:

Re: [PATCH 09/23] pack v4: commit object encoding

2013-08-27 Thread Nicolas Pitre
On Tue, 27 Aug 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: On Tue, 27 Aug 2013, Junio C Hamano wrote: Nicolas Pitre n...@fluxnic.net writes: +/* parse the tree line */ +if (in + 46 = tail || memcmp(in, tree , 5) || in[45] != '\n') +

Re: What's cooking in git.git (Aug 2013, #06; Tue, 27)

2013-08-27 Thread Jeff King
[+cc Jonathan] On Tue, Aug 27, 2013 at 02:05:01PM -0700, Junio C Hamano wrote: * jk/config-int-range-check (2013-08-21) 2 commits [...] I think Jonathan had some concerns about the test in the first one, and there was an open question in the second of whether we wanted to add

Re: What's cooking in git.git (Aug 2013, #06; Tue, 27)

2013-08-27 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: What's cooking in git.git (Aug 2013, #06; Tue, 27) -- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in

Re: What's cooking in git.git (Aug 2013, #06; Tue, 27)

2013-08-27 Thread Junio C Hamano
Jeff King p...@peff.net writes: I don't feel too strongly either way. I mostly kept the range checks for --int because that is how the code already worked, and I assumed that was what was desired. But given what I know of the history of the config code, it is probably a completely random side

Re: What's cooking in git.git (Aug 2013, #06; Tue, 27)

2013-08-27 Thread Junio C Hamano
Antoine Pelisse apeli...@gmail.com writes: On Tue, Aug 27, 2013 at 9:22 PM, Junio C Hamano gits...@pobox.com wrote: * jh/remote-hg-fetch-fix (2013-07-25) 2 commits (merged to 'next' on 2013-07-25 at 33161ad) + Revert remotes-hg: bugfix for fetching non local remotes (merged to 'next' on

Re: What's cooking in git.git (Aug 2013, #06; Tue, 27)

2013-08-27 Thread Kacper Kornet
On Tue, Aug 27, 2013 at 12:22:30PM -0700, Junio C Hamano wrote: * kk/tests-with-no-perl (2013-08-24) 4 commits - reset test: modernize style - t/t7106-reset-unborn-branch.sh: Add PERL prerequisite - add -i test: use skip_all instead of repeated PERL prerequisite - Make test using invalid

???????

2013-08-27 Thread Xioa Gang
Contact Me for a business Deal -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH v2] documentation: clarify notes for clean.requireForce

2013-08-27 Thread Jiang Xin
Add -i (interactive clean option) to clarify the documentation for clean.requireForce config variable. Signed-off-by: Jiang Xin worldhello@gmail.com --- Documentation/config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt

[PATCHv2] mailmap: handle mailmap blobs without trailing newlines

2013-08-27 Thread Jeff King
The read_mailmap_buf function reads each line of the mailmap using strchrnul, like: const char *end = strchrnul(buf, '\n'); unsigned long linelen = end - buf + 1; But that's off-by-one when we actually hit the NUL byte; our line does not have a terminator, and so is only end - buf bytes

Re: [PATCH 00/23] Preliminary pack v4 support

2013-08-27 Thread Duy Nguyen
On Tue, Aug 27, 2013 at 11:44 PM, Junio C Hamano gits...@pobox.com wrote: As you have 0-index escape hatch for SHA-1 table, but no similar escape hatch for the people's name table, I can see why it may be cumbersome to fix a thin pack by only appending to a received packfile and updating a few

Re: [PATCH 00/23] Preliminary pack v4 support

2013-08-27 Thread Nicolas Pitre
On Wed, 28 Aug 2013, Duy Nguyen wrote: On Tue, Aug 27, 2013 at 11:44 PM, Junio C Hamano gits...@pobox.com wrote: As you have 0-index escape hatch for SHA-1 table, but no similar escape hatch for the people's name table, I can see why it may be cumbersome to fix a thin pack by only

Re: [PATCH 00/23] Preliminary pack v4 support

2013-08-27 Thread Duy Nguyen
On Wed, Aug 28, 2013 at 9:58 AM, Nicolas Pitre n...@fluxnic.net wrote: But what if we store appended objects in OBJ_REF_DELTA format where base ref is empty tree/commit and cached by sha1_file.c? I don't follow you here. Missing objects need to be added to the pack, they can't be cached