2018-01-30 23:49 GMT+03:00 Junio C Hamano :
> Оля Тележная writes:
>
>>> one place improves readability. If better readability is the
>>> purpose, I would even say
>>>
>>> for (i = 0; i < used_atom_cnt; i++) {
>>> if (...)
>>> - goto need_obj;
>>> +
> +static void free_commit_graph(struct commit_graph **g)
> +{
> + if (!g || !*g)
> + return;
> +
> + close_commit_graph(*g);
> +
> + free(*g);
> + *g = NULL;
nit: You may want to use FREE_AND_NULL(*g) instead.
On Tue, Jan 30, 2018 at 1:39 PM, Derrick Stolee wrote:
> Add Documentation/technical/commit-graph.txt with details of the planned
> commit graph feature, including future plans.
>
> Signed-off-by: Derrick Stolee
> ---
> Documentation/technical/commit-graph.txt | 189
> ++
Hello,
A regression in 2.3.1 (and 2.3.2) related with the detection of busy loops has
been revisited in version 2.3.3.
Release notes
-
Bug fixes:
- Revert "Handle \n like \r (#758)". (GH #769)
- Fix GH #164 by catching SIGHUP.
- Change `refs_tags` type to `size_t`.
Change summar
On Wed, Jan 31, 2018 at 7:57 AM, Stefan Beller wrote:
>> There's also C99 designator in builtin/clean.c (I thought we avoided
>> C99, I can start using this specific feature more now :D)
>
> That was a test balloon? See 512f41cfac
> (clean.c: use designated initializer, 2017-07-14)
Aww.. I though
On Sun, Jan 28, 2018 at 9:06 AM, brian m. carlson
wrote:
> This series wires up an alternate hash implementation, namely
> BLAKE2b-160. The goal is to allow us to identify tests which rely on
> the hash algorithm in use so that we can fix those tests.
>
> For this test, I picked BLAKE2b-160 for a
On Tue, Jan 30, 2018 at 4:48 PM, Duy Nguyen wrote:
> On Wed, Jan 31, 2018 at 6:01 AM, Stefan Beller wrote:
>> On Tue, Jan 30, 2018 at 2:36 PM, Junio C Hamano wrote:
>>> Duy Nguyen writes:
>>>
Is it simpler (though hacky) to just do
#ifdef __cplusplus
#define new not_new
>>>
On Wed, Jan 31, 2018 at 6:01 AM, Stefan Beller wrote:
> On Tue, Jan 30, 2018 at 2:36 PM, Junio C Hamano wrote:
>> Duy Nguyen writes:
>>
>>> Is it simpler (though hacky) to just do
>>>
>>> #ifdef __cplusplus
>>> #define new not_new
>>> #define try really_try
>>> ...
>>>
>>> somewhere in git-comp
Signed-off-by: Elijah Newren
---
merge-recursive.c | 42 +++--
t/t6043-merge-rename-directories.sh | 6 +++---
2 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 7c78dc2dc1..39e161e094 1006
I want to re-use some other functions in the file without moving those
other functions or dealing with a handful of annoying split function
declarations and definitions.
Signed-off-by: Elijah Newren
---
merge-recursive.c | 139 +++---
1 file change
I came up with the testcases in the first eight sections before coding up
the implementation. The testcases in this section were mostly ones I
thought of while coding/debugging, and which I was too lazy to insert
into the previous sections because I didn't want to re-label with all the
testcase re
Signed-off-by: Elijah Newren
---
t/t6043-merge-rename-directories.sh | 396
1 file changed, 396 insertions(+)
diff --git a/t/t6043-merge-rename-directories.sh
b/t/t6043-merge-rename-directories.sh
index fbeb8f4316..68bd86f555 100755
--- a/t/t6043-merge-renam
Signed-off-by: Elijah Newren
---
t/t6043-merge-rename-directories.sh | 404
1 file changed, 404 insertions(+)
diff --git a/t/t6043-merge-rename-directories.sh
b/t/t6043-merge-rename-directories.sh
index 68bd86f555..e2db5d0ac1 100755
--- a/t/t6043-merge-renam
This fixes an issue that existed before my directory rename detection
patches that affects both normal renames and renames implied by
directory rename detection. Additional codepaths that only affect
overwriting of directy files that are involved in directory rename
detection will be added in a su
Signed-off-by: Elijah Newren
---
t/t6043-merge-rename-directories.sh | 153
1 file changed, 153 insertions(+)
diff --git a/t/t6043-merge-rename-directories.sh
b/t/t6043-merge-rename-directories.sh
index b22a9052b3..8049ed5fc9 100755
--- a/t/t6043-merge-renam
Add a testcase showing spurious rename/rename(1to2) conflicts occurring
due to directory rename detection.
Also add a pair of testcases dealing with moving directory hierarchies
around that were suggested by Stefan Beller as "food for thought" during
his review of an earlier patch series, but whic
This just adds dir_rename_entry and the associated functions; code using
these will be added in subsequent commits.
Signed-off-by: Elijah Newren
---
merge-recursive.c | 35 +++
merge-recursive.h | 8
2 files changed, 43 insertions(+)
diff --git a/merge-
Directory renames with the ability to merge directories opens up the
possibility of add/add/add/.../add conflicts, if each of the N
directories being merged into one target directory all had a file with
the same name. We need a way to check for and report on such
collisions; this hashmap will be u
Signed-off-by: Elijah Newren
---
t/t6043-merge-rename-directories.sh | 442
1 file changed, 442 insertions(+)
create mode 100755 t/t6043-merge-rename-directories.sh
diff --git a/t/t6043-merge-rename-directories.sh
b/t/t6043-merge-rename-directories.sh
new f
The amount of logic in merge_trees() relative to renames was just a few
lines, but split it out into new handle_renames() and cleanup_renames()
functions to prepare for additional logic to be added to each. No code or
logic changes, just a new place to put stuff for when the rename detection
gains
Signed-off-by: Elijah Newren
---
t/t6043-merge-rename-directories.sh | 143
1 file changed, 143 insertions(+)
diff --git a/t/t6043-merge-rename-directories.sh
b/t/t6043-merge-rename-directories.sh
index d045f0e31e..b22a9052b3 100755
--- a/t/t6043-merge-renam
Signed-off-by: Elijah Newren
---
t/t6043-merge-rename-directories.sh | 107
1 file changed, 107 insertions(+)
diff --git a/t/t6043-merge-rename-directories.sh
b/t/t6043-merge-rename-directories.sh
index 8049ed5fc9..f0213f2bbd 100755
--- a/t/t6043-merge-renam
This populates a list of directory renames for us. The list of
directory renames is not yet used, but will be in subsequent commits.
Signed-off-by: Elijah Newren
---
merge-recursive.c | 155 --
1 file changed, 152 insertions(+), 3 deletions(-)
In anticipation of more involved cleanup to come, make a helper function
for doing the cleanup at the end of handle_renames. Rename the already
existing cleanup_rename[s]() to final_cleanup_rename[s](), name the new
helper initial_cleanup_rename(), and leave the big comment in the code
about why w
This patchset introduces directory rename detection to merge-recursive. See
https://public-inbox.org/git/20171110190550.27059-1-new...@gmail.com/
for the first series (including design considerations, etc.), and follow-up
series can be found at
https://public-inbox.org/git/20171120220209.15111
Signed-off-by: Elijah Newren
---
t/t6043-merge-rename-directories.sh | 458
1 file changed, 458 insertions(+)
diff --git a/t/t6043-merge-rename-directories.sh
b/t/t6043-merge-rename-directories.sh
index aa9af49edc..fbac664408 100755
--- a/t/t6043-merge-renam
This commit hooks together all the directory rename logic by making the
necessary changes to the rename struct, it's dst_entry, and the
diff_filepair under consideration.
Signed-off-by: Elijah Newren
---
merge-recursive.c | 187 +++-
t/t6043-merg
When a file is present in HEAD before the merge and the other side of the
merge does not modify that file, we try to avoid re-writing the file and
making it stat-dirty. However, when a file is present in HEAD before the
merge and was in a directory that was renamed by the other side of the
merge,
Before trying to apply directory renames to paths within the given
directories, we want to make sure that there aren't conflicts at the
file level either. If there aren't any, then get the new name from
any directory renames.
Signed-off-by: Elijah Newren
---
merge-recursive.c
directory renaming and merging can cause one or more files to be moved to
where an existing file is, or to cause several files to all be moved to
the same (otherwise vacant) location. Add checking and reporting for such
cases, falling back to no-directory-rename handling for such paths.
Signed-of
If a file on one side of history was renamed, and merely modified on the
other side, then applying a directory rename to the modified side gives us
a rename/rename(1to2) conflict. We should only apply directory renames to
pairs representing either adds or renames.
Making this change means that a
Before trying to apply directory renames to paths within the given
directories, we want to make sure that there aren't conflicts at the
directory level. There will be additional checks at the individual
file level too, which will be added later.
Signed-off-by: Elijah Newren
---
merge-recursive.
get_renames() has always zero'ed out diff_queued_diff.nr while only
manually free'ing diff_filepairs that did not correspond to renames.
Further, it allocated struct renames that were tucked away in the
return string_list. Make sure all of these are deallocated when we
are done with them.
Signed-
Create a new function, get_diffpairs() to compute the diff_filepairs
between two trees. While these are currently only used in
get_renames(), I want them to be available to some new functions. No
actual logic changes yet.
Signed-off-by: Elijah Newren
---
merge-recursive.c | 86
Previously, if !o->detect_rename then get_renames() would return an
empty string_list, and then process_renames() would have nothing to
iterate over. It seems more straightforward to simply avoid calling
either function in that case.
Signed-off-by: Elijah Newren
---
merge-recursive.c | 11 +
get_renames() would look up stage data that already existed (populated
in get_unmerged(), taken from whatever unpack_trees() created), and if
it didn't exist, would call insert_stage_data() to create the necessary
entry for the given file. The insert_stage_data() fallback becomes
much more importa
Signed-off-by: Elijah Newren
---
t/t6043-merge-rename-directories.sh | 367
1 file changed, 367 insertions(+)
diff --git a/t/t6043-merge-rename-directories.sh
b/t/t6043-merge-rename-directories.sh
index b730256653..aa9af49edc 100755
--- a/t/t6043-merge-renam
Signed-off-by: Elijah Newren
---
merge-recursive.c | 26 +++---
t/t6043-merge-rename-directories.sh | 8
2 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index fba1a0d207..62e4266d21 100644
--- a/
Signed-off-by: Elijah Newren
---
t/t6043-merge-rename-directories.sh | 336
1 file changed, 336 insertions(+)
diff --git a/t/t6043-merge-rename-directories.sh
b/t/t6043-merge-rename-directories.sh
index ac9c3e9974..fbeb8f4316 100755
--- a/t/t6043-merge-renam
Signed-off-by: Elijah Newren
---
t/t6043-merge-rename-directories.sh | 330
1 file changed, 330 insertions(+)
diff --git a/t/t6043-merge-rename-directories.sh
b/t/t6043-merge-rename-directories.sh
index f0213f2bbd..ac9c3e9974 100755
--- a/t/t6043-merge-renam
On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote:
> This patchset introduces directory rename detection to merge-recursive. See
And a meta question: Should I be trying to submit this feature some other way?
I've really appreciated all the reviews[1], and the testcases are
undoubtedly better
On Tue, Jan 30, 2018 at 1:56 PM, Stefan Beller wrote:
> The assume-unchanged bit is a performance optimisation for powerusers,
> but its documentation words it in a less dangerous way, such that it sounds
> as if it is a UX feature instead of a performance thing. I'd stay away from
> that know.
>
On Tue, Jan 30, 2018 at 6:24 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>> There has not been feedback for a while on this thread.
>> I think that is because subtrees are not in anyone's hot
>> interest area currently.
>>
>> This is definitely the right place to submit&discuss bugs.
>> Loo
Stefan Beller writes:
> There has not been feedback for a while on this thread.
> I think that is because subtrees are not in anyone's hot
> interest area currently.
>
> This is definitely the right place to submit&discuss bugs.
> Looking through "git log --format="%ae %s" -S subtree",
> it seems
Stefan Beller writes:
> On Mon, Jan 29, 2018 at 2:37 PM, Brandon Williams wrote:
>> Rename C++ keyword in order to bring the codebase closer to being able
>> to be compiled with a C++ compiler.
>>
>> Signed-off-by: Brandon Williams
>> ---
>> builtin/replace.c | 16
>> 1 file c
On Tue, Jan 30, 2018 at 11:15 AM, Stephen R Guglielmo
wrote:
> Hi, just following up on this bug report. I have not heard back. Is
> there additional information that's needed? Is there a better place to
> file bug reports?
>
> Additionally, I have confirmed that this bug still exists with git
> v
On Tue, Jan 30 2018, Ben Peart jotted:
> While some of these issues have been discussed in other threads, I
> thought I'd summarize my thoughts here.
Thanks for this & your other reply. I'm going to get to testing some of
Duy's patches soon, and if you have some other relevant WIP I'd be happy
t
On Tue, Jan 30, 2018 at 2:36 PM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> Is it simpler (though hacky) to just do
>>
>> #ifdef __cplusplus
>> #define new not_new
>> #define try really_try
>> ...
>>
>> somewhere in git-compat-util.h?
>
> Very tempting, especially given that your approach a
On Mon, Jan 29, 2018 at 2:37 PM, Brandon Williams wrote:
> Rename C++ keyword in order to bring the codebase closer to being able
> to be compiled with a C++ compiler.
>
> Signed-off-by: Brandon Williams
> ---
> builtin/replace.c | 16
> 1 file changed, 8 insertions(+), 8 deleti
While some of these issues have been discussed in other threads, I
thought I'd summarize my thoughts here.
On 1/26/2018 7:28 PM, Ævar Arnfjörð Bjarmason wrote:
I just got around to testing this since it landed, for context some
previous poking of mine in [1].
Issues / stuff I've noticed:
1) W
On 1/27/2018 2:01 PM, Ævar Arnfjörð Bjarmason wrote:
On Sat, Jan 27 2018, Duy Nguyen jotted:
On Sat, Jan 27, 2018 at 07:39:27PM +0700, Duy Nguyen wrote:
On Sat, Jan 27, 2018 at 6:43 PM, Ævar Arnfjörð Bjarmason
wrote:
a) no fsmonitor
$ time GIT_TRACE_PERFORMANCE=1 ~/g/git/git-status
Duy Nguyen writes:
> Is it simpler (though hacky) to just do
>
> #ifdef __cplusplus
> #define new not_new
> #define try really_try
> ...
>
> somewhere in git-compat-util.h?
Very tempting, especially given that your approach automatically
would cover topics in flight without any merge conflict ;
On Sun, Jan 28, 2018 at 7:46 AM, 牛旭 wrote:
> Our team studies the consistent edits of git during evolution. And we find
> several missed edits in the latest release of git. For example, there are two
> consist edits we have figured out from historical commits:
Thanks for studying the code of Gi
On Tue, Jan 30, 2018 at 7:42 AM, FIGADERE, LAURENT
wrote:
> Dear git,
>
> I use since few weeks now git 2.15.1.
>
> I did few trials but please find here my outputs.
>
> To reproduce:
> Use a top module git which include a submodule
> First step: from a work area, I changed selected version of sub
Lars Schneider writes:
>> On 30 Jan 2018, at 21:05, Junio C Hamano wrote:
>>
>> tbo...@web.de writes:
>>
>>> + if ((conv_flags & CONV_WRITE_OBJECT) && !strcmp(enc->name,
>>> "SHIFT-JIS")) {
>>> + char *re_src;
>>> + int re_src_len;
>>
>> I think it is a bad idea to
>>
On Tue, Jan 30, 2018 at 12:25 PM, Michael Scott-Nelson
wrote:
> Giving a submodule "ignore=all" or "ignore=dirty" in .gitmodule
> successfully removes that module from `git status` queries. However,
> these same diffs are automatically added by git-add, eg `git add .` or
> `git add --all` adds the
Lars Schneider writes:
> "false". Therefore, "is_missing_required_utf_bom()" might be
> lengthy but should fit.
Thanks, sounds understandable a lot better than the original ;-)
On Tue, Jan 30, 2018 at 1:39 PM, Derrick Stolee wrote:
> Thanks to everyone who gave comments on v1. I tried my best to respond to
> all of the feedback, but may have missed some while I was doing several
> renames, including:
>
> * builtin/graph.c -> builtin/commit-graph.c
> * packed-graph.[c|h]
Teach Git to write a commit graph file by checking all packed objects
to see if they are commits, then store the file in the given pack
directory.
Signed-off-by: Derrick Stolee
---
Makefile | 1 +
commit-graph.c | 376 +
commit-grap
The commit graph feature is controlled by the new core.commitgraph config
setting. This defaults to 0, so the feature is opt-in.
The intention of core.commitgraph is that a user can always stop checking
for or parsing commit graph files if core.commitgraph=0.
Signed-off-by: Derrick Stolee
---
D
Add Documentation/technical/commit-graph.txt with details of the planned
commit graph feature, including future plans.
Signed-off-by: Derrick Stolee
---
Documentation/technical/commit-graph.txt | 189 +++
1 file changed, 189 insertions(+)
create mode 100644 Documenta
Teach git-commit-graph to inspect the objects only in a certain list
of pack-indexes within the given pack directory. This allows updating
the commit graph iteratively, since we add all commits stored in a
previous commit graph.
Signed-off-by: Derrick Stolee
---
Documentation/git-commit-graph.tx
Teach git-commit-graph to delete the graph previously referenced by 'graph_head'
when writing a new graph file and updating 'graph_head'. This prevents
data creep by storing a list of useless graphs. Be careful to not delete
the graph if the file did not change.
Signed-off-by: Derrick Stolee
---
Teach git-commit-graph to write graph files. Create new test script to verify
this command succeeds without failure.
Signed-off-by: Derrick Stolee
---
Documentation/git-commit-graph.txt | 18 +++
builtin/commit-graph.c | 30
t/t5318-commit-graph.sh| 96 ++
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.
Signed-off-by: Derrick Stolee
---
Documentation/
Teach construct_commit_graph() to walk all parents from the commits
discovered in packfiles. This prevents gaps given by loose objects or
previously-missed packfiles.
Signed-off-by: Derrick Stolee
---
commit-graph.c | 26 ++
t/t5318-commit-graph.sh | 14 +
Teach git-commit-graph to read commits from stdin when the
--stdin-commits flag is specified. Commits reachable from these
commits are added to the graph. This is a much faster way to construct
the graph than inspecting all packed objects, but is restricted to
known tips.
For the Linux repository,
Teach git-commit-graph to read commit graph files and summarize their contents.
Use the --read option to verify the contents of a commit graph file in the
tests.
Signed-off-by: Derrick Stolee
---
Documentation/git-commit-graph.txt | 7 ++
builtin/commit-graph.c | 55 +
Teach Git to delete the current 'graph_head' file and the commit graph
it references. This is a good safety valve if somehow the file is
corrupted and needs to be recalculated. Since the commit graph is a
summary of contents already in the ODB, it can be regenerated.
Signed-off-by: Derrick Stolee
Teach git the 'commit-graph' builtin that will be used for writing and
reading packed graph files. The current implementation is mostly
empty, except for a '--pack-dir' option.
Signed-off-by: Derrick Stolee
---
.gitignore | 1 +
Documentation/git-commit-graph.txt | 7 ++
Add document specifying the binary format for commit graphs. This
format allows for:
* New versions.
* New hash functions and hash lengths.
* Optional extensions.
Basic header information is followed by a binary table of contents
into "chunks" that include:
* An ordered list of commit object IDs
Teach Git to inspect a commit graph file to supply the contents of a
struct commit when calling parse_commit_gently(). This implementation
satisfies all post-conditions on the struct commit, including loading
parents, the root tree, and the commit date. The only loosely-expected
condition is that t
Thanks to everyone who gave comments on v1. I tried my best to respond to
all of the feedback, but may have missed some while I was doing several
renames, including:
* builtin/graph.c -> builtin/commit-graph.c
* packed-graph.[c|h] -> commit-graph.[c|h]
* t/t5319-graph.sh -> t/t5318-commit-graph.sh
Johannes Schindelin writes:
> Changes since v1:
>
> - reintroduced "sequencer: make refs generated by the `label` command
> worktree-local" (which was squashed into "sequencer: handle autosquash
> and post-rewrite for merge commands" by accident)
Good.
> - got rid of the universally-hated `
Add an EXPENSIVE_ON_WINDOWS prerequisite to mark those tests which are
very expensive to run on Windows, but cheap elsewhere.
Certain tests that heavily stress the filesystem or run a lot of shell
commands are disproportionately expensive on Windows, this
prerequisite will later be used by a tests
There has never been any full roundtrip testing of what git-ls-files
and other commands that use wildmatch() actually do, rather we've been
satisfied with just testing the underlying C function.
Due to git-ls-files and friends having their own codepaths before they
call wildmatch() there's sometim
Mark the newly added test which creates test files on-disk as
EXPENSIVE_ON_WINDOWS. According to [1] it takes almost ten minutes to
run this test file on Windows after this recent change, but just a few
seconds on Linux as noted in my [2].
This could be done faster by exiting earlier, however by u
Rewrite the wildmatch() test suite so that each test now tests all
combinations of the wildmatch() WM_CASEFOLD and WM_PATHNAME flags.
Before this change some test inputs were not tested on
e.g. WM_PATHNAME. Now the function is stress tested on all possible
inputs, and for each input we declare wha
Remove the unused fnmatch() test parameter from the wildmatch
test. The code that used to test this was removed in 70a8fc999d ("stop
using fnmatch (either native or compat)", 2014-02-15).
As a --word-diff shows the only change to the body of the tests is the
removal of the second out of four param
Use of ! should be reserved for non-git programs that are assumed not
to fail, see README. With this change only
t/t0110-urlmatch-normalization.sh is still using this anti-pattern.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t3070-wildmatch.sh | 6 +++---
1 file changed, 3 insertions(+), 3 dele
Use a pattern from the nul_match() function in t7008-grep-binary.sh to
make sure that we don't just fall through to the "else" if there's an
unknown parameter.
This is something I added in commit 77f6f4406f ("grep: add a test
helper function for less verbose -f \0 tests", 2017-05-20) to grep
tests
Change the wildmatch test to use more standard shell style, usually we
use "if test" not "if [".
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t3070-wildmatch.sh | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/t/t3070-wildmatch.sh b/t/t3070-wildmatch.sh
index 27fa878f
Replace the 4-width mixed space & tab indentation in this file with
indentation with tabs as we do in most of the rest of our tests.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t3070-wildmatch.sh | 54 ++--
1 file changed, 27 insertions(+), 27 del
Don't try to vertically align the test output, which is futile anyway
under the TAP output where we're going to be emitting a number for
each test without aligning the test count.
This makes subsequent changes of mine where I'm not going to be
aligning this output as I add new tests easier.
Signe
v5 has been a long time coming (20 days since I said I'd re-roll
this), but hopefully this is a version that works well for everyone,
including Windows users. Changes:
Ævar Arnfjörð Bjarmason (10):
wildmatch test: indent with tabs, not spaces
wildmatch test: use more standard shell style
wil
Eric Wong writes:
> Todd Zullinger wrote:
>> I'm running the tests with and without your patch as well.
>> So far I've run t9128 300 times with the patch and no
>> failures. Without it, it's failed 3 times in only a few
>> dozen runs. That's promising.
>
> Thanks for confirming it works on oth
Todd Zullinger writes:
> When 'git show' is called without any object it defaults to HEAD. This
> has been true since d4ed9793fd ("Simplify common default options setup
> for built-in log family.", 2006-04-16).
>
> The SYNOPSIS suggests that the object argument is required. Clarify
> that it is
"brian m. carlson" writes:
> This series wires up an alternate hash implementation, namely
> BLAKE2b-160. The goal is to allow us to identify tests which rely on
> the hash algorithm in use so that we can fix those tests.
Yay.
> Provoking discussion of which hash to pick for NewHash is explici
> On 30 Jan 2018, at 20:15, Junio C Hamano wrote:
>
> tbo...@web.de writes:
>
>> From: Lars Schneider
>>
>> If the endianness is not defined in the encoding name, then let's
>> be strict and require a BOM to avoid any encoding confusion. The
>> has_missing_utf_bom() function returns true if a
Am 29.01.2018 um 23:36 schrieb Brandon Williams:
A while back there was some discussion of getting our codebase into a state
where we could use a c++ compiler if we wanted to (for various reason like
leveraging c++ only analysis tools, etc.). Johannes Sixt had a very large
patch that achieved th
Jeff King writes:
> Putting code in master is OK; we can always refactor it. But once we
> add and document a user-facing config option like this, we have to
> support it forever. So that's really the step I was wondering about: are
> we sure this is what the user-facing config is going to look l
Оля Тележная writes:
>> one place improves readability. If better readability is the
>> purpose, I would even say
>>
>> for (i = 0; i < used_atom_cnt; i++) {
>> if (...)
>> - goto need_obj;
>> + break;
>> }
>> -
Theodore Ts'o writes:
> If there is a From: header in the beginning of the mail body, it is
> used as the Author instead of the From: header in the mail header. It
> would make sense if there is a Date: header in the beginning of the
> mail body, it should be used instead of Date: field in the m
Michal Suchánek writes:
> git send-email sets the message date to author date.
>
> This is wrong because the message will most likely not get delivered
> when the author date differs from current time. It might give slightly
> better results with commit date instead of author date but can't is
>
On Mon, Jan 29, 2018 at 11:34 AM, Prathamesh Chavan wrote:
> Following series of patches focuses on porting submodule subcommand
> git-foreach from shell to C.
> An initial attempt for porting was introduced about 9 months back,
> and since then then patches have undergone many changes. Some of th
> On 30 Jan 2018, at 21:05, Junio C Hamano wrote:
>
> tbo...@web.de writes:
>
>> +if ((conv_flags & CONV_WRITE_OBJECT) && !strcmp(enc->name,
>> "SHIFT-JIS")) {
>> +char *re_src;
>> +int re_src_len;
>
> I think it is a bad idea to
>
> (1) not check without CONV_WR
Giving a submodule "ignore=all" or "ignore=dirty" in .gitmodule
successfully removes that module from `git status` queries. However,
these same diffs are automatically added by git-add, eg `git add .` or
`git add --all` adds the submodules that we want ignored. This seems
inconsistent and confusing
Johannes Schindelin writes:
> The pseudo ref certainly has an appeal. For people very familiar with
> Git's peculiarities such as FETCH_HEAD. Such as myself.
>
> For users, it is probably substantially worse an experience than having a
> cmdmode like --show-patch in the very command they were jus
On Mon, Jan 29, 2018 at 2:54 PM, Johannes Schindelin
wrote:
> In the upcoming commits, we will teach the sequencer to recreate merges.
> This will be done in a very different way from the unfortunate design of
> `git rebase --preserve-merges` (which does not allow for reordering
> commits, or chan
tbo...@web.de writes:
> + if ((conv_flags & CONV_WRITE_OBJECT) && !strcmp(enc->name,
> "SHIFT-JIS")) {
> + char *re_src;
> + int re_src_len;
I think it is a bad idea to
(1) not check without CONV_WRITE_OBJECT here.
(2) hardcode SJIS and do this always and to SJIS
1 - 100 of 126 matches
Mail list logo
