In git-difftool, these options specify which tool to ultimately run. As
a result, they are logically conflicting. Explicitly disallow these
options from being used together.
Signed-off-by: Denton Liu
---
builtin/difftool.c | 3 +++
t/t7800-difftool.sh | 8
2 files changed, 11 insertion
Before, in `get_configured_merge_tool`, we would test the value of the
first argument directly, which corresponded to whether we were using
guitool. However, since `$GIT_MERGETOOL_GUI` is available as an
environment variable, create the `gui_mode` function which increases the
clarify of functions w
In git-mergetool, the logic for getting which merge tool to use is
duplicated in git-mergetool--lib, except for the fact that it needs to
know whether the tool was guessed or not.
Rewrite `get_merge_tool` to return whether or not the tool was guessed
through the return code and make git-mergetool
Hi David, thanks for the comments.
I'm not really sure why I did the double-negative thing... It seems
obvious that it should be the other way around. I also unrolled the
loops and wrote a gui_mode function.
Good suggestions!
---
Changes since v4:
* Remove double-negative
* Change double-nes
In 063f2bdbf7 (mergetool: accept -g/--[no-]gui as arguments,
2018-10-24), mergetool was taught the --gui option but no tests were
added to ensure that it was working properly. Add a test to ensure that
it works.
Signed-off-by: Denton Liu
---
t/t7610-mergetool.sh | 22 ++
1 fi
The output for commands used to be suppressed by redirecting both stdout
and stderr to /dev/null. However, this should not happen since the
output is useful for debugging and, without the "-v" flag, test scripts
don't output anyway.
Unsuppress the output by removing the redirections to /dev/null.
In git-difftool.txt, it says
'git difftool' falls back to 'git mergetool' config variables when the
difftool equivalents have not been defined.
However, when `diff.guitool` is missing, it doesn't fallback to
anything. Make git-difftool fallback to `merge.guitool` when `diff.guitoo
In git-difftool, if the tool is called with --gui but `diff.guitool` is
not set, it falls back to `diff.tool`. Make git-mergetool also fallback
from `merge.guitool` to `merge.tool` if the former is undefined.
If git-difftool, when called with `--gui`, were to use
`get_configured_mergetool` in a fu
From: Nickolai Belakovski
To display worktree path for refs checked out in a linked worktree
Signed-off-by: Nickolai Belakovski
---
Documentation/git-branch.txt | 6 --
builtin/branch.c | 4
t/t3203-branch-output.sh | 19 +++
3 files changed, 27 inser
From: Nickolai Belakovski
The output of git branch is modified to mark branches checked out in a
linked worktree with a "+" and color them in cyan (in contrast to the
current branch, which will still be denoted with a "*" and colored in green)
This is meant to communicate to the user that the br
From: Nickolai Belakovski
Add an atom providing the path of the linked worktree where this ref is
checked out, if it is checked out in any linked worktrees, and empty
string otherwise.
Signed-off-by: Nickolai Belakovski
---
Documentation/git-for-each-ref.txt | 5 +++
ref-filter.c
From: Nickolai Belakovski
Added test_i18ncmp per instructions from Szeder
Is there some other part of the infrastructure that's testing for this? Because
it did not fail in any of my Travis CI builds.
Travis CI results: https://travis-ci.org/nbelakovski/git/builds/525801210
Nickolai Belakovsk
On Thu, Apr 25, 2019 at 02:54:41AM -0700, Denton Liu wrote:
> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
> index 68ff26a0f7..c4b16c5e59 100644
> --- a/git-mergetool--lib.sh
> +++ b/git-mergetool--lib.sh
> @@ -350,20 +350,34 @@ guess_merge_tool () {
> }
>
> get_configured_merge_t
On Thu, Apr 25, 2019 at 02:54:39AM -0700, Denton Liu wrote:
> In git-mergetool, the logic for getting which merge tool to use is
> duplicated in git-mergetool--lib, except for the fact that it needs to
> know whether the tool was guessed or not.
>
> Rewrite `get_merge_tool` to return whether or no
Dear friend ,
My name is Hans Erich Helmut .
I have a client who is interested to invest in your country, she is a well
known politician in her country and deserve a lucrative investment partnership
with you outside her country without any delay Please can you manage such
investment please K
Hello,
I'm considering implementing a feature in the Git protocol which would
enable efficient and accurate object negotiation when the client is a
partial clone. I'd like to refine and get some validation of my
approach before I start to write any code, so I've written a proposal
for anyone inter
On Mon, Nov 05, 2018 at 12:26:08PM +, Philip Oakley wrote:
> > [2b] What is your reason for your [2a] preference?
> Many of the other Gui's hide the power of Git and its new abstraction of no
> longer actually being about "Control" (by 'management'). Now it is about
> veracity. If you have the
On Wed, Jan 16, 2019 at 01:09:03PM -0600, Cameron Steffen wrote:
> Hello,
>
> I have this feature idea for git. There should be a command that
> effectively combines git add -p and git checkout -p so that I can
> navigate changed hunks and either stage or discard them.
>
> There is already a SO q
With pack.packSizeLimit, a really huge repository can suffer from
repacking on any operation with it, because git detects too many
packs and tries merging them.
Setting gc.autoPackLimit cures the symptom but causes small pack
merge to be avoided at all, which isn't the good behavior we want.
Fix
19 matches
Mail list logo
