Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

2015-11-24 Thread Jeff King
On Wed, Nov 25, 2015 at 12:04:10AM +0200, Max Kirillov wrote: > On Fri, Nov 20, 2015 at 09:09:37AM -0500, Jeff King wrote: > > * mk/blame-first-parent (2015-11-20) 1 commit > > - blame: fix object casting regression > > > > Regression fix for a topic already in master. > > > > Will merge to

Re: [RFC/PATCH] send-email: die if CA path doesn't exist

2015-11-24 Thread John Keeping
On Tue, Nov 24, 2015 at 02:58:43PM -0500, Jeff King wrote: > On Fri, Nov 20, 2015 at 07:46:51PM +, John Keeping wrote: > > > > For people who know their systems are broken and want to proceed anyway, > > > what is the appropriate work-around? Obviously it involves disabling > > > peer

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

2015-11-24 Thread Jeff King
On Wed, Nov 18, 2015 at 10:56:02AM +0100, Johannes Schindelin wrote: > > For me I use this command more as a post-fetch: > > > > git fetch --all --prune && git-ff-refs > > > > I imagine that the big difference is in the number of branches that I > > maintain, and perhaps in the way that I use

Re: [PATCH] notes: allow merging from arbitrary references

2015-11-24 Thread Jeff King
On Fri, Nov 13, 2015 at 08:34:22AM -0800, Jacob Keller wrote: > --- > I do not remember what version this was since it has been an age ago > that I sent the previous code. This is mostly just a rebase onto current > next. I believe I have covered everything previous reviewers noted. Please keep

Re: [RFC/PATCH] send-email: die if CA path doesn't exist

2015-11-24 Thread John Keeping
On Tue, Nov 24, 2015 at 05:28:21PM -0500, Jeff King wrote: > On Tue, Nov 24, 2015 at 10:17:08PM +, John Keeping wrote: > > > I wonder if we should do this to help debug SSL issues: > > > > -- >8 -- > > diff --git a/git-send-email.perl b/git-send-email.perl > > index e057051..6d4e0ee 100755 >

Re: [PATCH v2] check-ignore: correct documentation about output

2015-11-24 Thread Jeff King
On Fri, Nov 20, 2015 at 09:30:48PM +0100, Dennis Kaarsemaker wrote: > By default git check-ignore shows only the filenames that will be > ignored, not the pattern that causes their exclusion. Instead of moving > the partial exclude pattern precendence information to the -v option > where it

Re: verify_pack ignores return value of verify_fn

2015-11-24 Thread Jeff King
On Tue, Nov 17, 2015 at 07:31:55PM -0500, David Turner wrote: > In pack-check.c, line 129, a caller-supplied verification function is > called. The function returns an int, but that return value is ignored. > > The only caller of verify_pack is in builtin/fsck.c, whose verify_fn > *does* return

Re: [RFC] rename detection: allow more renames

2015-11-24 Thread Jeff King
On Fri, Nov 13, 2015 at 05:35:06PM +0100, Andreas Krey wrote: > The code talks about limiting the size > of the rename matrix, but as far as I > can see, the matrix itself never exists > as such, and the only thing that could > actually overflow is the computation > for the progress indication.

[PATCH v2] send-email: die if CA path doesn't exist

2015-11-24 Thread John Keeping
If the CA path isn't found it's most likely to indicate a misconfiguration, in which case accepting any certificate is unlikely to be the correct thing to do. Signed-off-by: John Keeping --- Changes since v1: - add missing path to error message - remove trailing '.' on error

Re: [PATCH] test-lib-functions: fix logic error in test_must_fail

2015-11-24 Thread Ramsay Jones
On 24/11/15 21:08, Jeff King wrote: > On Tue, Nov 24, 2015 at 03:59:24PM +, Ramsay Jones wrote: > >> After commit 710eb805 ("implement test_might_fail using a refactored >> test_must_fail", 19-11-2015) several tests now unexpectedly pass: > > Thanks. I noticed there were some new passes,

Re: [PATCH] merge-file: consider core.crlf when writing merge markers

2015-11-24 Thread Beat Bolli
On 24.11.15 23:43, Beat Bolli wrote: > On 24.11.15 09:21, Johannes Schindelin wrote: >> Hi Beat, >> >> On Mon, 23 Nov 2015, Beat Bolli wrote: >> >>> When merging files in repos with core.eol = crlf, git merge-file inserts >>> just a LF at the end of the merge markers. Files with mixed line endings

Re: [PATCH] filter-branch: deal with object name vs. pathname ambiguity in tree-filter

2015-11-24 Thread Jeff King
On Mon, Nov 23, 2015 at 01:23:16PM +0100, SZEDER Gábor wrote: > 'git filter-branch' fails complaining about an ambiguous argument, if > a tree-filter renames a path and the new pathname happens to match an > existing object name. > > After the tree-filter has been applied, 'git filter-branch'

Re: [PATCH] merge-file: consider core.crlf when writing merge markers

2015-11-24 Thread Beat Bolli
On 24.11.15 09:21, Johannes Schindelin wrote: > Hi Beat, > > On Mon, 23 Nov 2015, Beat Bolli wrote: > >> When merging files in repos with core.eol = crlf, git merge-file inserts >> just a LF at the end of the merge markers. Files with mixed line endings >> cause trouble in Windows editors and

Re: [PATCH 2/2] send-email: expand paths in sendemail.{to,cc}cmd config

2015-11-24 Thread John Keeping
On Tue, Nov 24, 2015 at 05:23:30PM -0500, Jeff King wrote: > On Tue, Nov 24, 2015 at 08:43:53AM +, John Keeping wrote: > > > On Mon, Nov 23, 2015 at 07:04:46PM -0500, Eric Sunshine wrote: > > > On Tue, Nov 17, 2015 at 5:01 PM, John Keeping wrote: > > > > These

Re: [PATCH] test-lib-functions: fix logic error in test_must_fail

2015-11-24 Thread Jeff King
On Wed, Nov 25, 2015 at 12:05:36AM +, Ramsay Jones wrote: > > ... > > if ! list_contains "$_test_ok" success && test "$exit_code" -eq 0 > > then > > return 0 > > fi > ^^ > Is this intended to be part of the if..elif.. chain, or a separate > initial conditional? Hmm, actually

[PATCHv5 7/9] git submodule update: have a dedicated helper for cloning

2015-11-24 Thread Stefan Beller
This introduces a new helper function in git submodule--helper which takes care of cloning all submodules, which we want to parallelize eventually. Some tests (such as empty URL, update_mode=none) are required in the helper to make the decision for cloning. These checks have been moved into the C

[PATCHv5 1/9] run_processes_parallel: delimit intermixed task output

2015-11-24 Thread Stefan Beller
This commit serves 2 purposes. First this may help the user who tries to diagnose intermixed process calls. Second this may be used in a later patch for testing. As the output of a command should not change visibly except for going faster, grepping for the trace output seems like a viable testing

[PATCHv5 5/9] submodule-config: introduce parse_generic_submodule_config

2015-11-24 Thread Stefan Beller
This rewrites parse_config to distinguish between configs specific to one submodule and configs which apply generically to all submodules. We do not have generic submodule configs yet, but the next patch will introduce "submodule.jobs". Signed-off-by: Stefan Beller ---

[PATCH 3/5] git submodule init to pass on groups

2015-11-24 Thread Stefan Beller
Signed-off-by: Stefan Beller --- git-submodule.sh | 6 +- t/t7400-submodule-basic.sh | 21 + 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/git-submodule.sh b/git-submodule.sh index bbdcf78..4092a48 100755 ---

[PATCHv5 4/9] submodule-config: remove name_and_item_from_var

2015-11-24 Thread Stefan Beller
`name_and_item_from_var` does not provide the proper abstraction we need here in a later patch. Signed-off-by: Stefan Beller --- submodule-config.c | 48 1 file changed, 16 insertions(+), 32 deletions(-) diff --git

[PATCHv5 9/9] clone: allow an explicit argument for parallel submodule clones

2015-11-24 Thread Stefan Beller
Just pass it along to "git submodule update", which may pick reasonable defaults if you don't specify an explicit number. Signed-off-by: Stefan Beller --- Documentation/git-clone.txt | 6 +- builtin/clone.c | 19 +--

[PATCH 5/5] builtin/clone: support submodule groups

2015-11-24 Thread Stefan Beller
This passes each group to the `submodule update` invocation and additionally configures the groups to be automatically updated. Signed-off-by: Stefan Beller --- Documentation/git-clone.txt | 11 builtin/clone.c | 33 --

[RFC PATCH 0/5] Submodule Groups

2015-11-24 Thread Stefan Beller
This is also available at https://github.com/stefanbeller/git/tree/submodule-groups It applies on top of the submodule-parallel-patch series I sent a few minutes ago. Consider having a real large software project in Git with each component in a submodule (such as an operating system, Android,

[PATCH 4/5] submodule--helper: module_list and update-clone have --groups option

2015-11-24 Thread Stefan Beller
This will be useful in a later patch. when passing in the --groups option, only the configured groups are considered instead of all groups. Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 68 +++-- 1 file changed, 66

[PATCHv5 3/9] submodule-config: drop check against NULL

2015-11-24 Thread Stefan Beller
Adhere to the common coding style of Git and not check explicitly for NULL throughout the file. There are still other occurrences in the code base but that is usually inside of conditions with side effects. Signed-off-by: Stefan Beller --- submodule-config.c | 8 1

[PATCHv5 6/9] fetching submodules: respect `submodule.fetchJobs` config option

2015-11-24 Thread Stefan Beller
This allows to configure fetching and updating in parallel without having the command line option. This moved the responsibility to determine how many parallel processes to start from builtin/fetch to submodule.c as we need a way to communicate "The user did not specify the number of parallel

What's cooking in git.git (Nov 2015, #04; Tue, 24)

2015-11-24 Thread Jeff King
What's cooking in git.git (Nov 2015, #04; Tue, 24) -- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Lots of little topics, most of which

[PATCHv5 8/9] submodule update: expose parallelism to the user

2015-11-24 Thread Stefan Beller
Expose possible parallelism either via the "--jobs" CLI parameter or the "submodule.fetchJobs" setting. By having the variable initialized to -1, we make sure 0 can be passed into the parallel processing machine, which will then pick as many parallel workers as there are CPUs. Signed-off-by:

Re: [PATCH] wt-status: use strncmp() for length-limited string comparison

2015-11-24 Thread René Scharfe
Am 24.11.2015 um 22:36 schrieb Jeff King: > On Fri, Nov 06, 2015 at 11:47:03PM +0100, René Scharfe wrote: > >> When a branch name is longer than four characters, memcmp() can read >> past the end of the string literal "HEAD". Use strncmp() instead, which >> stops at the end of a string. This

[PATCHv5 2/9] submodule-config: keep update strategy around

2015-11-24 Thread Stefan Beller
We need the submodule update strategies in a later patch. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- submodule-config.c | 11 +++ submodule-config.h | 1 + 2 files changed, 12 insertions(+) diff --git a/submodule-config.c

[PATCHv5 0/9] Expose submodule parallelism to the user

2015-11-24 Thread Stefan Beller
This is also available at github/stefanbeller/git submodule-parallel-update It applies on top of a merge of sb/submodule-parallel-fetch (including the "run-command: detect finished children by closed pipe rather than waitpid" sent yesterday) with "Merge branch 'rs/daemon-plug-child-leak' into

[PATCH 2/5] git submodule add can add a submodule with groups

2015-11-24 Thread Stefan Beller
Signed-off-by: Stefan Beller --- Documentation/git-submodule.txt | 8 +++- git-submodule.sh| 9 + t/t7400-submodule-basic.sh | 28 3 files changed, 44 insertions(+), 1 deletion(-) diff --git

[PATCH 1/5] submodule-config: keep submodule groups around

2015-11-24 Thread Stefan Beller
We need to query the groups in a later patch. Signed-off-by: Stefan Beller --- submodule-config.c | 14 ++ submodule-config.h | 2 ++ 2 files changed, 16 insertions(+) diff --git a/submodule-config.c b/submodule-config.c index a32259e..f44ce20 100644 ---

Re: [PATCH v4] blame: add support for --[no-]progress option

2015-11-24 Thread Edmundo Carmona Antoranz
On Mon, Nov 23, 2015 at 11:57 PM, Torsten Bögershausen wrote: > Minor remark: The '*' should be close to the variable: "struct progress_info > *pi" Nice catch, Torsten. I had already caught it as the standard... that one slipped by. Was waiting for more comments to show up, but

[PATCH v5] blame: add support for --[no-]progress option

2015-11-24 Thread Edmundo Carmona Antoranz
* created struct progress_info in builtin/blame.c this struct holds the information used to display progress so that only one additional parameter is passed to found_guilty_entry(). * --[no-]progress option is also inherited by git-annotate. Signed-off-by: Edmundo Carmona Antoranz

[RFC/PATCH] config: add core.trustmtime

2015-11-24 Thread Christian Couder
When we know that mtime is fully supported by the environment, we don't want any slow down because we used --untracked-cache rather than --force-untracked-cache, and we don't want untracked cache to stop working because we updated a kernel. Also when we know that mtime is not supported by the

Re: [PATCH 2/2] sh-setup: make require_clean_work_tree() work on orphan branches

2015-11-24 Thread Johannes Sixt
Am 24.11.2015 um 15:45 schrieb SZEDER Gábor: git-sh-setup's require_clean_work_tree() always exits with error on an orphan branch, even when the index and worktree are both clean. The reason is that require_clean_work_tree() starts off with verifying HEAD, to make sure that it can safely pass

[PATCH v2] Documentation/git-update-index: add missing opts to synopsys

2015-11-24 Thread Christian Couder
Untracked cache and split index related options should appear in the 'SYNOPSIS' section. These options are already documented in the 'OPTIONS' section. Signed-off-by: Christian Couder --- Soon after sending the first version I realized that the split index options were

Re: [PATCH] Documentation/git-update-index: add missing opts to synopsys

2015-11-24 Thread Christian Couder
On Tue, Nov 24, 2015 at 9:46 PM, Jeff King wrote: > On Tue, Nov 24, 2015 at 12:55:07PM +0100, Christian Couder wrote: > >> Untracked cache related options should appear in the synopsis. >> >> Signed-off-by: Christian Couder >> --- >>

Re: Suspected bug on `git -C rev-list --all` where has 0 commits

2015-11-24 Thread Atousa Duprat
I agree with Yac that this error is unwarranted, though it's been like that since forever. If a repo is empty, git rev-list should probably just return without erroring out. The fix is trivial, if the list agrees that this is in fact legit. Atousa On Wed, Nov 11, 2015 at 10:26 AM, yac

[PATCH v1] git rev-list doesn't complain when repo is empty

2015-11-24 Thread atousa . p
From: Atousa Pahlevan Duprat Signed-off-by: Atousa Pahlevan Duprat --- builtin/rev-list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/rev-list.c b/builtin/rev-list.c index d80d1ed..f71b87f 100644 --- a/builtin/rev-list.c

Re: [PATCH 2/2] send-email: expand paths in sendemail.{to,cc}cmd config

2015-11-24 Thread Jeff King
On Tue, Nov 24, 2015 at 08:43:53AM +, John Keeping wrote: > On Mon, Nov 23, 2015 at 07:04:46PM -0500, Eric Sunshine wrote: > > On Tue, Nov 17, 2015 at 5:01 PM, John Keeping wrote: > > > These configuration variables specify the paths to commands so we should > > > support

Re: [RFC/PATCH] send-email: die if CA path doesn't exist

2015-11-24 Thread Jeff King
On Fri, Nov 20, 2015 at 07:46:51PM +, John Keeping wrote: > > For people who know their systems are broken and want to proceed anyway, > > what is the appropriate work-around? Obviously it involves disabling > > peer verification, but would we want to include instructions for doing > > so

Re: [PATCH v7 1/2] config.mak.uname: Darwin: define NO_GETTEXT for OS X 10.9 and later

2015-11-24 Thread Jeff King
On Mon, Nov 23, 2015 at 12:57:12PM +0100, Torsten Bögershausen wrote: > >+# MacOS 10.7 Lion and higher > > ifeq ($(shell test "`expr "$(uname_R)" : '\([0-9][0-9]*\)\.'`" -ge 11 > > && echo 1),1) > > HAVE_GETDELIM = YesPlease > > endif > >+# MacOS 10.9 Mavericks and

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

2015-11-24 Thread Jeff King
On Tue, Nov 24, 2015 at 10:53:45AM +0100, Michael J Gruber wrote: > > and all topic branches at: > > > > https://github.com/peff/git/ > > > > But note that I will _not_ be pushing to kernel.org. > > Does peff/git include the integration branches, too? Yes, it does. > Also, that one

Re: [PATCH/RFC 00/10] ref-filter: use parsing functions

2015-11-24 Thread Jeff King
On Thu, Nov 12, 2015 at 01:14:26AM +0530, Karthik Nayak wrote: > Karthik Nayak (10): > ref-filter: introduce a parsing function for each atom in valid_atom > ref-filter: introduce struct used_atom > ref-fitler: bump match_atom() name to the top > ref-filter: skip deref specifier in

Re: [PATCH 2/2] sh-setup: make require_clean_work_tree() work on orphan branches

2015-11-24 Thread Jeff King
On Tue, Nov 24, 2015 at 03:45:45PM +0100, SZEDER Gábor wrote: > git-sh-setup's require_clean_work_tree() always exits with error on an > orphan branch, even when the index and worktree are both clean. The > reason is that require_clean_work_tree() starts off with verifying > HEAD, to make sure

Re: [PATCHv2] git-p4: clean up after p4 submit failure

2015-11-24 Thread Jeff King
On Tue, Nov 24, 2015 at 07:43:59AM +, Luke Diamand wrote: > From: GIRARD Etienne > > When "p4 submit" command fails in P4Submit.applyCommit, the > workspace is left with the changes. We already have code to revert > the changes to the workspace when the user decides to

Re: [PATCH] Documentation/git-update-index: add missing opts to synopsys

2015-11-24 Thread Jeff King
On Tue, Nov 24, 2015 at 12:55:07PM +0100, Christian Couder wrote: > Untracked cache related options should appear in the synopsis. > > Signed-off-by: Christian Couder > --- > Documentation/git-update-index.txt | 1 + > 1 file changed, 1 insertion(+) > > diff --git

Re: [PATCH v7 2/2] Add Travis CI support

2015-11-24 Thread Lars Schneider
> On 24 Nov 2015, at 21:40, Jeff King wrote: > > On Mon, Nov 23, 2015 at 09:25:08AM +0100, larsxschnei...@gmail.com wrote: > >> From: Lars Schneider >> >> The tests are currently executed on "Ubuntu 12.04 LTS Server Edition >> 64 bit" and on "OS X

Re: [PATCH] test-lib-functions: fix logic error in test_must_fail

2015-11-24 Thread Jeff King
On Tue, Nov 24, 2015 at 03:59:24PM +, Ramsay Jones wrote: > After commit 710eb805 ("implement test_might_fail using a refactored > test_must_fail", 19-11-2015) several tests now unexpectedly pass: Thanks. I noticed there were some new passes, but I hadn't investigated yet (I assumed it was

Re: [PATCH v2] contrib/subtree: unwrap tag refs

2015-11-24 Thread Jeff King
On Fri, Nov 13, 2015 at 11:25:49AM -0600, Rob Mayoff wrote: > If a subtree was added using a tag ref, the tag ref is stored in > the subtree commit message instead of the underlying commit's ref. > To split or push subsequent changes to the subtree, the subtree > command needs to unwrap the tag

Re: [PATCH v7 2/2] Add Travis CI support

2015-11-24 Thread Jeff King
On Mon, Nov 23, 2015 at 09:25:08AM +0100, larsxschnei...@gmail.com wrote: > From: Lars Schneider > > The tests are currently executed on "Ubuntu 12.04 LTS Server Edition > 64 bit" and on "OS X Mavericks" using gcc and clang. > > Perforce and Git-LFS are installed and

Re: [PATCH] wt-status: use strncmp() for length-limited string comparison

2015-11-24 Thread Jeff King
On Fri, Nov 06, 2015 at 11:47:03PM +0100, René Scharfe wrote: > When a branch name is longer than four characters, memcmp() can read > past the end of the string literal "HEAD". Use strncmp() instead, which > stops at the end of a string. This fixes the following test failures > with

[PATCH v3] Documentation/git-update-index: add missing opts to synopsis

2015-11-24 Thread Christian Couder
Untracked cache and split index related options should appear in the 'SYNOPSIS' section. These options are already documented in the 'OPTIONS' section. Signed-off-by: Christian Couder --- The only change compared to v2 is s/synopsys/synopsis/ thanks to Eric.

Re: [PATCH v2] Documentation/git-update-index: add missing opts to synopsys

2015-11-24 Thread Eric Sunshine
On Wed, Nov 25, 2015 at 1:53 AM, Christian Couder wrote: > Documentation/git-update-index: add missing opts to synopsys s/synopsys/synopsis/ > Untracked cache and split index related options should appear > in the 'SYNOPSIS' section. > > These options are already

Re: [PATCH v3] ls-files: Add eol diagnostics

2015-11-24 Thread Ramsay Jones
On 23/11/15 17:05, Torsten Bögershausen wrote: > On 22.11.15 09:20, Sebastian Schuberth wrote: >> On 21.11.2015 08:36, Torsten Bögershausen wrote: >> >>> git ls-files --eol gives an output like this: >>> >>> i/text-no-eol w/text-no-eol attr/text=auto t/t5100/empty >> >> I'm sorry if this has

Re: Git clone fails during pre-commit hook due to GIT_WORK_TREE=. (regression 2.5 -> 2.6)

2015-11-24 Thread Stefan Beller
+to Nguyễn Thái Ngọc Duy On Mon, Nov 23, 2015 at 6:22 PM, Anthony Sottile wrote: > * Short description of the problem * > > It seems GIT_WORK_DIR is now exported invariantly when calling git > hooks such as pre-commit. If these hooks involve cloning

[PATCH v4] ls-files: Add eol diagnostics

2015-11-24 Thread Torsten Bögershausen
When working in a cross-platform environment, a user wants to check if text files are stored normalized in the repository and if .gitattributes are set appropriately. Make it possible to let Git show the line endings in the index and in the working tree and the effective text/eol attributes. The

Mac OS X Git Packaging Problem

2015-11-24 Thread Robert Crews
This is a bug report for the Mac OS X packaging at http://git-scm.com/download/mac . It is not so much a software bug as a nonoptimal configuration setting. Requested Change Remove the line "excludesfile = ~/.gitignore" under [core] from /usr/local/git/etc/gitconfig Reasons: #1 The

Re: branch --set-upstream-to unexpectedly fails with "starting point ... is no branch"

2015-11-24 Thread Carlos Martín Nieto
On 23 Nov 2015, at 19:59, Marc Strapetz wrote: > On 23.11.2015 18:04, Carlos Martín Nieto wrote: >> Hello Mark, >> >> On 23 Nov 2015, at 12:04, Marc Strapetz wrote: >> >>> There is a strange "branch --set-upstream-to" failure for "clones"

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

2015-11-24 Thread Max Kirillov
On Fri, Nov 20, 2015 at 09:09:37AM -0500, Jeff King wrote: > * mk/blame-first-parent (2015-11-20) 1 commit > - blame: fix object casting regression > > Regression fix for a topic already in master. > > Will merge to 'next'. You mistyped my name in the commit message of 044e0ad679 :) -- To

Re: [RFC/PATCH] send-email: die if CA path doesn't exist

2015-11-24 Thread Jeff King
On Tue, Nov 24, 2015 at 10:17:08PM +, John Keeping wrote: > I wonder if we should do this to help debug SSL issues: > > -- >8 -- > diff --git a/git-send-email.perl b/git-send-email.perl > index e057051..6d4e0ee 100755 > --- a/git-send-email.perl > +++ b/git-send-email.perl > @@ -1317,6

Re: [PATCH v2] send-email: die if CA path doesn't exist

2015-11-24 Thread Jeff King
On Tue, Nov 24, 2015 at 11:31:40PM +, John Keeping wrote: > If the CA path isn't found it's most likely to indicate a > misconfiguration, in which case accepting any certificate is unlikely to > be the correct thing to do. Thanks. > Changes since v1: > - add missing path to error message >

Re: [PATCH] notes: allow merging from arbitrary references

2015-11-24 Thread Jeff King
On Tue, Nov 24, 2015 at 05:47:09PM -0500, Jeff King wrote: > On Fri, Nov 13, 2015 at 08:34:22AM -0800, Jacob Keller wrote: > > > --- > > I do not remember what version this was since it has been an age ago > > that I sent the previous code. This is mostly just a rebase onto current > > next. I

Re: [PATCH] http: treat config options sslCAPath and sslCAInfo as paths

2015-11-24 Thread Jeff King
On Mon, Nov 23, 2015 at 12:02:40PM +, char...@hashpling.org wrote: > From: Charles Bailey > > This enables ~ and ~user expansion for these config options. Thanks, this seems like the obviously correct thing to do. > In the only place that we (optionally) test

[PATCH] send-email: enable SSL level 1 debug output

2015-11-24 Thread John Keeping
If a server's certificate isn't accepted by send-email, the output is: Unable to initialize SMTP properly. Check config and use --smtp-debug. but adding --smtp-debug=1 just produces the same output since we don't get as far as talking SMTP. Turning on SSL debug at level 1 gives:

Re: [PATCH] merge-file: consider core.crlf when writing merge markers

2015-11-24 Thread Johannes Schindelin
Hi Beat, On Mon, 23 Nov 2015, Beat Bolli wrote: > When merging files in repos with core.eol = crlf, git merge-file inserts > just a LF at the end of the merge markers. Files with mixed line endings > cause trouble in Windows editors and e.g. contrib/git-jump, where an > unmerged file in a run of

Re: [PATCH 2/2] send-email: expand paths in sendemail.{to,cc}cmd config

2015-11-24 Thread John Keeping
On Mon, Nov 23, 2015 at 07:04:46PM -0500, Eric Sunshine wrote: > On Tue, Nov 17, 2015 at 5:01 PM, John Keeping wrote: > > These configuration variables specify the paths to commands so we should > > support tilde-expansion for files inside a user's home directory. > > Hmm, I

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

2015-11-24 Thread Michael J Gruber
Jeff King venit, vidit, dixit 20.11.2015 15:09: > What's cooking in git.git (Nov 2015, #03; Fri, 20) > -- > > Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with >

[PATCH 2/2] sh-setup: make require_clean_work_tree() work on orphan branches

2015-11-24 Thread SZEDER Gábor
git-sh-setup's require_clean_work_tree() always exits with error on an orphan branch, even when the index and worktree are both clean. The reason is that require_clean_work_tree() starts off with verifying HEAD, to make sure that it can safely pass HEAD to 'git diff-index' later when it comes to

[PATCH 1/2] Add tests for git-sh-setup's require_clean_work_tree()

2015-11-24 Thread SZEDER Gábor
Add tests that check require_clean_work_tree() in the common cases, i.e. on a branch with all combinations of clean and dirty index and worktree, and also add tests that exercise it on an orphan branch. require_clean_work_tree()'s behavior in the orphan branch cases is questionable, as it exits

[PATCH] Documentation/git-update-index: add missing opts to synopsys

2015-11-24 Thread Christian Couder
Untracked cache related options should appear in the synopsis. Signed-off-by: Christian Couder --- Documentation/git-update-index.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index

[PATCH] test-lib-functions: fix logic error in test_must_fail

2015-11-24 Thread Ramsay Jones
After commit 710eb805 ("implement test_might_fail using a refactored test_must_fail", 19-11-2015) several tests now unexpectedly pass: $ tail -21 ptest-out [17:25:53] All tests successful. Test Summary Report --- t1060-object-corruption.sh