[PATCH 4/3] sha1_file.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- Since jk/pack-idx-corruption-safety is already in 'next', can we add this patch on top? Surrounding strings are handled separately [1] by another series. [1] http://thread.gmane.org/gmane.comp.version-control.git/287661/focus=287678

Re: What's cooking in git.git (Feb 2016, #07; Thu, 25)

On 27.02.16 04:29, Jeff King wrote: > On Fri, Feb 26, 2016 at 03:35:10PM -0800, Junio C Hamano wrote: > >>> Digging means: >>> run git bisect and report the commit. >>> And this makes the compiler happy: >>> Revert "tree-diff: catch integer overflow in combine_diff_path allocation" >> So? >>

[PATCH 21/22] transport.c: mark strings for translating

More strings can be translated in print_ref_status() at least, but we need to deal with utf-8 string length there. Let's stick with a safe subset for now. Signed-off-by: Nguyễn Thái Ngọc Duy --- transport.c | 41 ++--- 1 file changed, 22

[PATCH 20/22] transport-helper.c: mark strings for translating

Debug printing is kept in English to reduce workload for translators. Those rare who actually debug this can read English anyway. Signed-off-by: Nguyễn Thái Ngọc Duy --- transport-helper.c | 84 +++--- 1 file changed, 42

[PATCH 22/22] wrapper.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- wrapper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wrapper.c b/wrapper.c index 9afc1a0..d2e3068 100644 --- a/wrapper.c +++ b/wrapper.c @@ -91,10 +91,10 @@ static void *do_xmallocz(size_t size, int gentle)

[PATCH 19/22] trailer.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- trailer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trailer.c b/trailer.c index 94b387b..8e48a5c 100644 --- a/trailer.c +++ b/trailer.c @@ -234,7 +234,7 @@ static const char *apply_command(const char *command,

[PATCH 17/22] sha1_file.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- sha1_file.c | 189 ++-- 1 file changed, 96 insertions(+), 93 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 0251700..f669499 100644 --- a/sha1_file.c +++ b/sha1_file.c

[PATCH 18/22] submodule.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- submodule.c | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/submodule.c b/submodule.c index 24fb81a..4dd6ab3 100644 --- a/submodule.c +++ b/submodule.c @@ -187,7 +187,7 @@ void

[PATCH 16/22] run-command.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- run-command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run-command.c b/run-command.c index 863dad5..1ee2357 100644 --- a/run-command.c +++ b/run-command.c @@ -909,7 +909,7 @@ static int

[PATCH 15/22] remote-curl.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- remote-curl.c | 40 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/remote-curl.c b/remote-curl.c index 15e48e2..d5b33aa 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -177,7

[PATCH 13/22] ref-filter.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- ref-filter.c | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index bb79d6b..bc551a7 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -74,14 +74,14 @@ static

[PATCH 14/22] refs/files-backend.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- refs/files-backend.c | 86 ++-- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index 81f68f8..bf76094 100644 ---

[PATCH 11/22] ident.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- ident.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ident.c b/ident.c index 6e12582..367a5dc 100644 --- a/ident.c +++ b/ident.c @@ -75,13 +75,13 @@ static int add_mailname_host(struct strbuf

[PATCH 12/22] notes.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- notes.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/notes.c b/notes.c index 88cf474..0f03f77 100644 --- a/notes.c +++ b/notes.c @@ -422,7 +422,7 @@ static void load_subtree(struct notes_tree *t,

[PATCH 10/22] http.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- http.c | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/http.c b/http.c index 1d5e3bb..d56cb52 100644 --- a/http.c +++ b/http.c @@ -404,7 +404,7 @@ static void init_curl_proxy_auth(CURL

[PATCH 05/22] builtin/config.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/config.c b/builtin/config.c index ca9f834..98ca43d 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -378,7 +378,7 @@ static int

[PATCH 08/22] convert.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- convert.c | 30 +- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/convert.c b/convert.c index f524b8d..59d03b0 100644 --- a/convert.c +++ b/convert.c @@ -199,9 +199,11 @@ static void

[PATCH 02/22] builtin/blame.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/blame.c | 58 - 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index e982fb8..988a38a 100644 --- a/builtin/blame.c +++

[PATCH 03/22] builtin/checkout.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/checkout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index cfa66e2..efcbd8f 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -662,7 +662,7 @@ static

[PATCH 09/22] credential-cache--daemon.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- credential-cache--daemon.c | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c index 63ca7c8..ab33355 100644 ---

[PATCH 06/22] builtin/config.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/config.c | 41 + 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index 98ca43d..b07df26 100644 --- a/builtin/config.c +++

[PATCH 07/22] builtin/update-index.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/update-index.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index 1c94ca5..21e38a8 100644 --- a/builtin/update-index.c +++

[PATCH 04/22] builtin/clone.c: mark strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/clone.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/clone.c b/builtin/clone.c index 9ac6c01..6616392 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -236,8 +236,8 @@ static char

[PATCH 00/22] Mark more strings for translation

On Sat, Feb 27, 2016 at 6:41 AM, Junio C Hamano wrote: > In previous cycles, I often left many topics in 'next' when tagging > this zero-th preview, but eventually merged them before the final. > I decided to do things a bit differently for this cycle: a topic, > once it hits

[PATCH 01/22] credential-cache--daemon: enable localized messages

Signed-off-by: Nguyễn Thái Ngọc Duy --- credential-cache--daemon.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c index caef21e..63ca7c8 100644 --- a/credential-cache--daemon.c +++ b/credential-cache--daemon.c @@

Consulting for implementation

good afternoon GIT Community We are a group of people interested in using management software versions of GIT for the solution of social problems and citizen empowerment in smart cities. I need to speak with a representative of the community, to explain the idea and have an advice of the

[PATCH] add--interactive: allow custom diff highlighting programs

The patch hunk selector of add--interactive knows how ask git for colorized diffs, and correlate them with the uncolored diffs we apply. But there's not any way for somebody who uses a diff-filter tool like contrib's diff-highlight to see their normal highlighting. This patch lets users define an

Re: [PATCH/RFC] builtin/tag: Changes argument format for verify

On Fri, Feb 26, 2016 at 07:27:44PM -0500, santi...@nyu.edu wrote: > From: Santiago Torres > > The verify tag function converts the commit sha1 to hex and passes it as > a command-line argument to builtin/verify-tag. Given that builtin/verify-tag > already resolves the ref name

Re: [PATCH v6 28/32] config: read ref storage config on startup

On Fri, Feb 26, 2016 at 10:56:34PM -0500, Jeff King wrote: > My second confusion is why this is happening in git_config_early(). That > function is called during the setup of check_repository_format_gently(), > which is why I think you wanted to put the code here. But it's _also_ > called as part

Re: [PATCH v6 05/32] refs: add a backend method structure with transaction functions

On Wed, Feb 24, 2016 at 05:58:37PM -0500, David Turner wrote: > +int set_ref_storage_backend(const char *name) > +{ > + struct ref_storage_be *be; > + > + for (be = refs_backends; be; be = be->next) > + if (!strcmp(be->name, name)) { > + the_refs_backend =

Re: [PATCH v6 28/32] config: read ref storage config on startup

On Wed, Feb 24, 2016 at 05:59:00PM -0500, David Turner wrote: > @@ -1207,6 +1208,29 @@ int git_config_early(config_fn_t fn, void *data, const > char *repo_config) > } > > if (repo_config && !access_or_die(repo_config, R_OK, 0)) { > + char *storage = NULL; > + > +

Re: What's cooking in git.git (Feb 2016, #07; Thu, 25)

On Fri, Feb 26, 2016 at 03:35:10PM -0800, Junio C Hamano wrote: > > Digging means: > > run git bisect and report the commit. > > And this makes the compiler happy: > > Revert "tree-diff: catch integer overflow in combine_diff_path allocation" > > So? > > Identifying two versions of the same C

Re: [PATCH 2/2] Revert "rev-parse: remove restrictions on some options"

On Fri, Feb 26, 2016 at 03:44:01PM -0800, Junio C Hamano wrote: > But why do you even need to run local-env-vars from outside a > repository in the first place? The short answer is: because it is about clearing the state to move into a new repository, and we do not necessarily know what the old

Re: [PATCH/RFD 3/6] rev-list: list all heads with --all

On Fri, Feb 26, 2016 at 11:39 PM, Michael J Gruber wrote: > HEAD is a worktree specific sysmref, so that a repository with multiple > worktrees can have multiple HEADs, or HEADs in a worktree different from > the current worktree. > > So far, "rev-parse --all" adds only

Re: [PATCH 0/2] recursive submodules: paths are hard

On Sat, Feb 27, 2016 at 3:51 AM, Stefan Beller wrote: > I think we may need to enable Git to pass in 'negative' pathes for the prefix, > i.e. > Although operating on this repository, your reference for displaying paths > should be '../untracked' for the example above, when

Re: [PATCH v5 0/3] pass credential.* to submodules

On Fri, Feb 26, 2016 at 4:13 PM, Jacob Keller wrote: > From: Jacob Keller > > This version of the series fixes up a few issues and implements > sq_quotef function to help make intent more clear in the code. I also > chose to use Jeff's

[PATCH/RFC] builtin/tag: Changes argument format for verify

From: Santiago Torres The verify tag function converts the commit sha1 to hex and passes it as a command-line argument to builtin/verify-tag. Given that builtin/verify-tag already resolves the ref name sha1 equivalent, the sha1 to hex_sha1 conversion is unnecessary and the

[PATCH v5 3/3] git: submodule honor -c credential.* from command line

From: Jacob Keller Due to the way that the git-submodule code works, it clears all local git environment variables before entering submodules. This is normally a good thing since we want to clear settings such as GIT_WORKTREE and other variables which would affect the

[PATCH v5 2/3] quote: implement sq_quotef()

From: Jacob Keller Signed-off-by: Jacob Keller --- quote.c | 13 + quote.h | 3 +++ 2 files changed, 16 insertions(+) diff --git a/quote.c b/quote.c index fe884d24521f..b281a8fe454e 100644 --- a/quote.c +++ b/quote.c @@ -43,6 +43,19

[PATCH v5 0/3] pass credential.* to submodules

From: Jacob Keller This version of the series fixes up a few issues and implements sq_quotef function to help make intent more clear in the code. I also chose to use Jeff's implementation for the test fix since I think it works better and I prefer the consistency of

[PATCH v5 1/3] sumodule--helper: fix submodule--helper clone usage and check argc count

From: Jacob Keller git submodule--helper clone usage specified that paths come after the -- as a sequence. However, the actual implementation does not, and requires only a single path passed in via --path. In addition, argc was unchecked. (allowing arbitrary extra

Re: [PATCH v4 3/3] git: submodule honor -c credential.* from command line

On Fri, Feb 26, 2016 at 2:20 PM, Jacob Keller wrote: >> that is slightly more verbose, but it does let us keep the main body >> inside single-quotes, without restoring to confusing backslash escaping. >> > > I think I prefer the double quotes myself but will use this if

Re: What's cooking in git.git (Feb 2016, #08; Fri, 26)

On Fri, Feb 26, 2016 at 3:41 PM, Junio C Hamano wrote: > * sb/submodule-parallel-update (2016-02-25) 11 commits > - clone: allow an explicit argument for parallel submodule clones > - submodule update: expose parallelism to the user > - git submodule update: have a

Re: [PATCH 2/2] Revert "rev-parse: remove restrictions on some options"

Jeff King writes: > On Fri, Feb 26, 2016 at 06:29:57PM -0500, Jeff King wrote: > >> The best solution here would be to have a full parsing loop >> that handles all options, but only calls setup_git_directory >> as appropriate. Unfortunately, that's a bit complicated to >>

[ANNOUNCE] Git v2.8.0-rc0

An early preview release Git v2.8.0-rc0 is now available for testing at the usual places. It is comprised of 436 non-merge commits since v2.7.0, contributed by 58 people, 19 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The

What's cooking in git.git (Feb 2016, #08; Fri, 26)

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. v2.8-rc0 has been tagged; this is

Re: What's cooking in git.git (Feb 2016, #07; Thu, 25)

Torsten Bögershausen writes: > On 2016-02-26 19.29, Junio C Hamano wrote: >> Torsten Bögershausen writes: >> >>> CC combine-diff.o >>> combine-diff.c: In function ‘diff_tree_combined’: >>> combine-diff.c:1391: internal compiler error: Segmentation fault >>> Please

Re: [PATCH 2/2] Revert "rev-parse: remove restrictions on some options"

On Fri, Feb 26, 2016 at 06:29:57PM -0500, Jeff King wrote: > The best solution here would be to have a full parsing loop > that handles all options, but only calls setup_git_directory > as appropriate. Unfortunately, that's a bit complicated to > implement. We _have_ to handle each option in the

Trouble Cloning Git remote repository

I am trying to set up a remote Git repository on my network server. I want to develop source on several desktops / laptops and want to have a central repository to sync everything and maintain version control. Seems like a good fit for Git, but I cannot get it to work and would appreciate advice

[PATCH 2/2] Revert "rev-parse: remove restrictions on some options"

This reverts commit 68889b416d5b6a5cf7d280a428281d635fe9b292. That commit bumped some rev-parse options into the main option-parsing loop, which meant that they no longer had to come at the very beginning of the option list. However, that also means that they now came after our call to

[PATCH 1/2] t1515: add tests for rev-parse out-of-repo helpers

The git-rev-parse command is a dumping ground for helpers that let scripts make various queries of git. Many of these are conceptually independent of being inside a git repository. With the exception of --parseopt, we do not directly test most of these features in our test suite. Let's give them

Re: [PATCH] credential: let empty credential specs reset helper list

Jeff King writes: > I think there is another reason, which is that the interface we expose > to config callbacks (and via "config --get-all") is to sequentially pass > in all values. How does that interact with this "reset"? For example, > what is the output of: > > git config

[PATCH/RFC 0/2] fix some rev-parse options in non-repos

Michael Haggerty noticed recently (off-list) that "git rev-parse --local-env-vars" doesn't work outside of a git repository. This turns out to be a regression in v1.8.5, due to a patch by John Keeping that lifted some other restrictions on how the option could be used. This fixes it by reverting

Re: interactive rebase results across shared histories

Hello Seb, let me add a few things, perhaps they'll clean some misunderstandings. On Fri, Feb 26, 2016 at 03:12:46PM -0600, Seb wrote: > After cleaning up all the mess, I've ended up with a long master branch, > and a series of earlier commits that are not reachable from master. > Fortunately,

Re: [PATCH] credential: let empty credential specs reset helper list

On Fri, Feb 26, 2016 at 11:34:12AM -0800, Junio C Hamano wrote: > >> - if (!strcmp(key, "helper")) > >> - string_list_append(>helpers, value); > >> - else if (!strcmp(key, "username")) { > >> + if (!strcmp(key, "helper")) { > >> + if (*value) > >> +

Re: [PATCH v3 3/3] git: submodule honor -c credential.* from command line

On Fri, Feb 26, 2016 at 11:41 AM, Stefan Beller wrote: > > In the future, would you mind to try interdiffs in a cover letter? > > (I do git diff HEAD...$(previousSeries) with previousSerier either > local branch or rather what Junio picked up already. There is also tbdiff, >

Re: What's cooking in git.git (Feb 2016, #07; Thu, 25)

On 2016-02-26 19.29, Junio C Hamano wrote: > Torsten Bögershausen writes: > >> CC combine-diff.o >> combine-diff.c: In function ‘diff_tree_combined’: >> combine-diff.c:1391: internal compiler error: Segmentation fault >> Please submit a full bug report, >> with preprocessed source

Re: [PATCH v4 3/3] git: submodule honor -c credential.* from command line

On Fri, Feb 26, 2016 at 2:05 PM, Jeff King wrote: > On Fri, Feb 26, 2016 at 11:18:48AM -0800, Jacob Keller wrote: > >> +test_expect_success 'sanitize-config keeps credential.helper' " >> + git -c credential.helper=helper submodule--helper sanitize-config >> >actual && >> +

Re: [PATCH] credential: let empty credential specs reset helper list

On Fri, Feb 26, 2016 at 11:34 AM, Junio C Hamano wrote: > > Of course, the code in the configuration subsystem for updated > version of Git needs to become aware of the new syntax, and those > that deal with the multi-value variables need custom code, which is > similar to the

Re: [PATCH v4 2/3] sumodule--helper: fix submodule--helper clone usage and check argc count

On Fri, Feb 26, 2016 at 11:31 AM, Stefan Beller wrote: > On Fri, Feb 26, 2016 at 11:18 AM, Jacob Keller > wrote: >> From: Jacob Keller >> - git submodule--helper clone ${GIT_QUIET:+--quiet} --prefix >>

Re: [PATCH v4 3/3] git: submodule honor -c credential.* from command line

On Fri, Feb 26, 2016 at 11:18:48AM -0800, Jacob Keller wrote: > +test_expect_success 'sanitize-config keeps credential.helper' " > + git -c credential.helper=helper submodule--helper sanitize-config > >actual && > + cat >expect <<-EOF && > + 'credential.helper=helper' > + EOF > +

Re: [PATCH 02/16] bisect: add test for the bisect algorithm

Hi Christian, On 02/26/2016 07:53 AM, Christian Couder wrote: >> +test_expect_success 'bisect algorithm works in linear history with an odd >> number of commits' ' >> + git bisect start A7 && >> + git bisect next && >> + test "$(git rev-parse HEAD)" = "$(git rev-parse A3)" \ >>

Re: interactive rebase results across shared histories

On Fri, 26 Feb 2016 23:38:38 +1100, David wrote: > On 24 February 2016 at 10:05, Seb wrote: >> On Tue, 23 Feb 2016 23:57:06 +0100, >> Moritz Neeb wrote: >> [...] OK, I've followed this advice and looked at the dependency

Re: [PATCH 14/16] bisect: use a modified breadth-first search to find relevant weights

Hi, On 02/26/2016 04:09 AM, Junio C Hamano wrote: > Interesting. So you walk from the bottom commits, incrementing the > weight while walking on a part of the graph that is single strand of > pearls, or doing the "count the reachable ones the hard way" when > you hit a merge [*1*], but either

[PATCH 2/2] submodule sync: Test we can pass individual submodules

The parent patch made changes to the way `git submodule--helper list` is called. From experience this is a sensitive topic and lots subtle things can go wrong. As all submodule subcommands except `sync` are setup to run `git submodule--helper list` in the original directory, I suspected a possible

[PATCH 1/2] Check recursive submodule update to have correct path from subdirectory

A similar test exists for `submodule sync` to behave well when being in an unrelated subdirectory and performing operations on submodules. Signed-off-by: Stefan Beller --- t/t7406-submodule-update.sh | 12 1 file changed, 12 insertions(+) diff --git

[PATCH 0/2] recursive submodules: paths are hard

I thought getting rid of the extra `prefix` argument in submodule helper functions was easy up to the point of all but one test passing in the test suite. It turned out the implementation of that prefix patch was wrong, only caught by tests, so we want to add tests for subtle details with

Re: BUG? git log --no-merges shows grafted merges in shallow clones

Matthieu Moy writes: > Junio C Hamano writes: > >> I do not think this is limited to shallow but for grafts in >> general. > > Probably yes. I happen to only use grafts in shallow clones ;-). > >> cat-file is low-level to show the bare metal,

Re: BUG? git log --no-merges shows grafted merges in shallow clones

Junio C Hamano writes: > I do not think this is limited to shallow but for grafts in > general. Probably yes. I happen to only use grafts in shallow clones ;-). > cat-file is low-level to show the bare metal, but by using these > facility you asked Git to give you an

BUG? git log --no-merges shows grafted merges in shallow clones

Hi, I don't think that's intended. When running "git log --no-merges" in a shallow clone, and the last commit in the history is a merge commit, "git log --no-merges" still shows it. I've just hit this in a test running on a --depth=50 clone on Travis-CI on git-multimail: $ git cat-file -p

Re: [PATCH] contrib/subtree: add repo url to commit messages

On Fri, Feb 26, 2016 at 3:28 AM, Mathias Nyman wrote: > On 2016-02-25 17:23-0500, Eric Sunshine wrote: >> On Tue, Feb 23, 2016 at 5:25 AM, Mathias Nyman >> wrote: >>> - cat <<-EOF >>> - $commit_message >>> - >>> -

Re: [PATCH v3 3/3] git: submodule honor -c credential.* from command line

On Fri, Feb 26, 2016 at 11:17 AM, Jacob Keller wrote: > From: Jacob Keller > > Due to the way that the git-submodule code works, it clears all local > git environment variables before entering submodules. This is normally > a good thing since we

Re: [PATCH] credential: let empty credential specs reset helper list

Junio C Hamano writes: > Jeff King writes: > >> Sine the credential.helper key is a multi-valued config > > s/Sine/Since/; > >> diff --git a/credential.c b/credential.c >> index 7d6501d..aa99666 100644 >> --- a/credential.c >> +++ b/credential.c >> @@ -63,9

Re: [PATCH v4 2/3] sumodule--helper: fix submodule--helper clone usage and check argc count

On Fri, Feb 26, 2016 at 11:18 AM, Jacob Keller wrote: > From: Jacob Keller > > git submodule--helper clone usage specified that paths come after the -- > as a sequence. However, the actual implementation does not, and requires > only a single

[PATCH v4 3/3] git: submodule honor -c credential.* from command line

From: Jacob Keller Due to the way that the git-submodule code works, it clears all local git environment variables before entering submodules. This is normally a good thing since we want to clear settings such as GIT_WORKTREE and other variables which would affect the

[PATCH v4 2/3] sumodule--helper: fix submodule--helper clone usage and check argc count

From: Jacob Keller git submodule--helper clone usage specified that paths come after the -- as a sequence. However, the actual implementation does not, and requires only a single path passed in via --path. In addition, argc was unchecked. (allowing arbitrary extra

[PATCH v4 1/3] t/lib-httpd: load mod_unixd

From: Michael J Gruber In contrast to apache 2.2, apache 2.4 does not load mod_unixd in its default configuration (because there are choices). Thus, with the current config, apache 2.4.10 will not be started and the httpd tests will not run on distros with default

[PATCH v3 2/3] sumodule--helper: fix submodule--helper clone usage and check argc count

From: Jacob Keller git submodule--helper clone usage specified that paths come after the -- as a sequence. However, the actual implementation does not, and requires only a single path passed in via --path. In addition, argc was unchecked. (allowing arbitrary extra

[PATCH v3 3/3] git: submodule honor -c credential.* from command line

From: Jacob Keller Due to the way that the git-submodule code works, it clears all local git environment variables before entering submodules. This is normally a good thing since we want to clear settings such as GIT_WORKTREE and other variables which would affect the

Re: [GSoC] Microproject :- Teaching git pull --rebase the --no-autostash flag

From: "Matthieu Moy" Hi, Some minor nits in addition to Paul's comments: Subject: Re: [GSoC] Microproject :- Teaching git pull --rebase the --no-autostash flag The ":-" is typically Indian. Just use ":" here (without a space before). I think it was we Brit's

Re: [PATCH 01/16] bisect: write about `bisect next` in documentation

Stephan Beyer writes: > +Bisect next > +~~~ > + > +Sometimes it can be necessary to check out other branches during a bisect > +session. If you want to check out the next commit of the bisection again, > +simply issue the command: > + > + > +$ git bisect next

Re: What's cooking in git.git (Feb 2016, #07; Thu, 25)

Torsten Bögershausen writes: > CC combine-diff.o > combine-diff.c: In function ‘diff_tree_combined’: > combine-diff.c:1391: internal compiler error: Segmentation fault > Please submit a full bug report, > with preprocessed source if appropriate. > See

Re: Rebase performance

On Thu, Feb 25, 2016 at 10:42 AM, Duy Nguyen wrote: > On Thu, Feb 25, 2016 at 7:50 AM, Duy Nguyen wrote: >> On Thu, Feb 25, 2016 at 5:09 AM, Christian Couder >> wrote: >>> Another possibility would be to libify the "git apply"

Re: [PATCH 2/6] t6014: test prune with detached HEADs in separate worktrees

Michael J Gruber writes: > "git prune" relies on "git rev-list --all" to list all reachable, > non-prunable commits. In the presence of per-worktree refs such as HEAD > this becomes more complicated. Not "all", perhaps "majority of". The index is another anchor point

Re: [PATCH 1/6] Documentation/git-worktree: spell --detach correctly

Michael J Gruber writes: > Signed-off-by: Michael J Gruber > --- > Documentation/git-worktree.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt >

Re: [PATCH/WIP 0/6] Detached HEADs in new worktrees considered harmful

Michael J Gruber writes: > Before someone loses their HEAD I should put this series out (again). > > 1/6 is a tiny documentation fix. > > 2/6 demonstrates that "git prune" in the main worktree loses HEADs in other > worktrees, and vice versa. You do need to teach the

Re: [PATCH/RFC] git-commit: add a commit.verbose config variable

Junio C Hamano writes: > Pranit Bauva writes: > >>> If you know you haven't finished, you may use WIP (work in progress) >>> instead of RFC in the title. >> >> I wasn't familiar with this tag. I will keep it in mind. And this is not >> included in

Re: [PATCH] credential: let empty credential specs reset helper list

Jeff King writes: > Sine the credential.helper key is a multi-valued config s/Sine/Since/; > diff --git a/credential.c b/credential.c > index 7d6501d..aa99666 100644 > --- a/credential.c > +++ b/credential.c > @@ -63,9 +63,12 @@ static int credential_config_callback(const char

Re: Rebase performance

On Fri, Feb 26, 2016 at 7:45 AM, Johannes Schindelin wrote: > Hi Matthieu, > > On Thu, 25 Feb 2016, Matthieu Moy wrote: > >> Ævar Arnfjörð Bjarmason writes: >> >> > At the risk of derailing this thread, a thing that would make rebase >> > even faster

Re: Restore Question

On Fri, Feb 26, 2016 at 04:53:35PM +, Gerald McKinley wrote: > I have git running on a vm. One of the repos got messed up. I restored the > vm from the previous day. I gave the vm a different ip address and hostname. > I did not see all my files in the repo. > > -Original Message-

Re: [PATCH] Add --no-autostash flag to git pull --rebase

Hi, Thank you for the suggestions. On Fri, Feb 26, 2016 at 6:17 PM, Paul Tan wrote: > Some grammatical/spelling nits below: Many apologies for my English. > I think git-pull's documentation should be updated as well to talk > about this new command-line switch. OK. >>

Re: [PATCH] strbuf_write: omit system call when length is zero

On Thu, Feb 25, 2016 at 5:40 PM, Junio C Hamano wrote: > Duy Nguyen writes: > >> On Fri, Feb 26, 2016 at 5:34 AM, Stefan Beller wrote: >>> In case the length of the buffer is zero, we do not need to call the >>> fwrite system call as a

Re: Fwd: git clone does not respect command line options

Jeff King writes: > That's behaving as expected. Unfortunately, you cannot currently do what > you want easily; there is no way to "unset" a multi-valued config > variable (like credential.helper) with a later one. Git will ask both > configured helpers for the password, and will

Re: [PATCH/RFC] git-commit: add a commit.verbose config variable

Pranit Bauva writes: >> If you know you haven't finished, you may use WIP (work in progress) >> instead of RFC in the title. > > I wasn't familiar with this tag. I will keep it in mind. And this is not > included in Documentation/SubmittingPatches , so I will send a patch

Re: Restore Question

On Fri, Feb 26, 2016 at 02:18:16PM +, Gerald wrote: > I have git running on a VMware virtual machine. I backup the virtual > machine every day. How do I restore git from a restore of the virtual > machine? > Can you explain what you mean exactly with restoring git? It's unclear what you

[PATCH 1/6] Documentation/git-worktree: spell --detach correctly

Signed-off-by: Michael J Gruber --- Documentation/git-worktree.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 62c76c1..51a2ea0 100644 --- a/Documentation/git-worktree.txt +++

[PATCH/WIP 0/6] Detached HEADs in new worktrees considered harmful

Before someone loses their HEAD I should put this series out (again). 1/6 is a tiny documentation fix. 2/6 demonstrates that "git prune" in the main worktree loses HEADs in other worktrees, and vice versa. In fact, one should rethink the meaning of "git rev-list --all" in the context of

[PATCH 5/6] WIP: fix unborn branch case

Signed-off-by: Michael J Gruber --- refs/files-backend.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/refs/files-backend.c b/refs/files-backend.c index f020c52..1614854 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -1780,6 +1780,8 @@ static

[PATCH 2/6] t6014: test prune with detached HEADs in separate worktrees

"git prune" relies on "git rev-list --all" to list all reachable, non-prunable commits. In the presence of per-worktree refs such as HEAD this becomes more complicated. Add a test that makes sure that per-worktree refs from other worktrees are not omitted. This is currently broken, possibly

[PATCH/RFD 3/6] rev-list: list all heads with --all

HEAD is a worktree specific sysmref, so that a repository with multiple worktrees can have multiple HEADs, or HEADs in a worktree different from the current worktree. So far, "rev-parse --all" adds only the HEAD from the current worktree to the list of refs (besides branches etc.). So, a detached

  1   2   >