The main idea of the patch is to get rid of using custom formatting in
cat-file and start using general one from ref-filter.
Additional bonus is that cat-file becomes to support many new
formatting commands like %(if), %(color), %(committername) etc.
Updates since last review:
In [PATCH v3 16/23]
Continue migrating formatting logic from cat-file to ref-filter.
Reuse parse_ref_filter_atom() for unifying all processes in ref-filter
and further removing of mark_atom_in_object_info().
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
ref-filter.c | 34
Get rid of goto command in ref-filter for better readability.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
ref-filter.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index f9e25aea7a97e..d0429
Start using ref_format struct instead of simple char*.
Need that for further reusing of formatting logic from ref-filter.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
builtin/cat-file.c | 15 ---
1 file changed, 8 insertions(+), 7 deletion
Remove populate_value() from header file. We needed that
for interim step, now it could be returned back.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
ref-filter.c | 2 +-
ref-filter.h | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --g
Move mark_atom_in_object_info() from cat-file to ref-filter and
start using it in verify_ref_format().
It also means that we start reusing verify_ref_format() in cat-file.
Start from simple moving of mark_atom_in_object_info(),
it would be removed later by integrating all needed processes into
ref
Remove connection between expand_data variable
in cat-file and in ref-filter.
It will help further to get rid of using expand_data in cat-file.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
builtin/cat-file.c | 3 ++-
ref-filter.c | 36 +
Moving from using expand_data to ref_array_item structure.
That helps us to reuse functions from ref-filter easier.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
builtin/cat-file.c | 32
ref-filter.h | 5 +
2
Add tests for new formatting atoms: rest, deltabase, objectsize:disk.
rest means nothing and we expand it into empty string.
We need this atom for cat-file command.
Have plans to support deltabase and objectsize:disk further
(as it is done in cat-file), now also expand it to empty string.
Signed-o
Add return flag to format_ref_array_item(), show_ref_array_item(),
get_ref_array_info() and populate_value() for further using.
Need it to handle situations when item is broken but we can not invoke
die() because we are in batch mode and all items need to be processed.
Signed-off-by: Olga Telezhna
Move logic related to skip_object_info into ref-filter,
so that cat-file does not use that field at all.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
builtin/cat-file.c | 7 +--
ref-filter.c | 5 +
ref-filter.h | 1 +
3 files chang
Rename objectname field to oid in struct ref_array_item.
Next commit will add objectname field that will contain
string representation of object id.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
builtin/cat-file.c | 4 ++--
ref-filter.c | 10 +++
Reuse code from ref-filter to print resulting message.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
builtin/cat-file.c | 51 ---
ref-filter.c | 21 +++--
2 files changed, 23 inserti
Need that for further reusing of formatting logic in cat-file.
Have plans to get rid of using expand_data in cat-file at all,
and use it only in ref-filter for collecting, formatting and printing
needed data.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
--
Make function global for further using in cat-file.
In the end of patch series this function becomes internal again,
so this is a part of middle step. cat-file would use more general
functions further.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
ref-
Move logic related to getting object info from cat-file to ref-filter.
It will help to reuse whole formatting logic from ref-filter further.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
builtin/cat-file.c | 17 -
ref-filter.c | 2
Make valid_atom as a function parameter,
there could be another variable further.
Need that for further reusing of formatting logic in cat-file.c.
We do not need to allow users to pass their own valid_atom variable in
global functions like verify_ref_format() because in the end we want to
have sam
Delete all items related to split_on_whitespace from ref-filter
and add new function for handling the logic.
Now cat-file could invoke that function to implementing its logic.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
builtin/cat-file.c | 8 +++---
Update the docs for cat-file command. Some new formatting atoms added
because of reusing ref-filter code.
We do not support cat-file atoms in general formatting logic
(there is just the support for cat-file), that is why some of the atoms
are still explained in cat-file docs.
We need to move these
cat-file options are now filled by general logic.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
ref-filter.c | 33 -
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 8d104
Stop using valid_cat_file_atom, making the code more general.
Further commits will contain some tests, docs and
support of new features.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
ref-filter.c | 34 +-
1 file changed,
Remove mark_atom_in_object_info() and create same logic
in terms of ref-filter style.
Signed-off-by: Olga Telezhnaia
Mentored-by: Christian Couder
Mentored by: Jeff King
---
ref-filter.c | 45 +
1 file changed, 21 insertions(+), 24 deletions(-)
diff
Split expand_atom() into 2 different functions,
mark_atom_in_object_info() prepares variable for further filling,
(new) expand_atom() creates resulting string.
Need that for further reusing of formatting logic from ref-filter.
Both functions will be step-by-step removed by the end of this patch.
S
Add some tests for new formatting atoms from ref-filter.
Some of new atoms are supported automatically,
some of them are expanded into empty string
(because they are useless for some types of objects),
some of them could be supported later in other patches.
Signed-off-by: Olga Telezhnaia
Mentored
On Sat, Feb 10, 2018 at 7:10 PM, Johannes Schindelin
wrote:
> This patch is part of the effort to reimplement `--preserve-merges` with
> a substantially improved design, a design that has been developed in the
> Git for Windows project to maintain the dozens of Windows-specific patch
> series on t
On Fri, Feb 2, 2018 at 6:47 PM, Eric Sunshine wrote:
> On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy
> wrote:
>> This command allows to delete a worktree. Like 'move' you cannot
>> remove the main worktree, or one with submodules inside [1].
>> [...]
>> Signed-off-by: Nguyễn Thái Ngọc Du
Submodules contains .git files with relative paths. After a worktree
move, these files need to be updated or they may point to nowhere.
This is a bandage patch to make sure "worktree move" don't break
people's worktrees by accident. When .git file update code is in
place, this validate_no_submodul
This command allows to delete a worktree. Like 'move' you cannot
remove the main worktree, or one with submodules inside [1].
For deleting $GIT_WORK_TREE, Untracked files or any staged entries are
considered precious and therefore prevent removal by default. Ignored
files are not precious.
When i
Signed-off-by: Nguyễn Thái Ngọc Duy
---
worktree.c | 17 +
worktree.h | 6 ++
2 files changed, 23 insertions(+)
diff --git a/worktree.c b/worktree.c
index b238d87bf1..0373faf0dc 100644
--- a/worktree.c
+++ b/worktree.c
@@ -326,6 +326,23 @@ int validate_worktree(const struct
v2 basically fixes lots of comments from Eric (many thanks!): memory
leak, typos, document updates, tests, corner case fixes.
Interdiff:
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 6f83723d9a..d322acbc67 100644
--- a/Documentation/git-worktree.txt
+++ b/Docu
Similar to "mv a b/", which is actually "mv a b/a", we extract basename
of source worktree and create a directory of the same name at
destination if dst path is a directory.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/worktree.c | 11 ++-
strbuf.c | 8
"git worktree remove" basically consists of two things
- delete $GIT_WORK_TREE
- delete $GIT_DIR (which is $SUPER_GIT_DIR/worktrees/something)
If $GIT_WORK_TREE is already gone for some reason, we should be able
to finish the job by deleting $GIT_DIR.
Two notes:
- $GIT_WORK_TREE _can_ be missin
This function is later used by "worktree move" and "worktree remove"
to ensure that we have a good connection between the repository and
the worktree. For example, if a worktree is moved manually, the
worktree location recorded in $GIT_DIR/worktrees/.../gitdir is
incorrect and we should not move th
This command allows to relocate linked worktrees. Main worktree cannot
(yet) be moved.
There are two options to move the main worktree, but both have
complications, so it's not implemented yet. Anyway the options are:
- convert the main worktree to a linked one and move it away, leave
the git r
On Wed, Feb 7, 2018 at 3:05 AM, Martin Ågren wrote:
> On 6 February 2018 at 03:13, Jeff King wrote:
>> On Mon, Feb 05, 2018 at 08:28:10PM +0700, Duy Nguyen wrote:
>>> I learned SANITIZE=leak today! It not only catches this but also "dst".
>>>
>>> Jeff is there any ongoing effort to make the test
On Sun, Feb 11, 2018 at 9:44 PM, Ævar Arnfjörð Bjarmason
wrote:
>
> On Sat, Feb 10 2018, Duy Nguyen jotted:
>
>> On Sat, Feb 10, 2018 at 1:37 AM, Ævar Arnfjörð Bjarmason
>> wrote:
>>>
>>> On Thu, Feb 01 2018, Junio C. Hamano jotted:
>>>
* nd/fix-untracked-cache-invalidation (2018-01-24) 5 co
--
Greetings,
I wonder why you continue neglecting my emails. Please, acknowledge the
receipt of this message in reference to the subject above as I intend to
send to you the details of the project. Sometimes, try to check your
spam
box because most of these correspondences fall out sometimes
On Fri, 9 Feb 2018, Philip Oakley wrote:
> From: "Robert P. J. Day"
> > On Fri, 9 Feb 2018, Philip Oakley, CEng MIET wrote:
> (apologies for using the fancy letters after the name ID...)
> >
> >> From: "Robert P. J. Day"
> >> >
> >> > writing a short tutorial on "git bisect" and, all the details
On Wed, Feb 7, 2018 at 9:13 PM, Ben Peart wrote:
>
>
> On 2/6/2018 7:27 AM, Duy Nguyen wrote:
>>
>>
>> This is another thing that bugs me. I know you're talking about huge
>> index files, but at what size should we start this sort of
>> optimization? Writing down a few MBs on linux is cheap enough
On Fri, 9 Feb 2018, Junio C Hamano wrote:
> "Robert P. J. Day" writes:
>
> > i'm confused ... why, after skipping a good chunk in the interval
> > [v4.13,v4.14], do i still have exactly 7300 revisions to bisect? what
> > am i so hopelessly misunderstanding here?
>
> Are you really "skipping" a
> > 1. there may be feature branches that bypass the known good starting
> >commit, which can cause understanding issues as those side
> >branches that predate the start point are also considered
> >potential bu commits.
>
> ok, but let's make sure i understand what defines a possib
Hi Dear,
How are you today I hope that everything is OK with you as it is my great
pleasure to contact you in having communication with you starting from today, I
was just going through the Internet search when I found your email address, I
want to make a very new and special friend, so I decid
Herzlichen Glückwunsch, Sie haben am 31. Januar 2018 in den monatlichen
Gewinnspielen von Euro Millions/Google Promo 650.000 gewonnen.
Kontaktieren Sie unseren Schadenregulierungsbeauftragten mit den folgenden
Informationen
1. Vollst?ndiger Name
2. Adresse
3. Geschlecht
4. Alter
5. Beruf
6. Tel
On 2/6/2018 8:12 PM, Brandon Williams wrote:
Changes in v3:
* There were some comments about how the protocol should be designed
stateless first. I've made this change and instead of having to
supply the `stateless-rpc=true` capability to force stateless
behavior, the protocol just
Let me repeat what you said so I know how to improve the patch:
@Junio:
> Perhaps end each sentence with a full-stop?
I should end each sentence in the *log* message with "." (rather than
the translatable strings in the patch)
> Shouldn't this rather be like so instead?
> if test_i18ngrep ! "inval
Dear great team,
Normal git tooling creates different files file.ORIG file.LOCAL
file.REMOTE in case of conflicts.
However `git stash pop` manipulates your files directly resulting in
lines like:
<<< Updated upstream
>>> Stashed changes
This can seriously corrupt files and workflows.
On Mon, Feb 12, 2018 at 04:03:49PM +0100, Alexander Shopov wrote:
> @Jeff:
> > we may want to avoid this anti-pattern
> Current state of these tests is wrong and I should rework them.
>
> Here is what I intend to do:
> 1. Fix the commit message
> 2. Check whether I can get the tests in t0002-gitf
On Mon, Feb 12, 2018 at 11:44 AM, Robert P. J. Day
wrote:
> On Fri, 9 Feb 2018, Junio C Hamano wrote:
>
>> "Robert P. J. Day" writes:
>>
>> > i'm confused ... why, after skipping a good chunk in the interval
>> > [v4.13,v4.14], do i still have exactly 7300 revisions to bisect? what
>> > am i so
Hi.
In 2017 a set of patches titled "add object filtering for partial fetch" was
accepted. Is it what I think it is? Will we be able to download only a
subdirectory from a
large project?
Prior to 644eb60bd0 (builtin/describe.c: describe a blob,
2017-11-15), we noticed and complained about missing
objects, since they were not valid commits:
$ git describe
fatal: is not a valid 'commit' object
Aft
On Mon, Feb 12, 2018 at 12:23:06PM -0500, Jeff King wrote:
> We can fix this by replacing the lookup_blob() call with a
> check of the true type via sha1_object_info(). This is not
> quite as efficient as we could possibly make this check. We
> know in most cases that the object was already parsed
On 2/12/2018 5:20 AM, Duy Nguyen wrote:
On Wed, Feb 7, 2018 at 9:13 PM, Ben Peart wrote:
On 2/6/2018 7:27 AM, Duy Nguyen wrote:
This is another thing that bugs me. I know you're talking about huge
index files, but at what size should we start this sort of
optimization? Writing down a few M
On 2/12/2018 11:24 AM, Basin Ilya wrote:
Hi.
In 2017 a set of patches titled "add object filtering for partial fetch" was
accepted. Is it what I think it is? Will we be able to download only a subdirectory from a
large project?
yes, that is the goal.
there are several caveats, but yes, that
* jh/status-no-ahead-behind (2018-01-24) 4 commits
- status: support --no-ahead-behind in long format
- status: update short status to respect --no-ahead-behind
- status: add --[no-]ahead-behind to status and commit for V2 format.
- stat_tracking_info: return +1 when branches not equal
On Mon, Feb 12, 2018 at 9:23 AM, Jeff King wrote:
> Prior to 644eb60bd0 (builtin/describe.c: describe a blob,
> 2017-11-15), we noticed and complained about missing
> objects, since they were not valid commits:
>
> $ git describe
> fatal: 00
On Sun, Feb 11, 2018 at 9:53 AM, wrote:
> Hello git-l10n Team
cc'd Jiang Xi, who coordinates the git-l10n team.
>
> I want to join to this project as a translator for Indonesian language (ID)
> I have read the README file located in the
> https://github.com/git-l10n/git-po/blob/master/po/README
Derrick Stolee writes:
> It is possible to have multiple commit graph files in a pack directory,
> but only one is important at a time. Use a 'graph_head' file to point
> to the important file. Teach git-commit-graph to write 'graph_head' upon
> writing a new commit graph file.
Why this design,
On Fri, Feb 9, 2018 at 2:09 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> Patch generated by
>>
>> 2. Applying the semantic patch contrib/coccinelle/packed_git.cocci
>> to adjust callers.
>
> About this part...
>
>> diff --git a/contrib/coccinelle/packed_git.cocci
>> b/contrib/cocc
On Fri, Feb 9, 2018 at 3:15 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> @@ -32,7 +31,15 @@ struct object_store {
>>* Objects that should be substituted by other objects
>>* (see git-replace(1)).
>>*/
>> - struct replace_objects replacements;
>> + struct
On 02/10, Leo Gaspard wrote:
> On 02/10/2018 01:21 PM, Jeff King wrote:
> > On Sat, Feb 10, 2018 at 01:37:20AM +0100, Leo Gaspard wrote:
> >
> >>> Yeah, tag-following may be a little tricky, because it usually wants to
> >>> write to refs/tags/. One workaround would be to have your config look
> >
On Sat, Feb 10, 2018 at 7:10 PM, Johannes Schindelin
wrote:
> [...]
> This commit implements the commands to label, and to reset to, given
> revisions. The syntax is:
>
> label
> reset
> [...]
> Signed-off-by: Johannes Schindelin
> ---
> diff --git a/sequencer.c b/sequencer.c
>
Hi,
I understand your company is exhibiting in The Minerals, Metals & Materials
Society Annual on MAR/11 - MAR/15/2018.
Would you be interested in the complete contact information with email
addresses of Materials scientists and Engineers?
Available Data Fields: Practice Name, Web Addr
Eric Sunshine writes:
> Although "git worktree add" learned to run the 'post-checkout' hook in
> ade546be47 (worktree: invoke post-checkout hook, 2017-12-07), it
> neglects to change to the directory of the newly-created worktree
> before running the hook. Instead, the hook is run within the dire
When the batch size is neither configured nor given on the command
line, but the relogin delay is given, then the current code ignores
the relogin delay setting.
This is unsafe as there was some intention when setting the batch size.
One workaround would be to just assume a batch size of 1 as a de
> On 12 Feb 2018, at 04:15, Eric Sunshine wrote:
>
> Although "git worktree add" learned to run the 'post-checkout' hook in
> ade546be47 (worktree: invoke post-checkout hook, 2017-12-07), it
> neglects to change to the directory of the newly-created worktree
> before running the hook. Instead, t
Belove
My name is Elizabeth M. Philips, i am going on a radical hysterectomy
cervical cancer surgery today. I have WILLED £12,379,000.00 British pounds
to you for the work of the lord. Contact my attorney with my reference number
(NW/XXR/017/053K/PDQ/613X1/UK) for further info. Barr.Luis Jason.
Hi Eric,
On Mon, 12 Feb 2018, Eric Sunshine wrote:
> On Sat, Feb 10, 2018 at 7:10 PM, Johannes Schindelin
> wrote:
> > This patch is part of the effort to reimplement `--preserve-merges` with
> > a substantially improved design, a design that has been developed in the
> > Git for Windows project
Ramsay Jones writes:
> Attempting to grep the output of test_i18ngrep will not work under a
> poison build, since the output is (almost) guaranteed not to have the
> string you are looking for. In this case, the output of test_i18ngrep
> is further filtered by a simple piplined grep to exclude an
Add documentation explaining the functions in color.h.
While at it, mark them extern and migrate the function `color_set`
into grep.c, where the only callers are.
Signed-off-by: Stefan Beller
---
* removed the extern keyword
* reworded the docs for want_color once again.
color.c | 7 ---
Hi Sergey,
On Mon, 12 Feb 2018, Sergey Organov wrote:
> Thanks for explanations, and could you please answer this one:
>
> [...]
>
> >> I also have trouble making sense of "Recreate merge commits instead of
> >> flattening the history by replaying merges." Is it " >> commits by replaying merges
On Mon, Feb 12, 2018 at 2:37 PM, Junio C Hamano wrote:
> Eric Sunshine writes:
>> Fix this by changing to the new worktree's directory before running
>> the hook, and adjust the tests to verify that the hook is indeed run
>> within the correct directory.
>
> I like the approach taken by this repl
Junio C Hamano writes:
> Derrick Stolee writes:
>
>> It is possible to have multiple commit graph files in a pack directory,
>> but only one is important at a time. Use a 'graph_head' file to point
>> to the important file. Teach git-commit-graph to write 'graph_head' upon
>> writing a new commi
Hi Sergey,
On Mon, 12 Feb 2018, Sergey Organov wrote:
> Johannes Schindelin writes:
> >
> > On Fri, 9 Feb 2018, Sergey Organov wrote:
> >
> >> Johannes Schindelin writes:
> >>
> >> [...]
> >>
> >> > With this patch, the goodness of the Git garden shears comes to `git
> >> > rebase -i` itself.
Hi Eric,
On Mon, 12 Feb 2018, Eric Sunshine wrote:
> On Sat, Feb 10, 2018 at 7:10 PM, Johannes Schindelin
> wrote:
> > [...]
> > This commit implements the commands to label, and to reset to, given
> > revisions. The syntax is:
> >
> > label
> > reset
> > [...]
> > Signed-off-b
> On 12 Feb 2018, at 04:15, Eric Sunshine wrote:
>
> Git commands which run hooks do so at the top level of the worktree in
> which the command itself was invoked. However, the 'git worktree'
> command may need to run hooks within some other directory. For
> instance, when "git worktree add" run
Stefan Beller writes:
> I thought it may be a helpful
> for merging this series with the rest of the evolved code base which
> may make use of one of the converted functions. So instead of fixing
> that new instance manually, cocinelle could do that instead.
Having the .cocci used for the conver
Junio C Hamano writes:
>> -test_i18ngrep -E '^(fatal|warning):' actual
>> | sort &&
>> +grep -E '^(fatal|warning):' actual &&
>> test_i18ncmp expected actual
>
> OK, but not quite OK.
>
> Two grep invocations will not leave anything useful in 'actual'
> under poison build, and is al
On Mon, Feb 12, 2018 at 1:00 PM, Stephen Rothwell wrote:
>
> Linus, this happens a bit after the merge window, so I am wondering
> about the rational of not doing a fast forward merge when merging a
> signed tag (I forget the reasoning).
The reasoning is to avoid losing the signature from the tag
On 2/12/2018 3:37 PM, Junio C Hamano wrote:
Junio C Hamano writes:
Derrick Stolee writes:
It is possible to have multiple commit graph files in a pack directory,
but only one is important at a time. Use a 'graph_head' file to point
to the important file. Teach git-commit-graph to write 'gra
Em Mon, 12 Feb 2018 13:15:04 -0800
Linus Torvalds escreveu:
> On Mon, Feb 12, 2018 at 1:00 PM, Stephen Rothwell
> wrote:
> >
> > Linus, this happens a bit after the merge window, so I am wondering
> > about the rational of not doing a fast forward merge when merging a
> > signed tag (I forget t
Linus Torvalds writes:
> On Mon, Feb 12, 2018 at 1:00 PM, Stephen Rothwell
> wrote:
>
> The problem, of course, is that since git is distributed, git doesn't
> know who is "upstream" and who is "downstream", so there's no
> _technical_ difference between merging a development tree, and a
> deve
On Mon, Feb 12, 2018 at 1:15 PM, Linus Torvalds
wrote:
>
> The reasoning is to avoid losing the signature from the tag (when
> merging a signed tag, the signature gets inserted into the merge
> commit itself - use "git log --show-signature" to see them).
I think the commit that actually introduce
[removed rene.scha...@lsrfire.ath.cx from cc:; I lost that domain a few
years ago. Thanks for the heads-up, Stefan!]
Am 12.02.2018 um 20:00 schrieb Stefan Beller:
> On Fri, Feb 9, 2018 at 2:09 PM, Junio C Hamano wrote:
>> Stefan Beller writes:
>>
>>> Patch generated by
>>>
>>> 2. Applying th
Am 12.02.2018 um 22:04 schrieb Junio C Hamano:
> Stefan Beller writes:
>
>> I thought it may be a helpful
>> for merging this series with the rest of the evolved code base which
>> may make use of one of the converted functions. So instead of fixing
>> that new instance manually, cocinelle could
Linus Torvalds writes:
> Maybe we could just tell people to have something like
>
>git config --global alias.update pull --ff-only
>
> and use that for "try to update to upstream".
I guess our mails crossed. I admit that I indeed wondered why you
were not giving your usual "downstream s
René Scharfe writes:
> Am 12.02.2018 um 22:04 schrieb Junio C Hamano:
>> Stefan Beller writes:
>>
>>> I thought it may be a helpful
>>> for merging this series with the rest of the evolved code base which
>>> may make use of one of the converted functions. So instead of fixing
>>> that new inst
On Mon, Feb 12, 2018 at 3:58 PM, Lars Schneider
wrote:
>> On 12 Feb 2018, at 04:15, Eric Sunshine wrote:
>> +int run_hook_ve(const char *const *env, const char *name, va_list args)
>> +{
>> + return run_hook_cd_ve(NULL, env, name, args);
>> +}
>
> I think we have only one more user for this f
On Mon, Feb 12, 2018 at 1:44 PM, Junio C Hamano wrote:
>
> But I wonder why "update to upstream" is merging a signed tag in the
> first place. Wouldn't downstream's "try to keep up with" pull be
> grabbing from branch tips, not tags?
I'm actually encouraging maintainers to *not* start their work
On Mon, Feb 12, 2018 at 3:19 PM, Stefan Beller wrote:
> Add documentation explaining the functions in color.h.
> While at it, mark them extern and migrate the function `color_set`
> into grep.c, where the only callers are.
This re-roll no longer marks functions as 'extern', so the commit
message
On 12 February 2018 at 10:56, Duy Nguyen wrote:
> On Wed, Feb 7, 2018 at 3:05 AM, Martin Ågren wrote:
>> On 6 February 2018 at 03:13, Jeff King wrote:
>>> On Mon, Feb 05, 2018 at 08:28:10PM +0700, Duy Nguyen wrote:
I learned SANITIZE=leak today! It not only catches this but also "dst".
Martin Ågren writes:
> +test_expect_success TTY 'git config respects pager.config when setting' '
> + rm -f paginated.out &&
> + test_terminal git -c pager.config config foo.bar bar &&
> + test -e paginated.out
> +'
I am debating myself if this test should instead spell out what we
e
On 12 February 2018 at 23:17, Junio C Hamano wrote:
> Martin Ågren writes:
>
>> +test_expect_success TTY 'git config respects pager.config when setting' '
>> + rm -f paginated.out &&
>> + test_terminal git -c pager.config config foo.bar bar &&
>> + test -e paginated.out
>> +'
>
> I am
Linus Torvalds writes:
> And some maintainers end up using multiple repositories as branches
> (the old _original_ git model). Again, you can just use "git fetch +
> git reset", of course, but that's a bit unsafe. In contrast, doing
> "git pull --ff-only" is a safe convenient operation that does
Em Mon, 12 Feb 2018 15:42:44 -0800
Junio C Hamano escreveu:
> Linus Torvalds writes:
>
> > And some maintainers end up using multiple repositories as branches
> > (the old _original_ git model). Again, you can just use "git fetch +
> > git reset", of course, but that's a bit unsafe. In contrast
On Mon, Feb 12, 2018 at 11:15:06PM +0100, Martin Ågren wrote:
> On 12 February 2018 at 10:56, Duy Nguyen wrote:
> > On Wed, Feb 7, 2018 at 3:05 AM, Martin Ågren wrote:
> >> On 6 February 2018 at 03:13, Jeff King wrote:
> >>> On Mon, Feb 05, 2018 at 08:28:10PM +0700, Duy Nguyen wrote:
> I le
Hi,
Brandon Williams wrote:
> The current pkt-line API encodes the status of a pkt-line read in the
> length of the read content. An error is indicated with '-1', a flush
> with '0' (which can be confusing since a return value of '0' can also
> indicate an empty pkt-line), and a positive integer
'git for-each-ref' should error out when invoked with more than one
quoting style options. The tests checking this have two issues:
- They run 'git for-each-ref' upstream of a pipe, hiding its exit
code, thus don't actually checking that 'git for-each-ref' exits
with error code.
- Th
On Sat, Feb 10, 2018 at 09:47:57PM +0100, Jonas Thiem wrote:
> == Why did I expect that ==
>
> Of course after the client rebase, C3.txt should be gone (since it's
> gone at the original last commit of the client branch).
>
> But since it still exists in the server branch at the final commit,
> a
Hi,
Brandon Williams wrote:
> Subject: pkt-line: introduce struct packet_reader
nit: this subject line doesn't describe what the purpose/intent behind
the patch is. Maybe something like
pkt-line: allow peeking at a packet line without consuming it
would make it clearer.
> Sometimes i
Hi Karsten,
> Normal git tooling creates different files file.ORIG file.LOCAL
> file.REMOTE in case of conflicts.
Which tools are you referring to here? Can you give a short sequence
of commands that show what you mean?
> However `git stash pop` manipulates your files directly resulting in
> lin
1 - 100 of 141 matches
Mail list logo
