On Wed, Aug 17, 2016 at 3:41 PM, Junio C Hamano wrote:
> If the answer is "yes", then you are in the problem space that
> Git-the-tool is interested in solving. Assuming that you have
> network connection into 'desktop' from 'home', the solution would
> involve making it the first thing to do whe
From: Jacob Keller
Add an extension to git-diff and git-log (and any other graph-aware
displayable output) such that "--line-prefix=" will print the
additional line-prefix on every line of output.
To make this work, we have to fix a few bugs in the graph API that force
graph_show_commit_msg to b
From: Jacob Keller
Currently, do_submodule_path relies on read_gitfile, which will die() if
it can't read from the specified gitfile. Unfortunately, this means that
do_submodule_path will not work when given the path to a submodule which
is checked out directly, such as a newly added submodule wh
From: Jacob Keller
The submodule log diff output incorrectly states that the submodule is
"not checked out" in cases where it wants to say the submodule is "not
initialized". Change the wording to reflect the actual check being
performed.
Signed-off-by: Jacob Keller
---
submodule.c | 2 +-
1 f
From: Jacob Keller
A future patch will add a new format for displaying the difference of
a submodule. Make it easier by changing how we store the current
selected format. Replace the DIFF_OPT flag with an enumeration, as each
format will be mutually exclusive.
Signed-off-by: Jacob Keller
---
d
From: Jacob Keller
As suggested by Junio, I broke this patch into several pieces, and
made a common helper function for the submodule header. Note that there
are a couple of complicated modifications to the submodule header
portion which (should) still result in the same header but allow the
diff
From: Junio C Hamano
"diff/log --stat" has a logic that determines the display columns
available for the diffstat part of the output and apportions it for
pathnames and diffstat graph automatically.
5e71a84a (Add output_prefix_length to diff_options, 2012-04-16)
added the output_prefix_length fi
From: Jacob Keller
Teach git-diff and friends a new format for displaying the difference
of a submodule. The new format is an inline diff of the contents of the
submodule between the commit range of the update. This allows the user
to see the actual code change caused by a submodule update.
Add
From: Jacob Keller
A future patch is going to add a new submodule diff format which
displays an inline diff of the submodule changes. To make this easier,
and to ensure that both submodule diff formats use the same initial
header, factor out show_submodule_header() function which will print the
c
Stefan Beller writes:
> and now with error handling of invalid options.
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
When `--recursive` and `--reference` is given, it is reasonable to
expect that the submodules are created with references to the submodules
of the given alternate for the superproject.
An initial attempt to do this was presented to the mailing list, which
used flags that are passed around ("--
Tobiah writes:
> In other words, I want to work from different machines, and always
> sit down to the environment exactly as I last left it.
You have several options, but it depends on untold expectations you
have beyond "exactly as I last left it." So the following is only
to show directions a
On Wed, Aug 17, 2016 at 3:12 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> Added a default for alternateErrorStrategy and hence fixed the null pointer
>> for error_strategy in prepare_possible_alternates(),
>
> Looks much better.
>
>> +submodule.alternateLocation::
>> + Specifies h
Stefan Beller writes:
> Added a default for alternateErrorStrategy and hence fixed the null pointer
> for error_strategy in prepare_possible_alternates(),
Looks much better.
> +submodule.alternateLocation::
> + Specifies how the submodules obtain alternates when submodules are
> + clo
Right now I have a server at work where I keep a bare repository as
a source and backup for projects. So I clone a project from there
to my desktop, and work, making a few branches as I try out ideas
for new features.
Then I go home, and I want to work as though I was sitting at my
desktop. If
When `--recursive` and `--reference` is given, it is reasonable to
expect that the submodules are created with references to the submodules
of the given alternate for the superproject.
An initial attempt to do this was presented to the mailing list, which
used flags that are passed around ("--
On Wed, Aug 17, 2016 at 2:31 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> Stefan Beller writes:
>>
>>> +static void prepare_possible_alternates(const char *sm_name,
>>> +struct string_list *reference)
>>> +{
>>> +char *sm_alternate = NULL, *error_strategy = NULL;
>>> +
Junio C Hamano writes:
> Stefan Beller writes:
>
>> +static void prepare_possible_alternates(const char *sm_name,
>> +struct string_list *reference)
>> +{
>> +char *sm_alternate = NULL, *error_strategy = NULL;
>> +struct submodule_alternate_setup sas = SUBMODULE_ALTERNATE_SET
When `--recursive` and `--reference` is given, it is reasonable to
expect that the submodules are created with references to the submodules
of the given alternate for the superproject.
An initial attempt to do this was presented to the mailing list, which
used flags that are passed around ("--
Hi Luis and Hannes,
On Wed, Aug 17, 2016 at 09:35:56AM +0200, Johannes Sixt wrote:
> Am 17.08.2016 um 08:46 schrieb David Aguilar:
> > The only thing that using diff-files doesn't address is the
> > rerere support in mergetool where it processes the files in
> > the order specified by "git rerere
On Wed, Aug 17, 2016 at 2:05 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> If working with submodules, there are more reports of missing submodules
>> rather than the desire to push the superproject without the submodules
>> to be pushed out.
>
> I do not know how you are counting the "m
Stefan Beller writes:
> If working with submodules, there are more reports of missing submodules
> rather than the desire to push the superproject without the submodules
> to be pushed out.
I do not know how you are counting the "more reports" part of that
assertion, but it is very likely that i
On Wed, Aug 17, 2016 at 1:02 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> +static void prepare_possible_alternates(const char *sm_name,
>> + struct string_list *reference)
>> +{
>> + char *sm_alternate = NULL, *error_strategy = NULL;
>> + struct submodule_alternate_s
When working with submodules, it is easy to forget to push the submodules.
Change the default to 'check' if any existing submodule is present on at
least one remote of the submodule remotes.
This doesn't affect you if you do not work with submodules.
If working with submodules, there are more repo
Stefan Beller writes:
> +static void prepare_possible_alternates(const char *sm_name,
> + struct string_list *reference)
> +{
> + char *sm_alternate = NULL, *error_strategy = NULL;
> + struct submodule_alternate_setup sas = SUBMODULE_ALTERNATE_SETUP_INIT;
> +
> + git_confi
Right now the imap:// or imaps:// part of imap.host is not being
passed on to cURL. Perhaps it was able to guess correctly under some
circumstances, but I was not able to find one; it was just trying to
make HTTP requests for me. It’s better to be explicit in any case.
Signed-off-by: Anders Kase
Brian Henderson writes:
> Signed-off-by: Brian Henderson
> ---
> contrib/diff-highlight/t/t9400-diff-highlight.sh | 13 +++
> contrib/diff-highlight/t/test-diff-highlight.sh | 43
>
> 2 files changed, 56 insertions(+)
>
> diff --git a/contrib/diff-highlight/t/t940
Brian Henderson writes:
> Signed-off-by: Brian Henderson
> ---
> contrib/diff-highlight/Makefile | 5 ++
> contrib/diff-highlight/t/Makefile| 22
> contrib/diff-highlight/t/t9400-diff-highlight.sh | 62 +
> contrib/diff-highlight/t/
On Wed, Aug 17, 2016 at 1:34 PM, Junio C Hamano wrote:
> Robert Dailey writes:
>
>> My use case is that I do a merge from branch A to branch B. Branch A
>> modified a file which is already deleted on B some time before the
>> merge.
>>
>> When I do a `git status -sb`, these locally deleted but re
Thanks. Will directly take it to 'master'.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Robert Dailey writes:
> My use case is that I do a merge from branch A to branch B. Branch A
> modified a file which is already deleted on B some time before the
> merge.
>
> When I do a `git status -sb`, these locally deleted but remotely
> modified files show up as "DU".
>
> I want to invoke gi
On 17.08.16 19:38, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> Torsten Bögershausen writes:
>>
>>> Is this `text=auto` correct ?
>>
>> Thanks for spotting a typo. Definitely.
>>
>>> I think it should be
>>>
>>>used to have the same effect as
>>>$ echo "* text eol=crlf" >.gitattr
My use case is that I do a merge from branch A to branch B. Branch A
modified a file which is already deleted on B some time before the
merge.
When I do a `git status -sb`, these locally deleted but remotely
modified files show up as "DU".
I want to invoke git status or diff (or something else) t
Johannes Schindelin writes:
> From: Ben Wijen
>
> When the index is locked and child processes inherit the handle to
> said lock and the parent process wants to remove the lock before the
> child process exits, on Windows there is a problem: it won't work
> because files cannot be deleted if a p
Johannes Schindelin writes:
> From: Ben Wijen
>
> On Windows, files cannot be removed unless all file handles to it have
s/files/a file/, as the file handles later in the sentence are open
on that single file.
Alternatively s/file handles to it/file handles to them/.
> been released. Hence it
Heiko Voigt writes:
> On Thu, Jul 28, 2016 at 02:55:14PM +0200, Heiko Voigt wrote:
>> To reference previous commits people used to put just the abbreviated
>> SHA-1 into commit messages. This is what has evolved as a more
>> stable format for referencing commits. So lets document it for everyone
Duy Nguyen writes:
> On Mon, Aug 15, 2016 at 5:46 AM, Junio C Hamano wrote:
>> * dt/index-helper (2016-07-06) 21 commits
>>
>> A new "index-helper" daemon has been introduced to give newly
>> spawned Git process a quicker access to the data in the index, and
>> optionally interface with the w
Junio C Hamano writes:
> Torsten Bögershausen writes:
>
>> Is this `text=auto` correct ?
>
> Thanks for spotting a typo. Definitely.
>
>> I think it should be
>>
>>used to have the same effect as
>>$ echo "* text eol=crlf" >.gitattributes
>
> Thanks.
>
>> # In other words, the `auto` wa
Remi Galan Alfonso
writes:
> I tried to see if the `git config` in other tests were in the
> same case or not but the sheer amount made me reconsider. However
> taking a look at a couple of random ones, there are some scripts
> that would benefit from the conversion.
Yes, that is why I said "it
Torsten Bögershausen writes:
> Is this `text=auto` correct ?
Thanks for spotting a typo. Definitely.
> I think it should be
>
>used to have the same effect as
>$ echo "* text eol=crlf" >.gitattributes
Thanks.
> # In other words, the `auto` was ignored, as explained here:
> + $ git
Remi Galan Alfonso
writes:
> Either way (3 or 4 lines) I find it strange to have both advices
> start in the same way except that one is split and not the other.
True.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More maj
Signed-off-by: Brian Henderson
---
contrib/diff-highlight/Makefile | 5 ++
contrib/diff-highlight/t/Makefile| 22
contrib/diff-highlight/t/t9400-diff-highlight.sh | 62 +
contrib/diff-highlight/t/test-diff-highlight.sh | 69 +
Signed-off-by: Brian Henderson
---
contrib/diff-highlight/t/t9400-diff-highlight.sh | 13 +++
contrib/diff-highlight/t/test-diff-highlight.sh | 43
2 files changed, 56 insertions(+)
diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh
b/contrib/diff-highli
Signed-off-by: Brian Henderson
---
contrib/diff-highlight/diff-highlight | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/contrib/diff-highlight/diff-highlight
b/contrib/diff-highlight/diff-highlight
index ffefc31..9364423 100755
--- a/contrib/diff-highlight/
Changes made per Eric.
On Wed, Aug 10, 2016 at 08:56:35AM +, Eric Wong wrote:
> Brian Henderson wrote:
>
> Hi Brian,
>
> A few minor portability/style nits below, but contrib/ probably
> (still?) has laxer rules than the rest of git...
>
> I think we still require Signed-off-by lines in co
Johannes Schindelin writes:
>> And then your "git cat-file" patch can be upstreamed with the option
>> renamed to (or with an additional synonym) "--filters", which would make
>> things consistent.
>
> Right. I would like to ask for a `--smudge` synonym nevertheless, just
> because I already use
Stephen Morton writes:
> [snip]
> On 2016-08-16 4:44 AM, Remi Galan Alfonso wrote:
>> Hi Stephen,
>>
>> Stephen Morton writes:
>>> +if (multiple_commits)
>>> + advise(_("after resolving the conflicts,
>>> mark the corrected paths with 'git ad
Hi Junio,
On Sat, 13 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > New Features
> >
> > • Comes with Git 2.9.3.
>
> For future reference, what time (in UTC) of the day is convenient
> for you to see an upstream tarball?
Heh... I don't do tarballs anymore, I now use thi
Responding to a few comments...
On 2016-08-14 7:44 AM, Christian Couder wrote:
multiple_commits)
... but here multiple_commits is the last argument.
It would be better if it was more consistent.
(Johannes made the same comment.)
Yes. Will do.
multiple_commits = (todo_list->next) != NULL;
Wh
> On 17 Aug 2016, at 14:41, Johannes Schindelin
> wrote:
>
> From: Ben Wijen
>
> When the index is locked and child processes inherit the handle to
> said lock and the parent process wants to remove the lock before the
> child process exits, on Windows there is a problem: it won't work
> beca
On Wed, 2016-08-17 at 17:49 +0700, Duy Nguyen wrote:
> On Mon, Aug 15, 2016 at 5:46 AM, Junio C Hamano wrote:
> > * dt/index-helper (2016-07-06) 21 commits
> >
> > A new "index-helper" daemon has been introduced to give newly
> > spawned Git process a quicker access to the data in the index, and
Hi Vasco,
On Fri, 12 Aug 2016, Vasco Almeida wrote:
> The concerned test greps the output of exit_with_patch() in
> git-rebase--interactive.sh script.
>
> Signed-off-by: Vasco Almeida
Thank you for keeping an eye out for these issues. I have to admit that I
am a bit confused when to use i18ngr
On Wed, Aug 17, 2016 at 8:41 AM, Johannes Schindelin
wrote:
> When the index is locked and child processes inherit the handle to
> said lock and the parent process wants to remove the lock before the
> child process exits, on Windows there is a problem: it won't work
> because files cannot be dele
Hi Torsten,
On Sat, 13 Aug 2016, tbo...@web.de wrote:
> From: Torsten Bögershausen
>
> Change since v1:
> - The changes done in 1/2 in t0027 needed to be reverted in 2/2.
> Put both changes for convert.c and t0027 into a single commit
> Thanks to Johannes Sixt.
> Torsten Bögershausen (1):
>
From: Ben Wijen
When the index is locked and child processes inherit the handle to
said lock and the parent process wants to remove the lock before the
child process exits, on Windows there is a problem: it won't work
because files cannot be deleted if a process holds a handle on them.
The sympto
From: Ben Wijen
On Windows, files cannot be removed unless all file handles to it have
been released. Hence it is particularly important to close handles when
spawning children (which would probably not even know that they hold on
to those handles).
The example chosen for this test is a custom m
This issue was originally reported and fixed in
https://github.com/git-for-windows/git/pull/755
The problem is that file handles to temporary files (such as
index.lock) were inherited by spawned processes. If those spawned
processes do not exit before the parent process wants to delete or
rename t
Hi,
On Thu, Jul 28, 2016 at 02:55:14PM +0200, Heiko Voigt wrote:
> To reference previous commits people used to put just the abbreviated
> SHA-1 into commit messages. This is what has evolved as a more
> stable format for referencing commits. So lets document it for everyone
> to lookup when neede
On Mon, Aug 15, 2016 at 5:46 AM, Junio C Hamano wrote:
> * dt/index-helper (2016-07-06) 21 commits
>
> A new "index-helper" daemon has been introduced to give newly
> spawned Git process a quicker access to the data in the index, and
> optionally interface with the watchman daemon to further re
Hi everyone,
I'm happy announce that the 18th edition of Git Rev News is now published:
https://git.github.io/rev_news/2016/08/17/edition-18/
Thanks a lot to all the contributors and helpers, especially Lars,
Dscho, Jakub, Roberto and Josh!
Enjoy,
Christian and Thomas.
--
To unsubscribe from th
On Tue, 16 Aug 2016, Nikolaus Rath wrote:
On Aug 16 2016, David Lang wrote:
On Tue, 16 Aug 2016, Nikolaus Rath wrote:
I would like to store Simulink models in a Git
repository. Unfortunately, the file format is binary. But luckily, the
binary format happens to be a zipfile containing nicely
Hi,
On Tue, 16 Aug 2016, Remi Galan Alfonso wrote:
> Stephen Morton writes:
> > +if (multiple_commits)
> > + advise(_("after resolving the conflicts,
> > mark the corrected paths with 'git add ' or 'git rm '\n"
> > +
Junio C Hamano writes:
> Remi Galan Alfonso
> writes:
>
>> Johannes Schindelin writes:
>>> Hi Rémi,
>>>
>>> On Tue, 16 Aug 2016, Remi Galan Alfonso wrote:
>>>
>>> > Johannes Schindelin writes:
>>> > > diff --git a/t/t1350-config-hooks-path.sh b/t/t1350-config-hooks-path.sh
>>> > > index 5e3fb3a
Am 17.08.2016 um 08:46 schrieb David Aguilar:
The only thing that using diff-files doesn't address is the
rerere support in mergetool where it processes the files in
the order specified by "git rerere remaining". This is why I
initially thought we needed a generic sort-like command.
I see. Thi
64 matches
Mail list logo
