On Tue, Aug 30, 2016 at 10:10 PM, Stefan Beller wrote:
>>
>> * sb/submodule-clone-rr (2016-08-17) 8 commits
>> - clone: recursive and reference option triggers submodule alternates
>> - clone: implement optional references
>> - clone: clarify option_reference as required
>> - clone: factor out
On Tue, Aug 30, 2016 at 10:04 PM, Stefan Beller wrote:
> On Wed, Aug 24, 2016 at 4:37 PM, Jacob Keller wrote:
>
>> Yes that seems reasonable.
>>
>> Thanks,
>> Jake
>
> I reviewed all your comments and you seem to be ok with including this
> series as it is queued currently?
>
> Thanks,
> Stefan
On Mon, Aug 29, 2016 at 03:41:59PM -0700, W. David Jarvis wrote:
> We have an open support thread with the GHE support folks, but the
> only feedback we've gotten so far on this subject is that they believe
> our CPU load is being driven by the quantity of fetch operations (an
> average of 16 fetc
On Tue, Aug 30, 2016 at 12:46:20PM +0200, Jakub Narębski wrote:
> W dniu 29.08.2016 o 23:31, Jeff King pisze:
>
> > Blame-tree is a GitHub-specific command (it feeds the main repository
> > view page), and is a known CPU hog. There's more clever caching for that
> > coming down the pipe, but it's
On Mon, Aug 29, 2016 at 10:55 AM, wrote:
> From: Lars Schneider
>
> According to LARGE_PACKET_MAX in pkt-line.h the maximal length of a
> pkt-line packet is 65520 bytes. The pkt-line header takes 4 bytes and
> therefore the pkt-line data component must not exceed 65516 bytes.
>
> Signed-off-by:
>
> * sb/submodule-clone-rr (2016-08-17) 8 commits
> - clone: recursive and reference option triggers submodule alternates
> - clone: implement optional references
> - clone: clarify option_reference as required
> - clone: factor out checking for an alternate path
> - submodule--helper update-
The algorithm in diff-highlight only understands how to look
at two sides of a diff; it cannot correctly handle combined
diffs with multiple preimages. Often highlighting does not
trigger at all for these diffs because the line counts do
not match up. E.g., if we see:
- ours
-theirs
++reso
On Wed, Aug 24, 2016 at 4:37 PM, Jacob Keller wrote:
> Yes that seems reasonable.
>
> Thanks,
> Jake
I reviewed all your comments and you seem to be ok with including this
series as it is queued currently?
Thanks,
Stefan
These are the same as in the normal t/.gitignore, with the
exception of ".prove", as our Makefile does not support it.
Signed-off-by: Jeff King
---
contrib/diff-highlight/t/.gitignore | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 contrib/diff-highlight/t/.gitignore
diff --git a/co
Now that we have a test suite for diff highlight, we can
show off the improvements from 8d00662 (diff-highlight: do
not split multibyte characters, 2015-04-03).
While we're at it, we can also add another case that
_doesn't_ work: combining code points are treated as their
own unit, which means tha
On Tue, Aug 30, 2016 at 07:07:11AM -0700, Brian Henderson wrote:
> On Mon, Aug 29, 2016 at 02:37:46PM -0700, Junio C Hamano wrote:
> > Brian Henderson writes:
> >
> > > How does this look?
> > >
> > > Drawing the graph helped me a lot in figuring out what I was
> > > actually testing. thanks!
> >
On Tue, Aug 30, 2016 at 03:23:10PM -0700, Junio C Hamano wrote:
> Lars Schneider writes:
>
> > On 30 Aug 2016, at 20:59, Junio C Hamano wrote:
> >>
> >>> "abort" could be ambiguous because it could be read as "abort only
> >>> this file". "abort-all" would work, though. Would you prefer to see
Compiling color.c with gcc 6.2.0 using -O3 produces some
-Wmaybe-uninitialized false positives:
color.c: In function ‘color_parse_mem’:
color.c:189:10: warning: ‘bg.blue’ may be used uninitialized in this
function [-Wmaybe-uninitialized]
out += xsnprintf(out, len, "%c8;2;%d;%d;%d",
Commit e208f9c (make error()'s constant return value more
visible, 2012-12-15) introduced some macro trickery to make
the constant return from error() more visible to callers,
which in turn can help gcc produce better warnings (and
possibly even better code).
Later, fd1d672 (usage.c: add warning_e
I happened to be compiling git with -O3 today, and noticed we generate
some warnings about uninitialized variables (I actually compile with
-Wall, but the only false positives I saw were these).
Here are patches to squelch them.
[1/2]: error_errno: use constant return similar to error()
[2/2]
On Tue, Aug 30, 2016 at 10:53 AM, Junio C Hamano wrote:
> Uma Srinivasan writes:
>
>> I think the following fix is still needed to is_submodule_modified():
>>
>> strbuf_addf(&buf, "%s/.git", path);
>> git_dir = read_gitfile(buf.buf);
>> if (!git_dir) {
>> g
Junio C Hamano writes:
> Two functions with the same name reading from the same format, even
> when they expect to produce the same result in different internal
> format, without even being aware of each other is a bad enough
> "regression" in maintainability of the code. One of them not even
>
Lars Schneider writes:
> On 30 Aug 2016, at 20:59, Junio C Hamano wrote:
>>
>>> "abort" could be ambiguous because it could be read as "abort only
>>> this file". "abort-all" would work, though. Would you prefer to see
>>> "error" replaced by "abort" and "error-all" by "abort-all"?
>>
>> No.
>
Johannes Sixt writes:
> Am 30.08.2016 um 19:52 schrieb Johannes Schindelin:
>> Right, but that is exactly what I wanted to avoid, because it is rather
>> inelegant to strdup() strings just so that we do not have to record what
>> to free() and what not to free().
>
> Please, excuse, but when I ha
W dniu 30.08.2016 o 19:52, Johannes Schindelin pisze:
> Hi Kuba,
>
> On Tue, 30 Aug 2016, Jakub Narębski wrote:
>
>> W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze:
>>
>>> The sequencer reads options from disk and stores them in its struct
>>> for use during sequencer's operations.
>>>
>>>
On Tue, Aug 30, 2016 at 10:51 PM, Jeff King wrote:
> On Tue, Aug 30, 2016 at 10:48:19PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
>> > -failed: $(patsubst trash,,$(patsubst directory.%,%.sh,$(wildcard trash\
>> > directory.t[0-9]*)))
>> > +failed:
>> > + @failed=$$(cd '$(TEST_RESULTS_DIRECT
Dear Sir/Madam,
We give out urgent loan for business and personal purpose with 3% intrest rate
applicable to all amount.
Kindly get back to us via email: loa...@foxmail.com for further details on how
to apply.
On Tue, Aug 30, 2016 at 10:48:19PM +0200, Ævar Arnfjörð Bjarmason wrote:
> > -failed: $(patsubst trash,,$(patsubst directory.%,%.sh,$(wildcard trash\
> > directory.t[0-9]*)))
> > +failed:
> > + @failed=$$(cd '$(TEST_RESULTS_DIRECTORY_SQ)' && \
> > + grep -l '^failed [1-9]' $
On Mon, Aug 29, 2016 at 3:46 PM, Johannes Schindelin
wrote:
> While developing patch series, it is a good practice to run the test
> suite from time to time, just to make sure that obvious bugs are caught
> early. With complex patch series, it is common to run `make -j15 -k
> test`, i.e. run the
Am 30.08.2016 um 19:52 schrieb Johannes Schindelin:
Right, but that is exactly what I wanted to avoid, because it is rather
inelegant to strdup() strings just so that we do not have to record what
to free() and what not to free().
Please, excuse, but when I have to choose what is more "elegant"
Hello,
W dniu 30.08.2016 o 20:59, Junio C Hamano pisze:
> Lars Schneider writes:
[...]
>> The filter can exit right after the "error-all". If the filter does
>> not exit then Git will kill the filter. I'll add this to the docs.
>
> OK.
Is it explicit kill, or implicit kill: close pipe and end
On 30 Aug 2016, at 20:59, Junio C Hamano wrote:
>
>> "abort" could be ambiguous because it could be read as "abort only
>> this file". "abort-all" would work, though. Would you prefer to see
>> "error" replaced by "abort" and "error-all" by "abort-all"?
>
> No.
>
> I was primarily reacting to
Hi- I'm wondering if anyone could suggest a GIT support partner(s)? The
community is great, but I'm looking for a more personalized GIT support
experience.
Thanks!
-Scott Sobstad
Scott Sobstad
Director-Application Support,TSG
JDA Software
20700 Swenson Dr,
Waukesha, WI 53186 / United States
Many commits have various forms of trailers similar to
"Acked-by: Name " and "Reported-by: Name "
Add the ability to cc these trailers when using git send-email.
This can be suppressed with --suppress-cc=trailers.
Signed-off-by: Joe Perches
---
Documentation/git-send-email.txt | 10 ++
Hey Junio,
On Wed, Aug 31, 2016 at 1:03 AM, Junio C Hamano wrote:
> Pranit Bauva writes:
>
>> This is a very tricky one. I have purposely not included this after a
>> lot of testing. I have hand tested with the original git and with this
>> branch. The reason why anyone wouldn't be able to catch
Pranit Bauva writes:
> This is a very tricky one. I have purposely not included this after a
> lot of testing. I have hand tested with the original git and with this
> branch. The reason why anyone wouldn't be able to catch this is
> because its not covered in the test suite. I am including a pat
Jeff King writes:
> Hmm, interesting. Your approach seems reasonable, but I have to wonder
> if writing the pid in the first place is sane.
>
> I started to write up my reasoning in this email, but realized it was
> rapidly becoming the content of a commit message. So here is that
> commit.
Soun
Joe Perches writes:
> On Tue, 2016-08-30 at 11:17 -0700, Junio C Hamano wrote:
>> Joe Perches writes:
>>
>> >
>> > On Tue, 2016-08-30 at 10:41 -0700, Joe Perches wrote:
>> > >
>> > > Maybe something like traces or chains.
>> > Or "taggers" or "tagged-bys"
>> I am afraid that you are way too l
Lars Schneider writes:
>> This part of the document is well-written to help filter-writers.
>
> Thanks!
Don't thank me; thank yourself and reviewers of the previous rounds.
> The filter can exit right after the "error-all". If the filter does
> not exit then Git will kill the filter. I'll add
Hey Junio,
On Tue, Aug 30, 2016 at 11:55 PM, Pranit Bauva wrote:
>
>>> @@ -729,7 +735,7 @@ static struct commit **get_bad_and_good_commits(int
>>> *rev_nr)
>>> return rev;
>>> }
>>>
>>> -static void handle_bad_merge_base(void)
>>> +static int handle_bad_merge_base(void)
>>> {
>>> i
Johannes Schindelin writes:
> @@ -811,13 +813,18 @@ static int populate_opts_cb(const char *key, const char
> *value, void *data)
> opts->allow_ff = git_config_bool_or_int(key, value,
> &error_flag);
> else if (!strcmp(key, "options.mainline"))
> opts->mainline
Jakub Narębski writes:
> In my personal opinion 'set_me_free_after_use' is not the best name,
> but I unfortunately do not have a better proposal. Maybe 'entrust_ptr',
> or 'entrusted_data' / 'entrusted_ptr' / 'entrusted'?
Is this to accumulate to-be-freed pointers?
I think we often call a loc
Hey Junio,
Sorry for a late replay.
On Fri, Aug 26, 2016 at 2:00 AM, Junio C Hamano wrote:
> Pranit Bauva writes:
>
>> A lot of parts of bisect.c uses exit() and these signals are then
>> trapped in the `bisect_start` function. Since the shell script ceases
>> its existence it would be necessar
On Tue, 2016-08-30 at 11:17 -0700, Junio C Hamano wrote:
> Joe Perches writes:
>
> >
> > On Tue, 2016-08-30 at 10:41 -0700, Joe Perches wrote:
> > >
> > > Maybe something like traces or chains.
> > Or "taggers" or "tagged-bys"
> I am afraid that you are way too late; the ship has already sailed
ryenus writes:
> For now the best use case I can think of is with git-reflog, e.g.,
> the meaning of `git reflog HEAD` and `git reflog feature-branch`
> are quite different, even if I'm currently on the feature-branch,
> especially when I want to track the rebase histories (if any).
"git reflog"
Hi Junio,
On Tue, 30 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> > +static char **read_author_script(void)
> >> > +{
> >> > +struct strbuf script = STRBUF_INIT;
> >> > +int i, count = 0;
> >> > +char *p, *p2, **env;
> >> > +size_t env_siz
Joe Perches writes:
> On Tue, 2016-08-30 at 10:41 -0700, Joe Perches wrote:
>> Maybe something like traces or chains.
>
> Or "taggers" or "tagged-bys"
I am afraid that you are way too late; the ship has already sailed a
few years ago, if not earlier, I think.
On 30 August 2016 at 03:49, Junio C Hamano wrote:
> Jacob Keller writes:
>
>>> What's wrong with simply using 'HEAD' for scripting?
>>
>> When you want to display the current branch to the user, e.g. when
>> scripting a shell prompt or similar use
>
> Wait. Even if a hypothetical version of Git
Hi Junio,
On Mon, 29 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > +static int require_clean_work_tree(const char *action, const char *hint,
> > + int gently)
> > {
> > struct lock_file *lock_file = xcalloc(1, sizeof(*lock_file));
> > - int do_die = 0;
> >
Uma Srinivasan writes:
> I think the following fix is still needed to is_submodule_modified():
>
> strbuf_addf(&buf, "%s/.git", path);
> git_dir = read_gitfile(buf.buf);
> if (!git_dir) {
> git_dir = buf.buf;
> ==> if (!is_git_directory(git_d
Hi Kuba,
On Tue, 30 Aug 2016, Jakub Narębski wrote:
> W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze:
>
> > The sequencer reads options from disk and stores them in its struct
> > for use during sequencer's operations.
> >
> > With this patch, the memory is released afterwards, plugging a
On Tue, 2016-08-30 at 10:41 -0700, Joe Perches wrote:
> Maybe something like traces or chains.
Or "taggers" or "tagged-bys"
Thanks for the patch. Unfortunately, it doesn't help in my case as it
invokes the is_submodule_modified() routine which you didn't modify.
Here's my call trace
#0 is_submodule_modified (path=path@entry=0x17c2f08 "groc", ignore_untracked=0)
at submodule.c:939
#1 0x004aa4dc in matc
On Tue, 2016-08-30 at 10:34 -0700, Junio C Hamano wrote:
> Joe Perches writes:
> > On Tue, 2016-08-30 at 09:54 -0700, Junio C Hamano wrote:
> > >
> > > Support for more generic footers was supposed to come when the
> > > "interpret-trailers" topic started, but the author of the topic
> > > seems
Hi Kuba,
On Tue, 30 Aug 2016, Jakub Narębski wrote:
> W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze:
>
> > Over the next commits, we will work on improving the sequencer to the
> > point where it can process the edit script of an interactive rebase. To
> > that end, we will need to teach
Joe Perches writes:
> On Tue, 2016-08-30 at 09:54 -0700, Junio C Hamano wrote:
>> Support for more generic footers was supposed to come when the
>> "interpret-trailers" topic started, but the author of the topic
>> seems to have lost interest before the mechanism has become ready to
>> be integra
Joe Perches writes:
> (adding lkml)
>
> On Tue, 2016-08-30 at 09:54 -0700, Junio C Hamano wrote:
>> Joe Perches writes:
>> > git-am -s will avoid duplicating the last signature
>> > in a patch.
>> >
>> > But given a developer creates a patch, send it around for
>> > acks/other signoffs, collect
Johannes Schindelin writes:
>> > +static char **read_author_script(void)
>> > +{
>> > + struct strbuf script = STRBUF_INIT;
>> > + int i, count = 0;
>> > + char *p, *p2, **env;
>> > + size_t env_size;
>> > +
>> > + if (strbuf_read_file(&script, rebase_path_author_script(), 256) <= 0)
>> > +
On Tue, 2016-08-30 at 09:54 -0700, Junio C Hamano wrote:
> Support for more generic footers was supposed to come when the
> "interpret-trailers" topic started, but the author of the topic
> seems to have lost interest before the mechanism has become ready to
> be integrated in the workflow commands
Johannes Schindelin writes:
>> With the current set of callers, a caller that notices an error from
>> this function will immediately exit without doing any further
>> damage.
>>
>> So in that sense, this is a "safe" conversion.
>>
>> But is it a sensible conversion? When the caller wants to d
Johannes Schindelin writes:
> I still think that it is a serious mistake for library functions to die().
> But I have no time to take care of git_parse_source() right now.
I think we already agreed on both points during the previous round
of review ;-)
(adding lkml)
On Tue, 2016-08-30 at 09:54 -0700, Junio C Hamano wrote:
> Joe Perches writes:
> > git-am -s will avoid duplicating the last signature
> > in a patch.
> >
> > But given a developer creates a patch, send it around for
> > acks/other signoffs, collects signatures and then does
> > a
Lars Schneider writes:
> True, but applying rot13 (via tr ...) on 20+ MB takes quite a bit of
> time. That's why I came up with the 1M SP in between.
Ah, OK, that makes sense (it may not necessarily make it a good
decision, but it certainly explains it).
> However, I realized that testing a lar
Joe Perches writes:
> git-am -s will avoid duplicating the last signature
> in a patch.
>
> But given a developer creates a patch, send it around for
> acks/other signoffs, collects signatures and then does
> a git am -s on a different branch, this sort of sign-off
> chain is possible:
>
>
On Tue, Aug 30, 2016 at 01:41:59PM +0200, Lars Schneider wrote:
> >> + git checkout -- test test.t test.i &&
> >> +
> >> + mkdir generated-test-data &&
> >> + for i in $(test_seq 1 $T0021_LARGE_FILE_SIZE)
> >> + do
> >> + RANDOM_STRING="$(test-genrandom end $i | tr -dc "A-Za-z0-9" )"
> On 30 Aug 2016, at 00:21, Junio C Hamano wrote:
>
> larsxschnei...@gmail.com writes:
>
>> +In case the filter cannot or does not want to process the content,
>> +it is expected to respond with an "error" status. Depending on the
>> +`filter..required` flag Git will interpret that as error
>>
Johannes Schindelin writes:
>> > Scatch that. That would not work in a freshly created repository
>> > before doing any "git add". An empty index is a normal state,...
>
> Alas, that does not work, either. If no .git/index exists, read_index()
> will not set the "initialized" flag.
Exactly
git-am -s will avoid duplicating the last signature
in a patch.
But given a developer creates a patch, send it around for
acks/other signoffs, collects signatures and then does
a git am -s on a different branch, this sort of sign-off
chain is possible:
Signed-off-by: Original Developer
W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze:
> Over the next commits, we will work on improving the sequencer to the
> point where it can process the edit script of an interactive rebase. To
> that end, we will need to teach the sequencer to read interactive
> rebase's todo file. In prepa
>
> diff --git a/sha1_file.c b/sha1_file.c
> index d5e1121..759991e 100644
> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -1485,7 +1485,7 @@ int check_sha1_signature(const unsigned char *sha1,
> void *map,
>
> int git_open_noatime(const char *name)
Hm, should the function then be renamed into
W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze:
> The sequencer reads options from disk and stores them in its struct
> for use during sequencer's operations.
>
> With this patch, the memory is released afterwards, plugging a
> memory leak.
>
> Signed-off-by: Johannes Schindelin
> ---
>
Hi Junio,
On Tue, 30 Aug 2016, Johannes Schindelin wrote:
> On Mon, 29 Aug 2016, Junio C Hamano wrote:
>
> > Junio C Hamano writes:
> >
> > > I am not sure if it should be left as the responsibility of the
> > > caller (i.e. check the_index.initialized to bark at a caller that
> > > forgets to
Duy Nguyen venit, vidit, dixit 30.08.2016 15:10:
> I want to see a "git log --oneline --graph" with all non-merge commits
> removed, but history is rewritten so that the merge commits represent
> the entire topics and are shown to have all the parents of the base
> commits. e.g. if the full graph i
Signed-off-by: Brian Henderson
---
contrib/diff-highlight/diff-highlight| 19 +--
contrib/diff-highlight/t/t9400-diff-highlight.sh | 2 +-
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/contrib/diff-highlight/diff-highlight
b/contrib/diff-highlight/d
On Mon, Aug 29, 2016 at 02:37:46PM -0700, Junio C Hamano wrote:
> Brian Henderson writes:
>
> > How does this look?
> >
> > Drawing the graph helped me a lot in figuring out what I was
> > actually testing. thanks!
>
> Yeah, I also am pleased to see the picture of what is being tested
> in the tes
Signed-off-by: Brian Henderson
---
contrib/diff-highlight/t/t9400-diff-highlight.sh | 60
1 file changed, 60 insertions(+)
diff --git a/contrib/diff-highlight/t/t9400-diff-highlight.sh
b/contrib/diff-highlight/t/t9400-diff-highlight.sh
index 7c303f7..54e11fe 100755
---
Signed-off-by: Brian Henderson
---
contrib/diff-highlight/Makefile | 5 +
contrib/diff-highlight/t/Makefile| 22 +++
contrib/diff-highlight/t/t9400-diff-highlight.sh | 163 +++
3 files changed, 190 insertions(+)
create mode 100644 contrib/d
I want to see a "git log --oneline --graph" with all non-merge commits
removed, but history is rewritten so that the merge commits represent
the entire topics and are shown to have all the parents of the base
commits. e.g. if the full graph is
* 8118403 Merge commit 'bbb2437'
|\
| * bbb2437 3p
|
> On 29 Aug 2016, at 21:45, Junio C Hamano wrote:
>
> Lars Schneider writes:
>
>> I see. Thanks for the explanation.
>
> I expect the updated log message to explain the issue correctly
> then.
Sure!
>>> The parent is
>>> very likely to have pack windows open into .pack files and they need
> On 29 Aug 2016, at 19:52, Junio C Hamano wrote:
>
> Lars Schneider writes:
>
>>> On 25 Aug 2016, at 21:17, Stefan Beller wrote:
>>>
On Thu, Aug 25, 2016 at 4:07 AM, wrote:
From: Lars Schneider
Generate more interesting large test files
>>>
>>> How are the large tes
Hello,
I found a curious bug in git version 2.9.0.windows.1 (run on Windows 7
via git bash).
If I clone a repository containing submodules and run a "git submodule
deinit" on any of the submodules of this repository without executing
another git command, this command fails.
For instance:
(let's
> On 29 Aug 2016, at 19:46, Junio C Hamano wrote:
>
> larsxschnei...@gmail.com writes:
>
>> diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
>> index 7b45136..34c8eb9 100755
>> --- a/t/t0021-conversion.sh
>> +++ b/t/t0021-conversion.sh
>> @@ -4,6 +4,15 @@ test_description='blob conver
Hello Johannes,
W dniu 30.08.2016 o 09:29, Johannes Schindelin pisze:
> On Mon, 29 Aug 2016, Jakub Narębski wrote:
>> W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze:
>>> +void *sequencer_entrust(struct replay_opts *opts, void
>>> *set_me_free_after_use)
>>> +{
>>> + ALLOC_GROW(opts->own
Hi Junio,
On Mon, 29 Aug 2016, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > I am not sure if it should be left as the responsibility of the
> > caller (i.e. check the_index.initialized to bark at a caller that
> > forgets to read from an index) ...
>
> Scatch that. That would not work
Hi Junio,
On Mon, 29 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > The function would otherwise pretend to work fine, but totally ignore
> > the working directory.
>
> s/^T/Unless the caller has already read the index, t/;
Changed. (I also removed the "otherwise" which w
W dniu 29.08.2016 o 23:31, Jeff King pisze:
> Blame-tree is a GitHub-specific command (it feeds the main repository
> view page), and is a known CPU hog. There's more clever caching for that
> coming down the pipe, but it's not shipped yet.
I wonder if having support for 'git blame ' in Git core
Hi Junio,
On Mon, 29 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > strbuf_addf(&buf, "%s\n", head);
> > if (write_in_full(fd, buf.buf, buf.len) < 0)
> > - die_errno(_("Could not write to %s"), git_path_head_file());
> > + return error_errno(_("C
Hi Junio,
On Mon, 29 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Instead of dying there, let the caller high up in the callchain notice
> > the error and handle it (by dying, still).
> >
> > The only caller of read_populate_opts(), sequencer_continue() can
> > already re
Hi Junio,
On Mon, 29 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Instead of dying there, let the caller high up in the callchain
> > notice the error and handle it (by dying, still).
> >
> > There are two call sites of read_and_refresh_cache(), one of which is
> > pick_c
On Mon, Aug 29, 2016 at 9:04 PM, Junio C Hamano wrote:
> Christian Couder writes:
>
>> Highlevel view of the patches in the series
>> ~~~
>>
>> This is "part 3" of the full patch series. I am resending only the
>> last 14 patches of the full series as "part
Hello,
I'm missing `git subtree split` functionality for the case when prefix
is a single file. Looking at git-subtree, pretty few changes are needed
to handle this. The attached patch works for me in the common case
(no rejoins). As such, I'm looking for comments :)
Signed-off-by: Ivan Shapovalo
On Mon, Aug 29, 2016 at 03:46:05PM +0200, Johannes Schindelin wrote:
> Note that we need to be careful to inspect only the *newest* entries in
> test-results/: this directory contains files of the form
> t--.counts and is only removed wholesale when running the
> *entire* test suite, not when
On Mon, Aug 29, 2016 at 10:33:44AM -0700, Brian Henderson wrote:
> How does this look?
>
> Drawing the graph helped me a lot in figuring out what I was actually
> testing. thanks!
>
> Brian Henderson (3):
> diff-highlight: add some tests.
> diff-highlight: add failing test for handling --gr
Hi Junio,
On Mon, 29 Aug 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Instead of dying there, let the caller high up in the callchain
> > notice the error and handle it (by dying, still).
> >
> > The only caller of write_message(), do_pick_commit() already checks
> > the retu
Hi Hannes,
On Tue, 30 Aug 2016, Johannes Sixt wrote:
> Am 29.08.2016 um 23:59 schrieb Jakub Narębski:
> > W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze:
> > > -#define REPLAY_OPTS_INIT { -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL,
> > > NULL, NULL, 0, 0, NULL }
> > > +#define REPLAY_OPTS_I
Hi Kuba,
On Mon, 29 Aug 2016, Jakub Narębski wrote:
> W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze:
>
> > The sequencer is our attempt to lib-ify cherry-pick. Yet it behaves
> > like a one-shot command when it reads its configuration: memory is
> > allocated and released only when the co
91 matches
Mail list logo
