Re: [PATCH] l10n: add framework for localizing the manpages

2017-03-15 Thread Ævar Arnfjörð Bjarmason
On Wed, Mar 15, 2017 at 9:11 AM, Jean-Noël Avila wrote: > Le 14/03/2017 à 22:00, Ævar Arnfjörð Bjarmason a écrit : >> On Mon, Mar 13, 2017 at 1:01 AM, Junio C Hamano wrote: >>> Jean-Noel Avila writes: >> Jean: Comments on the patch: >> >> -

[PATCH v2 3/3] difftool: handle modified symlinks in dir-diff mode

2017-03-15 Thread David Aguilar
Detect the null object ID for symlinks in dir-diff so that difftool can detect when symlinks are modified in the worktree. Previously, a null symlink object ID would crash difftool. Handle null object IDs as unknown content that must be read from the worktree. Helped-by: Johannes Schindelin

i need your help for this Investment

2017-03-15 Thread mrs.aich...@ono.com
Hello Dear, My names are Aisha Gaddafi, 39, I need a very honest and reliable person that can assist me for investment project for a profitable business/ company to invest into in your country than if you are interested let me know. I will details you more when I hear from you. Aisha

GSoC Project | Submodules related work

2017-03-15 Thread Prathamesh Chavan
Hey everyone, I am Prathamesh. I am studying Computer Science and Engineering at IIT Kharagpur. I am interested to participate in Google Summer of Code 2017 under Git organization. I attempted "Avoid pipes in git related commands for test suite" as my microproject[1]. As a part of GSoC, I would

Re: fatal: Could not get current working directory: Permission denied | affected 2.10,2.11,2.12, but not 1.9.5 |

2017-03-15 Thread Zenobiusz Kunegunda
Od: "René Scharfe" l@web.de> Do: "Zenobiusz Kunegunda" zenobiusz.kunegu...@interia.pl>; Wysłane: 18:59 Wtorek 2017-03-14 Temat: Re: fatal: Could not get current working directory: Permission denied | affected 2.10,2.11,2.12, but not 1.9.5 | > >> Am 14.03.2017 um 08:44 schrieb Zenobiusz

Re: Finding a tag that introduced a submodule change

2017-03-15 Thread Robert Dailey
On Fri, Mar 3, 2017 at 12:04 PM, Junio C Hamano wrote: > Robert Dailey writes: > >> Sometimes I run into a situation where I need to find out which >> release of the product a submodule change was introduced in. This is >> nontrivial, since there are

[PATCH 2/3] git-prompt: add a describe style for any tags

2017-03-15 Thread Michael J Gruber
git-prompt has various describe styles, among them "describe" (by annotated tags) and "default" (by exact match with any tag). Add a mode "tag" that describes by any tag, annotated or not. Signed-off-by: Michael J Gruber --- contrib/completion/git-prompt.sh | 3 +++

[RFD PATCH 3/3] name-rev: Allow lightweight tags and branch refs

2017-03-15 Thread Michael J Gruber
When name-rev constructs possible names for a rev, it assigns the taggerdate to an annotated tag and ULONG_MAX to other names such as lightweight tags and branch names. Practically, this rules out even naming a tagged commit by the tag if that is lightweight and there is another possible indirect

[PATCH 1/3] describe: debug is incompatible with contains

2017-03-15 Thread Michael J Gruber
`git describe --contains` calls into `git name-rev` which does not have any searching to do and thus does not display any debug information. Say so in the documentation and catch the incompatible arguments. Signed-off-by: Michael J Gruber ---

[PATCH 0/3] describe --contains sanity

2017-03-15 Thread Michael J Gruber
2 patches and 1 RFD around describe (--contains). They are technically independent, but happened along the same stroll in that area when I tried to match documentation, my expectations, and reality. 1 and 2 should be no-brainers. 3 is something to ponder for a while. Michael J Gruber (3):

git pretty format: "%+b" not working with "%w" in front of it?

2017-03-15 Thread Robert Dailey
I have the following log: $ git log commit 7ffb909bb8f38607e3d6d9f3504a66ca978f0ac2 Author: Robert Dailey Date: Mon Dec 12 11:01:00 2016 -0600 Add initial skeleton files & a few interfaces for new kizi/sc16 stuff This is still FAR from complete I want to

($1.500`000`00USD)

2017-03-15 Thread Suzan Eke
Attention, We have deposited the check of your fund ($1.500`000`00USD) through Western Union department after our finally meeting regarding your fund, All you will do is to contact Western Union director James Lee via E-mail:( ww.onlineservi...@outlook.fr) He will give you direction on how you

Commiting files larger than 4 GB on Windows

2017-03-15 Thread Florian Adamus
Hello, I am managing my large files with the git-lfs-extension. Some of them were more than 4GB in size. After deleting one of those files from my working tree and do a normal git checkout I ended up with a somehow crippled file with a size of only 46 MB left. For testing reasons I tried to

Re: Commiting files larger than 4 GB on Windows

2017-03-15 Thread Thomas Braun
Am 15.03.2017 um 14:00 schrieb Florian Adamus: > Hello, > > I am managing my large files with the git-lfs-extension. Some of them > were more than 4GB in size. After deleting one of those files from my > working tree and do a normal git checkout I ended up with a somehow > crippled file with a

[GSoC][PATCH v4 4/4] credential-cache: add tests for XDG functionality

2017-03-15 Thread Devin Lehmacher
Signed-off-by: Devin Lehmacher --- t/t0301-credential-cache.sh | 64 + 1 file changed, 64 insertions(+) diff --git a/t/t0301-credential-cache.sh b/t/t0301-credential-cache.sh index 82c841121..664c6dda1 100755 ---

Re: [RFC PATCH] short status: improve reporting for submodule changes

2017-03-15 Thread Stefan Beller
On Wed, Mar 15, 2017 at 6:31 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> While we already have a porcelain2 layer for git-status, that is accurate >> for submodules, users still like the way they are are used to of >> 'status -s'. >> >> As a

[PATCH 1/2] name-rev: refactor logic to see if a new candidate is a better name

2017-03-15 Thread Junio C Hamano
When we encounter a new ref that could describe the commit we are looking at, we compare the name that is formed using that ref and the name we found so far and pick a better one. Factor the comparison logic out to a separate helper function, while keeping the current logic the same (i.e. a name

Re: [PATCH 6/6] odb_pack_keep(): stop generating keepfile name

2017-03-15 Thread Junio C Hamano
Jeff King writes: > The odb_pack_keep() function generates the name of a .keep > file and opens it. This has two problems: > > 1. It requires a fixed-size buffer to create the filename > and doesn't notice when the result is truncated. > > 2. Of the two callers, one

[GSoC][PATCH v4 0/4] Moving credential-cache socket to xdg path

2017-03-15 Thread Devin Lehmacher
I implemented all changes from the previous reviews and also wrote a few tests. -Devin

[GSoC][PATCH v4 3/4] credential-cache: use XDG_CACHE_HOME for socket

2017-03-15 Thread Devin Lehmacher
Make git-credential-cache follow the XDG base path specification by default. This increases consistency with other applications and helps keep clutter out of users' home directories. Check the old socket location, ~/.git-credential-cache/, and use ~/.git-credential-cache/socket if that directory

[GSoC][PATCH v4 2/4] dir: add directory_exists

2017-03-15 Thread Devin Lehmacher
file_exists currently only does an lstat to see if anything is at the path. For some purposes it would be better to ensure that a path is a certain type of file. Add function directory_exists that checks if a path exists and is a directory. Signed-off-by: Devin Lehmacher ---

[GSoC][PATCH v4 1/4] path.c: add xdg_cache_home

2017-03-15 Thread Devin Lehmacher
We already have xdg_config_home to format paths relative to XDG_CONFIG_HOME. Let's provide a similar function xdg_cache_home to do the same for paths relative to XDG_CACHE_HOME. Signed-off-by: Devin Lehmacher --- cache.h | 7 +++ path.c | 15 +++ 2 files

Re: [PATCH] submodule.c: fix an 'using integer as NULL pointer' warning

2017-03-15 Thread Brandon Williams
On 03/16, Ramsay Jones wrote: > > Signed-off-by: Ramsay Jones > --- > > Hi Brandon, > > If you need to re-roll your 'bw/submodule-is-active' branch, could > you please squash this into the relevant patch (commit 20d59ab335, > "submodule: decouple url and submodule

git

2017-03-15 Thread ahunt

Re: [RFC PATCH] Move SHA-1 implementation selection into a header file

2017-03-15 Thread Junio C Hamano
Ramsay Jones writes: > On 14/03/17 23:46, brian m. carlson wrote: Since the SHA1_HEADER include is not defined in such a case, developers see spurious errors when using these tools. Furthermore, while using a macro as the argument to #include is

[PATCH 0/2] Teach name-rev to pay more attention to lightweight tags

2017-03-15 Thread Junio C Hamano
Here is a reroll of what I did in http://public-inbox.org/git/xmqqd1die00j@gitster.mtv.corp.google.com/ Junio C Hamano (2): name-rev: refactor logic to see if a new candidate is a better name name-rev: favor describing with tags and use committer date to tiebreak builtin/name-rev.c

[PATCH 2/2] name-rev: favor describing with tags and use committer date to tiebreak

2017-03-15 Thread Junio C Hamano
"git name-rev" assigned a phony "far in the future" date to tips of refs that are not pointing at tag objects, and favored names based on a ref with the oldest date. This made it almost impossible for an unannotated tags and branches to be counted as a viable base, which was especially

Re: [PATCH 0/2] Teach name-rev to pay more attention to lightweight tags

2017-03-15 Thread Stefan Beller
On Wed, Mar 15, 2017 at 3:50 PM, Junio C Hamano wrote: > Here is a reroll of what I did in > > http://public-inbox.org/git/xmqqd1die00j@gitster.mtv.corp.google.com/ > Both patches look good to me. Thanks, Stefan

[PATCH] submodule.c: fix an 'using integer as NULL pointer' warning

2017-03-15 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Brandon, If you need to re-roll your 'bw/submodule-is-active' branch, could you please squash this into the relevant patch (commit 20d59ab335, "submodule: decouple url and submodule existence", 13-03-2017). Thanks! ATB, Ramsay

[RFC PATCH] short status: improve reporting for submodule changes

2017-03-15 Thread Stefan Beller
While we already have a porcelain2 layer for git-status, that is accurate for submodules, users still like the way they are are used to of 'status -s'. As a submodule has more state than a file potentially, we'll look at all cases: -- new submodule commits / - modified files | /

Re: [PATCH v3 10/10] submodule add: respect submodule.active and submodule..active

2017-03-15 Thread Brandon Williams
On 03/14, Junio C Hamano wrote: > Brandon Williams writes: > > > + if git config --get submodule.active >/dev/null > > + then > > + # If the submodule being adding isn't already covered by the > > + # current configured pathspec, set the submodule's

Re: GSoC Project | Submodules related work

2017-03-15 Thread Stefan Beller
On Wed, Mar 15, 2017 at 2:28 PM, Prathamesh wrote: >> What do you mean by catch here? > > By catching commands, I meant that we identify that the user has entered > the command in an unpopulated or uninitialized submodule and respond > to the user accordingly. Well in that

Re: [PATCH 1/6] index-pack: factor out pack/idx finalization

2017-03-15 Thread Jeff King
On Wed, Mar 15, 2017 at 10:03:56PM +, Ramsay Jones wrote: > > - if (final_pack_name != curr_pack_name) { > > - if (!final_pack_name) { > > - snprintf(name, sizeof(name), "%s/pack/pack-%s.pack", > > -get_object_directory(),

Re: [PATCH v3 09/10] submodule--helper init: set submodule..active

2017-03-15 Thread Brandon Williams
On 03/14, Junio C Hamano wrote: > Brandon Williams writes: > > > When initializing a submodule set the submodule..active config to > > true to indicate that the submodule is active. > > > > Signed-off-by: Brandon Williams > > --- > > Hmph. When you do >

Re: [RFC PATCH] short status: improve reporting for submodule changes

2017-03-15 Thread Junio C Hamano
Stefan Beller writes: > While we already have a porcelain2 layer for git-status, that is accurate > for submodules, users still like the way they are are used to of > 'status -s'. > > As a submodule has more state than a file potentially, we'll look at all > cases: > >

Re: [PATCH 3/3] difftool: handle modified symlinks in dir-diff mode

2017-03-15 Thread Johannes Schindelin
Hi David, On Tue, 14 Mar 2017, David Aguilar wrote: > Detect the null object ID for symlinks in dir-diff so that difftool can > detect when symlinks are modified in the worktree. > > Previously, a null symlink object ID would crash difftool. > Handle null object IDs as unknown content that must

[ANNOUNCE] Git Rev News edition 25

2017-03-15 Thread Christian Couder
Hi everyone, The 25th edition of Git Rev News is now published: https://git.github.io/rev_news/2017/03/15/edition-25/ Thanks a lot to all the contributors and helpers! Enjoy, Christian, Thomas, Jakub and Markus.

Re: Finding a tag that introduced a submodule change

2017-03-15 Thread Stefan Beller
On Fri, Mar 3, 2017 at 7:40 AM, Robert Dailey wrote: > I have a repository with a single submodule in it. Since the parent > repository represents the code base for an actual product, I tag > release versions in the parent repository. I do not put tags in the > submodule

Re: git-clone --config order & fetching extra refs during initial clone

2017-03-15 Thread Jeff King
On Sat, Mar 11, 2017 at 01:41:34AM +0100, SZEDER Gábor wrote: > >> static struct ref *wanted_peer_refs(const struct ref *refs, > >> - struct refspec *refspec) > >> + struct refspec *refspec, unsigned int refspec_count) > > > > Most of the changes here and elsewhere are

Re: Commiting files larger than 4 GB on Windows

2017-03-15 Thread Jeff King
On Wed, Mar 15, 2017 at 02:48:57PM +0100, Thomas Braun wrote: > I can not comment on the git-lfs issues. The issue that you can not > properly use files larger than 4GB on windows (no matter if 32bit or > 64bit) is known, see my findings from May last year [1]. Unfortunately > nobody, including

[PATCH] cherry-pick: detect bogus arguments to --mainline

2017-03-15 Thread Jeff King
On Wed, Mar 15, 2017 at 12:08:35AM +0100, Ævar Arnfjörð Bjarmason wrote: > Both of these emit the "is a merge but no -m option was given" when > is a merge. > > I tried to track this down for a bit in the options parsing code but > couldn't see where it was happening, but at some point we're

Re: [PATCH v2 4/4] ls-files: fix bug when recursing with relative pathspec

2017-03-15 Thread Brandon Williams
On 03/14, Stefan Beller wrote: > On Tue, Mar 14, 2017 at 3:11 PM, Brandon Williams wrote: > > When using the --recurse-submodules flag with a relative pathspec which > > includes "..", an error is produced inside the child process spawned for a > > submodule. When creating the

Re: [PATCH] l10n: add framework for localizing the manpages

2017-03-15 Thread Junio C Hamano
Jean-Noël Avila writes: > Le 13/03/2017 à 01:01, Junio C Hamano a écrit : >> +#. type: Plain text >>> +#: git-add.txt:15 >>> +#, no-wrap >>> +msgid "" >>> +"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive >>> | -i] [--patch | -p]\n" >>> +"\t [--edit

Re: Commiting files larger than 4 GB on Windows

2017-03-15 Thread Jeff King
On Wed, Mar 15, 2017 at 11:59:52AM -0400, Jeff King wrote: > I agree that detecting the situation in the meantime is a good idea. > The patch above probably handles the bulk-checkin code path, I'd guess. > It might be nice to have similar checks in other places, too: > > - when reading from an

Re: [RFD PATCH 3/3] name-rev: Allow lightweight tags and branch refs

2017-03-15 Thread Junio C Hamano
Michael J Gruber writes: > Consider the following: > ... > "git describe past present future" gives > > past > past-1-g5ad942f > future > > because (as documented) it does not consider lightweight tags, and thus > has to describe present from the past. > > "git

Re: [PATCH 1/6] index-pack: factor out pack/idx finalization

2017-03-15 Thread Jeff King
On Wed, Mar 15, 2017 at 06:22:23PM -0400, Jeff King wrote: > Then we'd expect the newly-created .idx to have mode 0444, but it > doesn't. So yeah, I think the distinction does matter. > > I'm not sure if the best path is to include that flag in the > finalize_file() helper, or just ditch the

Re: [PATCH v3 07/10] clone: add --submodule-spec= switch

2017-03-15 Thread Brandon Williams
On 03/14, Junio C Hamano wrote: > Brandon Williams writes: > > > The new switch passes the pathspec to `git submodule update > > --init-active` which is called after the actual clone is done. > > > > Additionally this configures the submodule.active option to > > be the given

Re: [PATCH v3 07/10] clone: add --submodule-spec= switch

2017-03-15 Thread Stefan Beller
On Wed, Mar 15, 2017 at 4:08 PM, Brandon Williams wrote: > On 03/14, Junio C Hamano wrote: >> Brandon Williams writes: >> >> > The new switch passes the pathspec to `git submodule update >> > --init-active` which is called after the actual clone is done. >>

Re: GSoC Project | Submodules related work

2017-03-15 Thread Prathamesh
>> Also the conclusions which I was able to make from the mails[2] are: >> >> 1. We are catching commands typed by the user in an unpopulated or >>even an uninitialized submodule. > > What do you mean by catch here? By catching commands, I meant that we identify that the user has entered the

Re: fatal: Could not get current working directory: Permission denied | affected 2.10,2.11,2.12, but not 1.9.5 |

2017-03-15 Thread René Scharfe
Am 15.03.2017 um 10:44 schrieb Zenobiusz Kunegunda: $ git bisect bad 7333ed1788b4f2b162a35003044d77a716732a1f is the first bad commit commit 7333ed1788b4f2b162a35003044d77a716732a1f Author: René Scharfe Date: Mon Jul 28 20:26:40 2014 +0200 setup: convert

[PATCH 0/6] minor pack-name cleanups

2017-03-15 Thread Jeff King
This started by cleaning up some unchecked snprintf() calls, but grew a few related cleanups nearby. I doubt the snprintf truncation affected anybody in practice, but I think the result is nicer to read. [1/6]: index-pack: factor out pack/idx finalization [2/6]: move odb_* declarations out

[PATCH 6/6] odb_pack_keep(): stop generating keepfile name

2017-03-15 Thread Jeff King
The odb_pack_keep() function generates the name of a .keep file and opens it. This has two problems: 1. It requires a fixed-size buffer to create the filename and doesn't notice when the result is truncated. 2. Of the two callers, one sometimes wants to open a filename it already

Re: Commiting files larger than 4 GB on Windows

2017-03-15 Thread Junio C Hamano
Torsten Bögershausen writes: > The real "show stopper" is at the end. > ... > > == > And it seams as if zlib is the limitation here. > Unless we include the zlib source code into Git and redefine uLong, > is there a nice way around this: >

[PATCH 5/6] fast-import: replace fixed buffer with odb_pack_name

2017-03-15 Thread Jeff King
This removes the possibility of truncating the filename without realizing it. Signed-off-by: Jeff King --- fast-import.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fast-import.c b/fast-import.c index 6c13472c4..61be8b76e 100644 --- a/fast-import.c

[PATCH 3/6] sha1_file.c: make pack-name helper globally accessible

2017-03-15 Thread Jeff King
We provide sha1_pack_name() and sha1_pack_index_name(), but the more generic form (which takes its own strbuf and an arbitrary extension) is only used to implement the other two. Let's make it available, but clean up a few things: 1. Name it odb_pack_name(), as the original

[PATCH 4/6] index-pack: drop fixed-size buffer for pack filenames

2017-03-15 Thread Jeff King
We write the name of the pack filename into a fixed-size buffer using snprintf(), but do not check the return value. As a result, a very long object directory could cause us to quietly truncate the pack filename (leading to a corrupted repository, as the packfile would be missing its .pack

Re: [PATCH v3 05/10] submodule: decouple url and submodule existence

2017-03-15 Thread Brandon Williams
On 03/14, Junio C Hamano wrote: > Brandon Williams writes: > > > Currently the submodule..url config option is used to determine > > if a given submodule exists and is interesting to the user. This > > however doesn't work very well because the URL is a config option for > >

Re: [PATCH 3/3] rev-parse: simplify parsing of ref options

2017-03-15 Thread Jeff King
On Wed, Mar 15, 2017 at 02:09:33PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > This actually drops the last caller for for_each_branch_ref(). I'm not > > sure if we shoulder consider cleaning up the proliferation of > > for_each_ref() helpers. > > That is certainly a

Re: [PATCH v3 06/10] submodule update: add `--init-active` switch

2017-03-15 Thread Brandon Williams
On 03/14, Junio C Hamano wrote: > Brandon Williams writes: > > > +static void module_list_active(struct module_list *list) > > +{ > > + int i; > > + > > + if (read_cache() < 0) > > + die(_("index file corrupt")); > > + > > + gitmodules_config(); > > + > > +

Re: [PATCH v3 06/10] submodule update: add `--init-active` switch

2017-03-15 Thread Brandon Williams
On 03/14, Junio C Hamano wrote: > Brandon Williams writes: > > > +--init-active:: > > + This option is only valid for the update command. > > + Initialize all submodules configured in "`submodule.active`" > > + that have not been updated before. > > You mean s/not been

Re: git pretty format: "%+b" not working with "%w" in front of it?

2017-03-15 Thread Jeff King
On Wed, Mar 15, 2017 at 09:08:10AM -0500, Robert Dailey wrote: > $ git log > > commit 7ffb909bb8f38607e3d6d9f3504a66ca978f0ac2 > Author: Robert Dailey > Date: Mon Dec 12 11:01:00 2016 -0600 > > Add initial skeleton files & a few interfaces for new kizi/sc16 stuff > >

Re: [PATCH] submodule-config: correct error reporting for invalid ignore value

2017-03-15 Thread Junio C Hamano
Stefan Beller writes: > As 'var' contains the whole value we get error messages that repeat > the section and key currently: > > warning: Invalid parameter 'true' for config option > 'submodule.submodule.plugins/hooks.ignore.ignore' > > Fix this by only giving the section

Re: [PATCH] l10n: add framework for localizing the manpages

2017-03-15 Thread Stefan Beller
On Wed, Mar 15, 2017 at 12:58 AM, Jean-Noël Avila wrote: > The use of po files introduces tools to automatically mark the > paragraphs that need to be retranslated or if the translation was near > enough to be reviewed (entries are translated with the approaching > translation

Re: Proposal for "fetch-any-blob Git protocol" and server design

2017-03-15 Thread Junio C Hamano
Jonathan Tan writes: > == Design > > A new endpoint "server" is created. The client will send a message in > the following format: > > > fbp-request = PKT-LINE("fetch-blob-pack") > 1*want > flush-pkt > want = PKT-LINE("want" SP obj-id) >

Re: GSoC Project | Submodules related work

2017-03-15 Thread Stefan Beller
On Wed, Mar 15, 2017 at 2:33 AM, Prathamesh Chavan wrote: > Hey everyone, > > I am Prathamesh. I am studying Computer Science and Engineering at IIT > Kharagpur. I am interested to participate in Google Summer of Code 2017 > under Git organization. I attempted "Avoid pipes in

Re: Commiting files larger than 4 GB on Windows

2017-03-15 Thread Thomas Braun
Am 15.03.2017 um 17:13 schrieb Jeff King: > On Wed, Mar 15, 2017 at 11:59:52AM -0400, Jeff King wrote: > >> I agree that detecting the situation in the meantime is a good idea. >> The patch above probably handles the bulk-checkin code path, I'd guess. >> It might be nice to have similar checks in

Re: [PATCH] cherry-pick: detect bogus arguments to --mainline

2017-03-15 Thread Junio C Hamano
Jeff King writes: > The "0" comes from the initialization of the replay_opts struct (it also > happens if you explicitly disclaim any previous option with > --no-mainline). > > I think using 0 as a sentinel is OK here, but the option-parser should > complain when we go out of

Re: [PATCH 1/3] describe: debug is incompatible with contains

2017-03-15 Thread Junio C Hamano
Michael J Gruber writes: > `git describe --contains` calls into `git name-rev` which does not have > any searching to do and thus does not display any debug information. > > Say so in the documentation and catch the incompatible arguments. I am not sure if this is

Re: [PATCH 2/3] git-prompt: add a describe style for any tags

2017-03-15 Thread Junio C Hamano
Michael J Gruber writes: > git-prompt has various describe styles, among them "describe" (by > annotated tags) and "default" (by exact match with any tag). > > Add a mode "tag" that describes by any tag, annotated or not. > > Signed-off-by: Michael J Gruber

Re: [PATCH v3 05/10] submodule: decouple url and submodule existence

2017-03-15 Thread Brandon Williams
On 03/13, Stefan Beller wrote: > + cc Jens, FYI. > > Once upon a time I brought up different addressing/activating mechanism for > submodules and I remember Jens having some uneasy thoughts about > that back in the day. This series addresses the user confusion and > documentation > better than

[PATCH 3/3] rev-parse: simplify parsing of ref options

2017-03-15 Thread Jeff King
All of these options do the same thing "--foo" iterates over the "foo" refs, and "--foo=" does the same with a glob. We can factor this into its own function to avoid repeating ourselves. There are two subtleties to note: - the original called for_each_branch_ref(), etc, in the non-glob

Re: [PATCH] submodule-config: correct error reporting for invalid ignore value

2017-03-15 Thread Stefan Beller
On Wed, Mar 15, 2017 at 12:52 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Stefan Beller writes: >> >>> As 'var' contains the whole value we get error messages that repeat >>> the section and key currently: >>> >>> warning:

Re: [GSoC] Discussion of "Submodule related work" project

2017-03-15 Thread Valery Tolstov
I have a thought. At the moment when submodule command is already translated to C, possibly we want to rename submodule--helper.c, and maybe hide some of it's functions from subcommands list. Is there any examples of similar situation that already happened before? Don't quite sure about this.

[PATCH 2/3] rev-parse: add helper for parsing "--foo/--foo="

2017-03-15 Thread Jeff King
We can't just use a bare skip_prefix() for these cases, because we need to match both the "--foo" form and the "--foo=" form (and tell the difference between the two in the caller). We can wrap this in a simple helper which has two obvious callsites, and will gain some more in the next patch.

[PATCH 1/3] rev-parse: use skip_prefix when parsing options

2017-03-15 Thread Jeff King
Using skip_prefix lets us avoid manually-counted offsets into the argument string. This patch converts the simple and obvious cases. Signed-off-by: Jeff King --- builtin/rev-parse.c | 40 1 file changed, 20 insertions(+), 20 deletions(-)

Re: [RFC PATCH] Move SHA-1 implementation selection into a header file

2017-03-15 Thread Ramsay Jones
On 15/03/17 15:57, Junio C Hamano wrote: > Ramsay Jones writes: > >> On 14/03/17 23:46, brian m. carlson wrote: > > Since the SHA1_HEADER include is not defined in such a case, developers > see spurious errors when using these tools. Furthermore, while

Re: [RFD PATCH 3/3] name-rev: Allow lightweight tags and branch refs

2017-03-15 Thread Junio C Hamano
Michael J Gruber writes: > I'm wondering whether I'm overlooking any side-effects that our test > suite doesn't cover, though. In any case, we may want to have > lightweight tags allowed based on an extra flag (like the > existing --tags for describe, which means

Re: [PATCH] submodule-config: correct error reporting for invalid ignore value

2017-03-15 Thread Junio C Hamano
Junio C Hamano writes: > Stefan Beller writes: > >> As 'var' contains the whole value we get error messages that repeat >> the section and key currently: >> >> warning: Invalid parameter 'true' for config option >>

[PATCH 0/3] minor rev-parse option-parsing cleanups

2017-03-15 Thread Jeff King
I happened to be looking at these yesterday and got annoyed by the tangled logic. No bug-fixes, but the result is less repetitive and has fewer magic numbers. [1/3]: rev-parse: use skip_prefix when parsing options [2/3]: rev-parse: add helper for parsing "--foo/--foo=" [3/3]: rev-parse:

Re: [PATCH] l10n: add framework for localizing the manpages

2017-03-15 Thread Jean-Noël Avila
Le 13/03/2017 à 01:01, Junio C Hamano a écrit : > +#. type: Plain text >> +#: git-add.txt:15 >> +#, no-wrap >> +msgid "" >> +"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive >> | -i] [--patch | -p]\n" >> +"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update

Re: [PATCH] l10n: add framework for localizing the manpages

2017-03-15 Thread Jean-Noël Avila
Le 14/03/2017 à 22:00, Ævar Arnfjörð Bjarmason a écrit : > On Mon, Mar 13, 2017 at 1:01 AM, Junio C Hamano wrote: >> Jean-Noel Avila writes: > Jean: Comments on the patch: > > - Firstly thanks for working on this. When I hacked up the initial po > support in

Re: [PATCH 3/3] rev-parse: simplify parsing of ref options

2017-03-15 Thread Junio C Hamano
Jeff King writes: > This actually drops the last caller for for_each_branch_ref(). I'm not > sure if we shoulder consider cleaning up the proliferation of > for_each_ref() helpers. That is certainly a good thing to do (but outside this series). I am wondering if "git diff" could

Re: Commiting files larger than 4 GB on Windows

2017-03-15 Thread Torsten Bögershausen
On 2017-03-15 17:13, Jeff King wrote: > On Wed, Mar 15, 2017 at 11:59:52AM -0400, Jeff King wrote: > >> I agree that detecting the situation in the meantime is a good idea. >> The patch above probably handles the bulk-checkin code path, I'd guess. >> It might be nice to have similar checks in

Re: [GSoC] Discussion of "Submodule related work" project

2017-03-15 Thread Stefan Beller
On Wed, Mar 15, 2017 at 1:43 PM, Valery Tolstov wrote: > I have a thought. At the moment when submodule command is already translated > to C, possibly we want to rename submodule--helper.c, and maybe hide > some of it's functions from subcommands list. Is there any examples of

Re: [RFD PATCH 3/3] name-rev: Allow lightweight tags and branch refs

2017-03-15 Thread Junio C Hamano
Junio C Hamano writes: > This could have been an invocation of "name-rev" without "--tags", > where _any_ tip of ref can be used to name a revision, and in such a > case, retaining commit->date may still be valuable, but it is > probably wrong to use it for nothing more than

Re: [PATCH v2 3/3] difftool: handle modified symlinks in dir-diff mode

2017-03-15 Thread David Aguilar
On Wed, Mar 15, 2017 at 11:54:14AM -0700, Junio C Hamano wrote: > David Aguilar writes: > > > @@ -397,7 +438,7 @@ static int run_dir_diff(const char *extcmd, int > > symlinks, const char *prefix, > > return error("could not write '%s'", src_path); >

[PATCH 2/6] move odb_* declarations out of git-compat-util.h

2017-03-15 Thread Jeff King
These functions were originally conceived as wrapper functions similar to xmkstemp(). They were later moved by 463db9b10 (wrapper: move odb_* to environment.c, 2010-11-06). The more appropriate place for a declaration is in cache.h. While we're at it, let's add some basic docstrings.

[PATCH 1/6] index-pack: factor out pack/idx finalization

2017-03-15 Thread Jeff King
The procedure for moving the ".pack" and the ".idx" files into place is the same. Rather than repeat the code, let's factor it into a helper function. This has the added benefit of clarifying the lifetime of "final_pack_name". In the original code it is sometimes redirected to our reusable "name"

Re: [Bug] Unicode display

2017-03-15 Thread Chris Packham
Hi, On Wed, Mar 15, 2017 at 5:51 PM, Dũng Đặng Minh wrote: > Hi Git team, > > Thank you all for create a great tool. > Last week, I updated the last version of git (2.12.0 x64-Windows) and > all Unicode characters are display un-correctly. You can see: >

[PATCH 2/3] t7800: cleanup cruft left behind by tests

2017-03-15 Thread David Aguilar
Signed-off-by: David Aguilar --- More cleanup, this is needed because the final patch adds a test to t7800 that was sensitive to the cruft left behind. t/t7800-difftool.sh | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/t/t7800-difftool.sh

Re: [Bug] Unicode display

2017-03-15 Thread Dũng Đặng Minh
Hi Chris, Thank you. I will keep an eye on that issue. On Wed, Mar 15, 2017 at 1:48 PM, Chris Packham wrote: > Hi, > > On Wed, Mar 15, 2017 at 5:51 PM, Dũng Đặng Minh wrote: >> Hi Git team, >> >> Thank you all for create a great tool. >> Last week,

Re: [PATCH] git-status: make porcelain more robust

2017-03-15 Thread Matthieu Moy
Junio C Hamano writes: > Michael J Gruber writes: > >> git status provides a porcelain mode for porcelain writers with a >> supposedly stable (plumbing) interface. >> 7a76c28ff2 ("status: disable translation when --porcelain is used", >>

[PATCH 1/3] t7800: remove whitespace before redirect

2017-03-15 Thread David Aguilar
Signed-off-by: David Aguilar --- Cleanup before the fix. t/t7800-difftool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 25241f4096..e1ec292718 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@

[PATCH 3/3] difftool: handle modified symlinks in dir-diff mode

2017-03-15 Thread David Aguilar
Detect the null object ID for symlinks in dir-diff so that difftool can detect when symlinks are modified in the worktree. Previously, a null symlink object ID would crash difftool. Handle null object IDs as unknown content that must be read from the worktree. Helped-by: Johannes Schindelin

Re: [PATCH] submodule-config: correct error reporting for invalid ignore value

2017-03-15 Thread Stefan Beller
On Wed, Mar 15, 2017 at 11:29 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> As 'var' contains the whole value we get error messages that repeat >> the section and key currently: >> >> warning: Invalid parameter 'true' for config option >>

Re: [PATCH v2 3/3] difftool: handle modified symlinks in dir-diff mode

2017-03-15 Thread Junio C Hamano
David Aguilar writes: > Detect the null object ID for symlinks in dir-diff so that difftool can > detect when symlinks are modified in the worktree. > > Previously, a null symlink object ID would crash difftool. > Handle null object IDs as unknown content that must be read from

Re: [PATCH 1/6] index-pack: factor out pack/idx finalization

2017-03-15 Thread Ramsay Jones
On 15/03/17 21:27, Jeff King wrote: > The procedure for moving the ".pack" and the ".idx" files > into place is the same. Rather than repeat the code, let's > factor it into a helper function. > > This has the added benefit of clarifying the lifetime of > "final_pack_name". In the original code

Darlehen angebot 3 %

2017-03-15 Thread Frau SCHMIDT
Sehr geehrte Damen und Herren, Haben Sie Interesse über einer finanziellen Darlehen zu 3%??? kontaktieren Sie mich für mehr Details und Bedingungen. ich kann all jenen helfen, wer ein Darlehen benötigen. Ich kann Ihnen biete ein darlehen in hohe von 10.000.000 € Meine mail: