Re: What's cooking in git.git (Apr 2017, #03; Tue, 18)

[Stefan Beller]

Prathamesh wrote:

> Also, I would like to ask is there are any more changes required in my 
> microproject for getting it merged.
> https://public-inbox.org/git/20170403213557.27724-1-pc44...@gmail.com/

See the last what's cooking email:

https://public-inbox.org/git/20170419094145.GA9051@ash/T/#t

Junio wrote:

> * pc/t2027-git-to-pipe-cleanup (2017-04-14) 1 commit
>  - t2027: avoid using pipes
>
>  Having a git command on the upstream side of a pipe in a test
>  script will hide the exit status from the command, which may cause
>  us to fail to notice a breakage; rewrite tests in a script to avoid
>  this issue.
>

I have reviewed pc/t2027-git-to-pipe-cleanup and it looks good to me
for inclusion.

Thanks,
Stefan

Re: What's cooking in git.git (Apr 2017, #03; Tue, 18)

[Duy Nguyen]

On Tue, Apr 18, 2017 at 10:45:22PM -0700, Junio C Hamano wrote:
> * nd/conditional-config-in-early-config (2017-04-17) 3 commits
>  - config: correct file reading order in read_early_config()
>  - config: handle conditional include when $GIT_DIR is not set up
>  - config: prepare to pass more info in git_config_with_options()
> 
>  The recently introduced conditional inclusion of configuration did
>  not work well when early-config mechanism was involved.
> 
>  Will merge to 'next'.

You may want to squash this in before merging to 'next'. I think this
is the last comment from Jeff.

-- 8< --
Subject: [PATCH] fixup! config: correct file reading order in 
read_early_config()

Signed-off-by: Nguyễn Thái Ngọc Duy 
---
 t/helper/test-config.c  | 4 
 t/t1309-early-config.sh | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/t/helper/test-config.c b/t/helper/test-config.c
index 696d0a52fd..8e3ed6a76c 100644
--- a/t/helper/test-config.c
+++ b/t/helper/test-config.c
@@ -84,10 +84,6 @@ int cmd_main(int argc, const char **argv)
struct config_set cs;
 
if (argc == 3 && !strcmp(argv[1], "read_early_config")) {
-   const char *cmdline_config = getenv("CMDL_CFG");
-
-   if (cmdline_config)
-   git_config_push_parameter(cmdline_config);
read_early_config(early_config_cb, (void *)argv[2]);
return 0;
}
diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh
index c15f18dd96..1af8c454cf 100755
--- a/t/t1309-early-config.sh
+++ b/t/t1309-early-config.sh
@@ -47,13 +47,14 @@ test_expect_success 'ceiling #2' '
test xdg = "$(cat output)"
 '
 
+cmdline_config="'test.source=cmdline'"
 test_expect_success 'read config file in right order' '
echo "[test]source = home" >>.gitconfig &&
git init foo &&
(
cd foo &&
echo "[test]source = repo" >>.git/config &&
-   CMDL_CFG=test.source=cmdline test-config \
+   GIT_CONFIG_PARAMETERS=$cmdline_config test-config \
read_early_config test.source >actual &&
cat >expected <<-\EOF &&
home
-- 
2.11.0.157.gd943d85
-- 8< --

What's cooking in git.git (Apr 2017, #03; Tue, 18)

[Junio C Hamano]

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 described here in the integration branches
of the repositories listed at

http://git-blame.blogspot.com/p/git-public-repositories.html

--
[New Topics]

* df/dir-iter-remove-subtree (2017-04-17) 5 commits
 - remove_subtree(): reimplement using iterators
 - dir_iterator: refactor state machine model
 - dir_iterator: add helpers to dir_iterator_advance
 - remove_subtree(): test removing nested directories
 - dir_iterator: add tests for dir_iterator API

 Update the dir-iterator API and use it to reimplement
 remove_subtree().

 Waiting for response to review.
 GSoC microproject.


* jk/ls-files-recurse-submodules-fix (2017-04-18) 2 commits
 - ls-files: fix path used when recursing into submodules
 - ls-files: fix recurse-submodules with nested submodules

 "ls-files --recurse-submodules" did not quite work well in a
 project with nested submodules.

 Will merge to 'next'.


* jt/fetch-pack-error-reporting (2017-04-17) 1 commit
 - fetch-pack: show clearer error message upon ERR

 "git fetch-pack" was not prepared to accept ERR packet that the
 upload-pack can send with a human-readable error message.  It
 showed the packet contents with ERR prefix, so there was no data
 loss, but it was redundant to say "ERR" in an error message.

 Will merge to 'next'.


* nd/conditional-config-in-early-config (2017-04-17) 3 commits
 - config: correct file reading order in read_early_config()
 - config: handle conditional include when $GIT_DIR is not set up
 - config: prepare to pass more info in git_config_with_options()

 The recently introduced conditional inclusion of configuration did
 not work well when early-config mechanism was involved.

 Will merge to 'next'.


* sb/checkout-recurse-submodules (2017-04-17) 1 commit
 - submodule: remove a superfluous second check for the "new" variable

 Code cleanup.

 Will merge to 'next'.


* xy/format-patch-base (2017-04-17) 1 commit
 - doc: trivial typo in git-format-patch.txt

 Doc cleanup.

 Will merge to 'next'.


* jk/snprintf-cleanups (2017-04-17) 1 commit
 - replace: plug a memory leak

 Hotfix for a topic that is already in 'master'.

 Will merge to 'next'.


* ab/clone-no-tags (2017-04-18) 1 commit
 - clone: add a --no-tags option to clone without tags

 "git clone" learned the "--no-tags" option not to fetch all tags
 initially, and also set up the tagopt not to follow any tags in
 subsequent fetches.


* ab/completion-push-delete-ref (2017-04-18) 1 commit
 - completion: expand "push --delete  " for refs on that 

 The completion script (in contrib/) learned to complete "git push
 --delete b" to complete branch name to be deleted.


* bw/forking-and-threading (2017-04-18) 11 commits
 - run-command: block signals between fork and execve
 - run-command: add note about forking and threading
 - run-command: handle dup2 and close errors in child
 - run-command: eliminate calls to error handling functions in child
 - run-command: don't die in child when duping /dev/null
 - run-command: prepare child environment before forking
 - string-list: add string_list_remove function
 - run-command: use the async-signal-safe execv instead of execvp
 - run-command: prepare command before forking
 - t0061: run_command executes scripts without a #! line
 - t5550: use write_script to generate post-update hook


* sb/reset-recurse-submodules (2017-04-18) 4 commits
 - builtin/reset: add --recurse-submodules switch
 - submodule.c: submodule_move_head works with broken submodules
 - submodule.c: uninitialized submodules are ignored in recursive commands
 - entry.c: submodule recursing: respect force flag correctly

 "git reset" learned "--recurse-submodules" option.

--
[Stalled]

* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit
 - clone: respect configured fetch respecs during initial fetch

 Expecting a reroll.
 cf. <20170227211217.73gydlxb2qu2s...@sigill.intra.peff.net>
 cf.