Re: [feature request] Make "commit --only" work with new files

Hi Luis, On Fri, 25 Nov 2016, Luis Ressel wrote: > currently "git commit --only " only works if is already > checked into the repo, but not with newly created and still untracked > files (builtin/commit.c:list_path() throws the error "error: pathspec > '' did not match any file(s) known to

Re: [PATCH] l10n: de.po: translate 210 new message

2016-11-25 2:25 GMT+08:00 Ralf Thielow : > #: sequencer.c:251 > -#, fuzzy, c-format > +#, c-format > msgid "could not write eol to '%s" Unmatched single quote has been fixed in l10n round 3. You can rebase and update de.po file. BTW, Git 2.11.0 will be released

did you receive my previous email ?

This is the second time i am sending you this mail.I, Friedrich Mayrhofer Donate $ 1,000,000.00 to You, Email Me personally for more details. Regards. Friedrich Mayrhofer

Re: cherry-pick -Xrenormalize fails with formerly CRLF files

On Sun, Nov 27, 2016 at 10:19:35PM -0800, Eevee (Lexy Munroe) wrote: > I'm working with a repo that used to be all CRLF. At some point it > was changed to all LF, with `text=auto` in .gitattributes for the > sake of Windows devs. I'm on Linux and have never touched any > twiddles relating to

Re: [PATCH v1 15/19] config: add git_config_get_date_string() from gc.c

On Wed, Nov 23, 2016 at 6:34 PM, Junio C Hamano wrote: > Christian Couder writes: > >> Ok it will appear like this in cache.h: >> >> /* This dies if the configured or default date is in the future */ >> extern int

Fw: Re: Fw: Re: Offer quotation # 10640 - Baude Nov 26

Hello, Thank you very much for the telephone call from your office. We are pleased to submit you according to our sales and delivery terms without any engagement our quotation no. 11011290 enclosed to this message. We hope that this attached proposal will give you full satisfaction and we

Re: [PATCH v1 15/19] config: add git_config_get_date_string() from gc.c

Christian Couder writes: > What about something like this then: > > /* This dies if the configured or default date is in the future */ > extern int git_config_get_expiry_or_die(const char *key, const char **output); > > Also git_config_get_int(), git_config_get_bool()

Re: [PATCH v3 1/2] difftool: add a skeleton for the upcoming builtin

Jeff King writes: > On Sat, Nov 26, 2016 at 02:01:36PM +0100, Johannes Schindelin wrote: > >> > If you want to control it from outside the test script, you'd need >> > something like: >> > >> > if test "$GIT_TEST_DIFFTOOL" = "builtin" >> >> That is a bit magic. I first used

Re: trustExitCode doesn't apply to vimdiff mergetool

David Aguilar writes: > deltawalker, diffmerge, emerge, kdiff3, kompare, and tkdiff originally > provided behavior that matched trustExitCode=true. > > The default for all tools is trustExitCode=false, which conflicts with > these tools' defaults. Allow tools to advertise

Re: [PATCH v3 1/2] difftool: add a skeleton for the upcoming builtin

Hi, On Mon, 28 Nov 2016, Junio C Hamano wrote: > Jeff King writes: > > > On Sat, Nov 26, 2016 at 02:01:36PM +0100, Johannes Schindelin wrote: > > > >> > If you want to control it from outside the test script, you'd need > >> > something like: > >> > > >> > if test

Re: [PATCH] l10n: de.po: translate 210 new message

2016-11-28 15:21 GMT+01:00 Jiang Xin : > 2016-11-25 2:25 GMT+08:00 Ralf Thielow : >> #: sequencer.c:251 >> -#, fuzzy, c-format >> +#, c-format >> msgid "could not write eol to '%s" > > Unmatched single quote has been fixed in l10n round 3. > You

Re: [PATCH 31/35] pathspec: allow querying for attributes

On 11/10, Stefan Beller wrote: > @@ -500,6 +586,18 @@ void copy_pathspec(struct pathspec *dst, const struct > pathspec *src) > > void clear_pathspec(struct pathspec *pathspec) > { > + int i, j; > + for (i = 0; i < pathspec->nr; i++) { > + if

Re: [PATCH v3 1/2] difftool: add a skeleton for the upcoming builtin

Johannes Schindelin writes: > However, I have been bitten time and again by problems that occurred only > in production, our test suite (despite taking already waay too long to > be truly useful in my daily development) was simply not good enough. > > So my plan

Re: [PATCH v2 00/11] git worktree (re)move

Junio C Hamano writes: > Does this round address the issue raised in > > http://public-inbox.org/git/alpine.DEB.2.20.1611161041040.3746@virtualbox > > by Dscho? > > Even if you are not tracking a fifo, for example, your working tree > may have one created in t/trash*

Partial fetch?

I'm trying to fetch a remote repository over https but sadly it timeouts too soon. $ git fetch -v upstream POST git-upload-pack (gzip 1148 to 641 bytes) POST git-upload-pack (gzip 1148 to 644 bytes) POST git-upload-pack (gzip 1948 to 1038 bytes) POST git-upload-pack (gzip 3548 to 1845 bytes) POST

Hello

Good Morning to you, Please i have something to discuss with you, can you kindly confirm back your email to me Will definite be glad to hear from you. thanks Anessa.

Re: [PATCH v2 00/11] git worktree (re)move

Am 28.11.2016 um 21:20 schrieb Junio C Hamano: Junio C Hamano writes: Does this round address the issue raised in http://public-inbox.org/git/alpine.DEB.2.20.1611161041040.3746@virtualbox by Dscho? Even if you are not tracking a fifo, for example, your working tree may

Re: [PATCH v2 0/5] nd/worktree-list-fixup

Nguyễn Thái Ngọc Duy writes: > This version > > * changes get_worktrees() to take a flag, and adds one flag for > sorting. > > * adds tests for both the 'main worktree always present' and the > sorting problems. > > * reworks 3/5 a bit, keep changes closer, easier to see

Re: [feature request] Make "commit --only" work with new files

Luis Ressel writes: > currently "git commit --only " only works if is already > checked into the repo, but not with newly created and still untracked > files (builtin/commit.c:list_path() throws the error "error: pathspec > '' did not match any file(s) known to git.") The fact

Re: [PATCH v2 2/2] Avoid a segmentation fault with renaming merges

Johannes Schindelin writes: > On Sat, 26 Nov 2016, Johannes Schindelin wrote: > >> diff --git a/merge-recursive.c b/merge-recursive.c >> index 9041c2f149..609061f58a 100644 >> --- a/merge-recursive.c >> +++ b/merge-recursive.c >> @@ -235,6 +235,8 @@ static int

Re: [PATCH] l10n: de.po: translate 210 new message

Ralf Thielow writes: > 2016-11-28 15:21 GMT+01:00 Jiang Xin : >> 2016-11-25 2:25 GMT+08:00 Ralf Thielow : >>> #: sequencer.c:251 >>> -#, fuzzy, c-format >>> +#, c-format >>> msgid "could not write eol to '%s" >> >>

Re: What's cooking in git.git (Nov 2016, #05; Wed, 23)

Duy Nguyen writes: > On Thu, Nov 24, 2016 at 6:21 AM, Junio C Hamano wrote: >> * nd/rebase-forget (2016-10-28) 1 commit >> - rebase: add --forget to cleanup rebase, leave HEAD untouched >> >> "git rebase" learned "--forget" option, which allows a user to

Re: [PATCH v2 00/11] git worktree (re)move

Nguyễn Thái Ngọc Duy writes: > v2 contains some style fix and adapts to the new get_worktrees() api > from nd/worktree-list-fixup (which means it can't be built without > that series). > > Nguyễn Thái Ngọc Duy (11): > copy.c: import copy_file() from busybox > copy.c:

Re: [PATCH 0/3] Minor fixes on 'git worktree'

Duy Nguyen writes: > An interesting thing maybe worth > sharing is, if HEAD is broken (the only reason we would fail to create > "struct worktree" for main worktree), then "git worktree list" from > main worktree would fail too, because repo setup code fails to parse > HEAD as

Re: [PATCH 31/35] pathspec: allow querying for attributes

On 11/10, Stefan Beller wrote: > +static void parse_pathspec_attr_match(struct pathspec_item *item, const char > *value) > +{ > > [...] > > + if (!item->attr_check) > + git_attr_check_initv(>attr_check, attrs.argv); > + else > + die(_("Only one 'attr:'

Re: [PATCH] allow git-p4 to create shelved changelists

Vinicius Kursancew writes: > This patch adds a "--shelve" option to the submit subcommand, it will > save the changes to a perforce shelve instead of commiting them. > > Vinicius Kursancew (1): > git-p4: allow submit to create shelved changelists. > >

Re: [PATCH v2] date-formats.txt: Typo fix

Luis Ressel writes: > Last time I checked, I was living in the UTC+01:00 time zone. UTC+02:00 > would be Central European _Summer_ Time. > --- Thanks; please sign-off your patches, even a trivial ones like this. > Documentation/date-formats.txt | 2 +- > 1 file changed, 1

Re: [PATCH v2 2/2] Avoid a segmentation fault with renaming merges

Junio C Hamano writes: > Looking at the commit you blamed, what happened in this case before > that change was that > > (1) make_cache_entry() would have called refresh_cache_entry() with > CE_MATCH_REFRESH and returned a NULL; > > (2) merge-recursive.c::add_cacheinfo()

[PATCH] diff: handle --no-abbrev outside of repository

The "git diff --no-index" codepath doesn't handle the --no-abbrev option. Signed-off-by: Jack Bates --- diff.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diff.c b/diff.c index ec87283..0447eff 100644 --- a/diff.c +++ b/diff.c @@ -3106,7

Re: [PATCH] diff: handle --no-abbrev outside of repository

Jack Bates writes: > The "git diff --no-index" codepath doesn't handle the --no-abbrev > option. > > Signed-off-by: Jack Bates > --- This patch also needs a new test to protect the fix from future breakages. It is unfortunate that parsing of

Re: RFC: Enable delayed responses to Git clean/smudge filter requests

Lars Schneider writes: > What way do you think is better from a maintenance point of view? > I prefer option 2 but I fear that these "special" values could confuse > future readers of the code. I recall getting confused by the redefinition of the meaning of return

[GIT PULL] l10n updates for 2.11.0 round 3

Hi Junio, The following changes since commit e2b2d6a172b76d44cb7b1ddb12ea5bfac9613a44: Git 2.11-rc3 (2016-11-23 11:24:59 -0800) are available in the git repository at: git://github.com/git-l10n/git-po tags/l10n-2.11.0-rnd3 for you to fetch changes up to

Re: [PATCH 31/35] pathspec: allow querying for attributes

On 11/10, Stefan Beller wrote: > @@ -500,6 +586,18 @@ void copy_pathspec(struct pathspec *dst, const struct > pathspec *src) > > void clear_pathspec(struct pathspec *pathspec) > { > + int i, j; > + for (i = 0; i < pathspec->nr; i++) { > + if

What's cooking in git.git (Nov 2016, #06; Mon, 28)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. You can find the changes

Re: cherry-pick -Xrenormalize fails with formerly CRLF files

On 11/28/2016 07:54 AM, Torsten Bögershausen wrote: On Sun, Nov 27, 2016 at 10:19:35PM -0800, Eevee (Lexy Munroe) wrote: I'm working with a repo that used to be all CRLF. At some point it was changed to all LF, with `text=auto` in .gitattributes for the sake of Windows devs. I'm on Linux and

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

On 11/28, Junio C Hamano wrote: > * bw/grep-recurse-submodules (2016-11-22) 6 commits > - grep: search history of moved submodules > - grep: enable recurse-submodules to work on objects > - grep: optionally recurse into submodules > - grep: add submodules as a grep source type > -

Re: [PATCH] Release note spelling and phrasing fixups.

Marc Branchaud writes: > Signed-off-by: Marc Branchaud > --- > > Mostly just missing words and what I feel are clarifications. > > The biggest change is to the "git add -N" item. Not 100% sure > I got it right. > > M. > - * When new

Re: What's cooking in git.git (Nov 2016, #05; Wed, 23)

On 11/23/2016 03:21 PM, Junio C Hamano wrote: * jt/use-trailer-api-in-commands (2016-11-02) 6 commits - sequencer: use trailer's trailer layout - trailer: have function to describe trailer layout - trailer: avoid unnecessary splitting on lines - commit: make ignore_non_trailer take buf/len

Re: What's cooking in git.git (Nov 2016, #05; Wed, 23)

Jonathan Tan writes: > On 11/23/2016 03:21 PM, Junio C Hamano wrote: >> * jt/use-trailer-api-in-commands (2016-11-02) 6 commits >> - sequencer: use trailer's trailer layout >> - trailer: have function to describe trailer layout >> - trailer: avoid unnecessary

[ANNOUNCE] git-cinnabar 0.4.0 release candidate

Hi, Git-cinnabar is a git remote helper to interact with mercurial repositories. It allows to clone, pull and push from/to mercurial remote repositories, using git. Code on https://github.com/glandium/git-cinnabar This release on https://github.com/glandium/git-cinnabar/releases/tag/0.4.0rc [

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

On Mon, Nov 28, 2016 at 05:05:38PM -0800, Brandon Williams wrote: > On 11/28, Junio C Hamano wrote: > > * bw/grep-recurse-submodules (2016-11-22) 6 commits > > - grep: search history of moved submodules > > - grep: enable recurse-submodules to work on objects > > - grep: optionally recurse

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

On Tue, Nov 29, 2016 at 01:37:59AM -0500, Jeff King wrote: > 2. Grep threads doing more complicated stuff that needs to take a > lock. You might try building with -fsanitize=thread to see if it > turns up anything. I tried this and it didn't find anything useful. It complains about

Re: What's cooking in git.git (Nov 2016, #06; Mon, 28)

On Mon, Nov 28, 2016 at 04:15:08PM -0800, Junio C Hamano wrote: > * jk/nofollow-attr-ignore (2016-11-02) 5 commits > - exclude: do not respect symlinks for in-tree .gitignore > - attr: do not respect symlinks for in-tree .gitattributes > - exclude: convert "check_index" into a flags field > -

Re: [PATCH] diff: handle --no-abbrev outside of repository

On Mon, Nov 28, 2016 at 11:25:08AM -0700, Jack Bates wrote: > diff --git a/diff.c b/diff.c > index ec87283..0447eff 100644 > --- a/diff.c > +++ b/diff.c > @@ -3106,7 +3106,8 @@ static const char *diff_abbrev_oid(const struct > object_id *oid, int abbrev) > abbrev =

Re: What's cooking in git.git (Nov 2016, #05; Wed, 23)

On Mon, Nov 28, 2016 at 4:06 PM, Junio C Hamano wrote: > Jonathan Tan writes: > >> On 11/23/2016 03:21 PM, Junio C Hamano wrote: >>> * jt/use-trailer-api-in-commands (2016-11-02) 6 commits >>> - sequencer: use trailer's trailer layout >>> - trailer:

[PATCH v2 0/5] nd/worktree-list-fixup

This version * changes get_worktrees() to take a flag, and adds one flag for sorting. * adds tests for both the 'main worktree always present' and the sorting problems. * reworks 3/5 a bit, keep changes closer, easier to see the cause and consequence. Nguyễn Thái Ngọc Duy (5):

[PATCH v2 4/5] worktree.c: get_worktrees() takes a new flag argument

This is another no-op patch, in preparation for get_worktrees() to do optional things, like sorting. Signed-off-by: Nguyễn Thái Ngọc Duy --- branch.c | 2 +- builtin/branch.c | 2 +- builtin/worktree.c | 6 +++--- worktree.c | 4 ++-- worktree.h |

[PATCH v2 3/5] get_worktrees() must return main worktree as first item even on error

This is required by git-worktree.txt, stating that the main worktree is the first line (especially in --porcelain mode when we can't just change behavior at will). There's only one case when get_worktrees() may skip main worktree, when parse_ref() fails. Update the code so that we keep first item

[PATCH v2 5/5] worktree list: keep the list sorted

It makes it easier to write tests for. But it should also be good for the user since locating a worktree by eye would be easier once they notice this. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 2 +- t/t2027-worktree-list.sh | 19 +++

[PATCH v2 1/5] worktree.c: zero new 'struct worktree' on allocation

This keeps things a bit simpler when we add more fields, knowing that default values are always zero. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- worktree.c | 14 ++ 1 file changed, 2 insertions(+), 12 deletions(-)

[PATCH v2 2/5] worktree: reorder an if statement

This is no-op. But it helps reduce diff noise in the next patch. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index 5c4854d..8a654e4 100644 ---

[PATCH v2 03/11] copy.c: convert bb_(p)error_msg to error(_errno)

Signed-off-by: Nguyễn Thái Ngọc Duy --- copy.c | 85 -- 1 file changed, 31 insertions(+), 54 deletions(-) diff --git a/copy.c b/copy.c index b7a87f1..074b609 100644 --- a/copy.c +++ b/copy.c @@ -82,23 +82,16 @@

[PATCH v2 09/11] worktree move: accept destination as directory

Similar to "mv a b/", which is actually "mv a b/a", we extract basename of source worktree and create a directory of the same name at destination if dst path is a directory. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 19 ++- 1 file changed,

[PATCH v2 08/11] worktree move: new command

There are two options to move the main worktree, but both have complications, so it's not implemented yet. Anyway the options are: - convert the main worktree to a linked one and move it away, leave the git repository where it is. The repo essentially becomes bare after this move. - move

[PATCH v2 11/11] worktree remove: new command

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-worktree.txt | 21 + builtin/worktree.c | 79 ++ contrib/completion/git-completion.bash | 5 ++- t/t2028-worktree-move.sh | 26

[PATCH v2 02/11] copy.c: delete unused code in copy_file()

- selinux preservation code - make-link code - delete link dereference code - non-recursive copy code - stat no preservation code - verbose printing code Some of these are "cp" features that we don't need (for "git worktree move"). Some do not make sense in source-control context (SELinux).

[PATCH v2 10/11] worktree move: refuse to move worktrees with submodules

Submodules contains .git files with relative paths. After a worktree move, these files need to be updated or they may point to nowhere. This is a bandage patch to make sure "worktree move" don't break people's worktrees by accident. When .git file update code is in place, this

[PATCH v2 04/11] copy.c: style fix

Signed-off-by: Nguyễn Thái Ngọc Duy --- copy.c | 50 +- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/copy.c b/copy.c index 074b609..60c7d8a 100644 --- a/copy.c +++ b/copy.c @@ -111,8 +111,10 @@ int FAST_FUNC

[PATCH v2 00/11] git worktree (re)move

v2 contains some style fix and adapts to the new get_worktrees() api from nd/worktree-list-fixup (which means it can't be built without that series). Nguyễn Thái Ngọc Duy (11): copy.c: import copy_file() from busybox copy.c: delete unused code in copy_file() copy.c: convert bb_(p)error_msg

[PATCH v2 07/11] worktree.c: add update_worktree_location()

Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 21 + worktree.h | 6 ++ 2 files changed, 27 insertions(+) diff --git a/worktree.c b/worktree.c index 929072a..7684951 100644 --- a/worktree.c +++ b/worktree.c @@ -354,6 +354,27 @@ int

[PATCH v2 01/11] copy.c: import copy_file() from busybox

This is busybox's unmodified copy_file() in libbb/copy_file.c from the GPL2+ commit f2c043acfcf9dad9fd3d65821b81f89986bbe54e (busybox: fix uninitialized memory when displaying IPv6 addresses - 2016-01-18). This is a no-op commit. More changes are needed before this new code can compile. This will

[PATCH v2 06/11] worktree.c: add validate_worktree()

This function is later used by "worktree move" and "worktree remove" to ensure that we have a good connection between the repository and the worktree. For example, if a worktree is moved manually, the worktree location recorded in $GIT_DIR/worktrees/.../gitdir is incorrect and we should not move

[PATCH v2 05/11] copy.c: convert copy_file() to copy_dir_recursively()

This finally enables busybox's copy_file() code under a new name (because "copy_file" is already taken in Git code base). Because this comes from busybox, POSIXy (or even Linuxy) behavior is expected. More changes may be needed for Windows support. Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH] git-p4: allow submit to create shelved changelists.

Add a --shelve command line argument which invokes p4 shelve instead of submitting changes. After shelving the changes are reverted from the p4 workspace. Signed-off-by: Vinicius Kursancew --- Documentation/git-p4.txt | 5 + git-p4.py| 36

[PATCH] allow git-p4 to create shelved changelists

This patch adds a "--shelve" option to the submit subcommand, it will save the changes to a perforce shelve instead of commiting them. Vinicius Kursancew (1): git-p4: allow submit to create shelved changelists. Documentation/git-p4.txt | 5 + git-p4.py| 36