On Wed, Nov 15, 2023 at 09:49:31AM -0800, Kees Cook wrote:
> On Wed, Nov 15, 2023 at 06:03:30PM +0100, Borislav Petkov wrote:
> > From: "Borislav Petkov (AMD)"
> >
> > After receiving a second patchset this week without knowing which tree
> > it applies on and trying to apply it on the obvious on
On 22/10/19 09:46AM, Bert Wesarg wrote:
> On Mon, Oct 21, 2019 at 9:35 PM Johannes Sixt wrote:
> >
> > Am 21.10.19 um 11:16 schrieb Bert Wesarg:
> > > Dear Pratyush,
> > >
> > > I just noticed that the 'Revert Last Hunk' menu entry is enabled in
> > > the stage-list. But I think it should be disab
On 22/10/19 10:17AM, Bert Wesarg wrote:
> On Mon, Oct 21, 2019 at 9:04 PM Pratyush Yadav wrote:
> >
> > On 21/10/19 11:16AM, Bert Wesarg wrote:
> > > Dear Pratyush,
> > >
> > > I just noticed that the 'Revert Last Hunk' menu entry is enabled in
> > > the stage-list. But I think it should be disabl
On Wed, Oct 23, 2019 at 09:32:26AM -0400, Eric Sunshine wrote:
> On Wed, Oct 23, 2019 at 8:04 AM Denton Liu wrote:
> > Before, the output of `git diff HEAD` would always be piped to
> > sanitize_conflicted_diff(). However, since the Git command was upstream
> > of the pipe, in case the Git command
; builds at Travis ('pu' seems to fail the test for totally different
> reason, though):
>
> +brew link gcc@8
> Error: No such keg: /usr/local/Cellar/gcc@8
>
> cf. https://travis-ci.org/git/git/jobs/601697903
Yeah, that's a new one, so we don't get
On Wed, Oct 23, 2019 at 01:01:00PM +0900, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
> >> - b9317d55a3 added two new keys to the trie: 'logs/refs/rewritten'
> >> and 'logs/refs/worktree', next to the already existing
> >> 'logs/refs/bisect'. This resulted in a trie node with the pa
On 10/23/19 1:02 AM, Jeff King wrote:
> On Tue, Oct 22, 2019 at 07:28:47PM -0400, Prarit Bhargava wrote:
>
>> In many projects the number of contributors is low enough that users know
>> each other and the full email address doesn't need to be displayed.
>> Displaying only the author's username
On 10/22/19 7:48 PM, brian m. carlson wrote:
> On 2019-10-22 at 23:28:47, Prarit Bhargava wrote:
>> In many projects the number of contributors is low enough that users know
>> each other and the full email address doesn't need to be displayed.
>> Displaying only the author's username saves a lo
On Wed, Oct 23, 2019 at 01:01:35PM +, Derrick Stolee via GitGitGadget wrote:
> From: Derrick Stolee
>
> The previous commit includes a failing test for an issue around
> fetch.writeCommitGraph and fetching in a repo with a submodule. Here, we
> fix that bug and set the test to "test_expect_su
On 10/22/19 7:46 PM, Junio C Hamano wrote:
> Prarit Bhargava writes:
>
>> Subject: Re: [PATCH] pretty: Add "%aU"|"%au" option to output author's
>> username
>
> Downcase "Add" (see "git shortlog --no-merges -100 master" an
uper &&
> + (
> + cd super &&
> + git submodule add "file://$pwd/three" &&
Nits: couldn't the URL simply be file://$TRASH_DIRECTORY/three ?
> + git commit -m "add submodule"
> + ) &&
>
On Fri, Oct 18, 2019 at 2:52 PM Denton Liu wrote:
> On Thu, Oct 17, 2019 at 07:41:44PM -0400, Eric Sunshine wrote:
> > On Thu, Oct 17, 2019 at 7:17 PM Denton Liu wrote:
> > > - test "$COPY" = "$(git rev-parse --verify me/copy)" &&
> > > + test_cmp_rev "$COPY" me/copy &&
> >
> > This t
; '
> +test_apply_with_3way () {
> + status="$1" &&
> + shift &&
> + description="$1" &&
> + shift &&
> + preamble="$1" &&
> + shift &&
> +
> + te
From: Derrick Stolee
The previous commit includes a failing test for an issue around
fetch.writeCommitGraph and fetching in a repo with a submodule. Here, we
fix that bug and set the test to "test_expect_success".
The prolem arises with this set of commands when the remote repo at
has a submodu
SUBMODULE, I just
forgot. Sorry for derailing the investigation somewhat.
The details above are the start of the commit message for [PATCH 1/2],
including a test that fails when fetching after cloning a repo with a
submodule.
In [PATCH 2/2], I actually have the fix. I tried to include as much detail
From: Derrick Stolee
While dogfooding, Johannes found a bug in the fetch.writeCommitGraph
config behavior. His example initially happened during a clone with
--recurse-submodules, we found that this happens with the first fetch
after cloning a repository that contains a submodule:
$ git
On Wednesday 23 October 2019 13:09:51 CEST Denton Liu wrote:
> On Wed, Oct 23, 2019 at 10:15:15AM +, Jerome Pouiller wrote:
> > On Wednesday 23 October 2019 10:55:03 CEST Denton Liu wrote:
> > > I am currently have a WIP patchset that will print the location of the
>
--no-verbose, if I understand
> correctly, if the script does not want to show the progress output.
I'm happy to have attempted the change and start this discussion. It
sounds like this one patch could be ejected to no loss to the full
series.
Thanks,
-Stolee
Since the locally defined create_file() duplicates the functionality of
the test_write_lines() helper function, remove create_file() and replace
all instances with test_write_lines(). While we're at it, move
redirection operators to the end of the command which is the more
conventional place to put
re enabled' '
- git config rerere.enabled true &&
+ test_config rerere.enabled true &&
# Merging side should be similar to applying this patch
git diff ...side >P.diff &&
--
2.24.0.rc0.197.g0926ab8072
Before, the output of `git diff HEAD` would always be piped to
sanitize_conflicted_diff(). However, since the Git command was upstream
of the pipe, in case the Git command fails, the return code would be
lost. Rewrite into separate statements so that the return code is no
longer lost.
Since only t
This fixes a bug where even if `merge.conflictStyle = diff3`, running
`git apply --3way` would not output the base.
Patches 1-3 are general cleanup for t4108, 4 demonstrates the bug and 5
actually fixes it.
Denton Liu (5):
t4108: replace create_file with test_write_lines
t4108: remove git com
][<>|][<>|]*\) .*/\1/
' diff.raw
}
@@ -46,28 +46,42 @@ test_expect_success 'apply without --3way' '
git diff-index --exit-code --cached HEAD
'
-test_expect_success 'apply with --3way' '
- # Merging side should be
Before, when doing a 3-way merge, the merge.conflictStyle option was not
respected and the "merge" style was always used, even if "diff3" was
specified.
Call git_xmerge_config() at the end of git_apply_config() so that the
merge.conflictStyle config is read.
Signed-off-by: Denton Liu
---
apply.
On Wed, Oct 23, 2019 at 10:15:15AM +, Jerome Pouiller wrote:
> On Wednesday 23 October 2019 10:55:03 CEST Denton Liu wrote:
> > I am currently have a WIP patchset that will print the location of the
> > failed patch file (.git/rebase-apply/patch) in the case of a failure as
On Wednesday 23 October 2019 10:55:03 CEST Denton Liu wrote:
> On Wed, Oct 23, 2019 at 08:49:41AM +, Jerome Pouiller wrote:
> > On Wednesday 23 October 2019 04:24:58 CEST Junio C Hamano wrote:
> > > Jerome Pouiller writes:
> > > > I try to use "git am&quo
"Johannes Schindelin via GitGitGadget"
writes:
> From: Johannes Schindelin
>
> The Azure Pipelines builds are failing for macOS due to a change in the
> location of the perforce cask. The command outputs the following error:
>
> + brew install caskroom/cask/perforce
> Error: caskroom/cas
Hi Jerome,
On Wed, Oct 23, 2019 at 08:49:41AM +, Jerome Pouiller wrote:
> On Wednesday 23 October 2019 04:24:58 CEST Junio C Hamano wrote:
> > Jerome Pouiller writes:
> > > I try to use "git am" to apply a patch sent using "git send-email". This
> &g
On Wednesday 23 October 2019 04:24:58 CEST Junio C Hamano wrote:
> Jerome Pouiller writes:
> > I try to use "git am" to apply a patch sent using "git send-email". This
> > patch does not apply properly. I try to use "git am --show-current-patch"
Remove empty and redundant documentation files from the
Documentation/technical/ directory.
The empty doc files included only TODO messages with no documentation for
years. Instead an approach is being taken to keep all doc beside the code in
the relevant header files. Having empty doc files is co
From: Heba Waly
Remove empty and redundant documentation files from the
Documentation/technical/ directory.
The empty doc files included only TODO messages with no documentation for
years. Instead an approach is being taken to keep all doc beside the code
in the relevant header files.
Having emp
On Wed, Oct 23, 2019 at 12:52 PM Junio C Hamano wrote:
>
> Emily Shaffer writes:
>
> > As for the content of this change, I absolutely approve. I've stumbled
> > across some of these empty docs while looking for answers before and
> > found it really demoralizing - the community is so interested
On Wed, Oct 23, 2019 at 10:05 AM Emily Shaffer wrote:
>
> On Tue, Oct 22, 2019 at 06:19:35PM +, Heba Waly via GitGitGadget wrote:
> > From: Heba Waly
> >
> > Remove empty and redundant documentation files from the
> > Documentation/technical/ directory.
> >
> > As part of moving the documenta
The existing wording gives an impression that it only gives the
contents of the $GIT_DIR/rebase-apply/patch file, i.e. the patch
proper, but the option actually emits the entire e-mail message
being processed (iow, one of the output files from "git mailsplit").
Signed-off-by: Juni
From: Heba Waly
Move the documentation from Documentation/technical/api-config.txt into
config.h as it's easier for the developers to find the usage information
beside the code instead of looking for it in another doc file, also
documentation/technical/api-config.txt is removed because the inform
Move the documentation from Documentation/technical/api-config.txt into
config.h as it's easier for the developers to find the usage information
beside the code instead of looking for it in another doc file, also
documentation/technical/api-config.txt is removed because the information it
has is no
On Tue, Oct 22, 2019 at 07:28:47PM -0400, Prarit Bhargava wrote:
> In many projects the number of contributors is low enough that users know
> each other and the full email address doesn't need to be displayed.
> Displaying only the author's username saves a lot of columns on the screen.
> For exa
On Wed, Oct 23, 2019 at 9:59 AM Emily Shaffer wrote:
>
> On Tue, Oct 22, 2019 at 07:05:06AM +, Heba Waly via GitGitGadget wrote:
> > From: Heba Waly
> >
> > Move the documentation from Documentation/technical/api-config.txt into
> > config.h
>
> This is still a little thin for what we usually
Emily Shaffer writes:
> +# Commit
> +
> +This is the one we're all familiar with - commits are those things we write
> at
> +1am, angry at a pesky bug, and label with something like "really fix it this
> +time", right?
> +
> +A commit references exactly one tree. That's the root directory of you
SZEDER Gábor writes:
>> - b9317d55a3 added two new keys to the trie: 'logs/refs/rewritten'
>> and 'logs/refs/worktree', next to the already existing
>> 'logs/refs/bisect'. This resulted in a trie node with the path
>> 'logs/refs', which didn't exist before, and which doesn't have a
"Derrick Stolee via GitGitGadget" writes:
> V4 UPDATE: Rebased on latest master to include ew/hashmap and
> ds/include-exclude in the base.
>
> This series makes the sparse-checkout feature more user-friendly. While
> there, I also present a way to use a limited set of patterns to gain a
> signif
Derrick Stolee writes:
>> I'm slightly wary of changing the output of plumbing commands
>> like this. If a script wants progress output it can already get
>> it by passing --verbose. With this change a script that does not
>> want that output now has to pass --no-verbose.
>
> If a script is calli
SZEDER Gábor writes:
>> +char *base = buf->buf + git_dir_len, *base2 = NULL;
>> +
>> +if (ends_with(base, ".lock"))
>> +base = base2 = xstrndup(base, strlen(base) - 5);
>
> Hm, this adds the magic number 5 and calls strlen(base) twice, because
> ends_with() calls strip_suffix(
rry-pick failed due to an empty patch.
>
> However, the same message is displayed during a rebase, when the patch
> to-be-committed is empty. In this case, git reset would also have worked,
> but git cherry-pick --skip does not work. This is a regression introduced in
> this
"Johannes Schindelin via GitGitGadget"
writes:
> Note: we take pains to handle the situation when a user runs a `git
> cherry-pick` _during_ a rebase. This is quite valid (e.g. in an `exec`
> line in an interactive rebase). On the other hand, it is not possible to
> run a rebase during a cherry-p
Jerome Pouiller writes:
> Hello all,
>
> I try to use "git am" to apply a patch sent using "git send-email". This
> patch does not apply properly. I try to use "git am --show-current-patch"
> to understand the problem. However, since original mail is
Denton Liu writes:
> According to t/README, test_must_fail() should only be used to test for
> failure in Git commands. Replace the invocations of
> `test_must_fail grep` with `! grep`.
>
> Signed-off-by: Denton Liu
> ---
> *sigh* Here's another cleanup patch for '
Emily Shaffer writes:
>> ...
>> +/**
>> + * The config API gives callers a way to access Git configuration files
>> + * (and files which have the same syntax). See linkgit:git-config[1] for a
>
> Ah, here's another place where the Asciidoc link isn't going to do
> anything anymore.
>
> Otherwise
Johannes Schindelin writes:
> However, I think this is _really_ ugly and intrusive. The opposite of
> what my goals were.
>
> So I think I'll just bite the bullet and use a temporary copy if the
> argument ends in `.lock`.
Sounds like a quite sensible design decision to me.
Bert Wesarg writes:
> Please ignore this. Will rebase on 2.24-rc0 and will only include the
> test changes.
Thanks.
studio): actually run the tests in parallel
>
> azure-pipelines.yml | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Thanks.
I will take the change to 'master' directly, as cooking in 'next'
won't give it any extra exposure when the topic touches only this
fil
Jeff King writes:
> But here's where it gets tricky. In addition to catching any size
> mismatches, this will also catch signedness problems. I.e., if we make
> OPT_INTEGER() use "intp", then everybody passing in &unsigned_var now
> gets a compiler warning. Which maybe is a good thing, I dunno.
On Tue, Oct 22, 2019 at 08:48:20PM -0400, Jeff King wrote:
> I admit I am puzzled, though, _why_ the presence of the submodule
> matters. That is, from your explanation, I thought the issue was simply
> that `fetch` walked (and marked) some commits, and the flags overlapped
> with what the commit-
hat repo. It makes sense
> that the Git repo also has one. Thanks for the test! I'll get it into
> the test suite tomorrow.
Ah, right. Good catch Gábor. The test below fails for me without your
patch, and succeeds with it (the extra empty commit is necessary so that
we have a parent).
On 10/22/2019 7:35 PM, SZEDER Gábor wrote:
> On Tue, Oct 22, 2019 at 05:45:54PM -0400, Jeff King wrote:
>> Puzzling...
>
> Submodules?
>
> $ cd ~/src/git/
> $ git quotelog 86cfd61e6b
> 86cfd61e6b (sha1dc: optionally use sha1collisiondetection as a submodule,
> 2017-07-01)
> $ git init
From: Elijah Newren
Signed-off-by: Elijah Newren
---
Documentation/CodingGuidelines | 2 +-
Documentation/RelNotes/1.7.0.2.txt | 2 +-
Documentation/RelNotes/1.7.10.4.txt| 2 +-
Documentation/RelNotes/1.7.12.3.txt| 2 +-
Do
We have a number of typos and spelling errors that I spotted under
Documentation/.
It'd be nice if someone could double check that I placed the missing right
parenthesis correctly in Documentation/technical/api-trace2.txt. Also, not
sure if folks would be happy or unhappy with me un-splitting a wo
On Wed, Oct 23, 2019 at 01:23:25AM +0200, Johannes Schindelin wrote:
> On Fri, 18 Oct 2019, SZEDER Gábor wrote:
>
> > On Thu, Oct 17, 2019 at 12:47:33PM +, Johannes Schindelin via
> > GitGitGadget wrote:
> > > From: Johannes Schindelin
> > >
> > > The CI builds are failing for Mac OS X due t
Running CI on Mac OS X in Azure Pipelines is currently broken due to a moved
homebrew package.
Change since v2:
* The commit message was improved (thanks Gábor).
Change since v1: -The step is now more robust (by pulling homebrew-cask and
trying again if the pull failed).
Thanks, -Stolee
Johan
From: Johannes Schindelin
The Azure Pipelines builds are failing for macOS due to a change in the
location of the perforce cask. The command outputs the following error:
+ brew install caskroom/cask/perforce
Error: caskroom/cask was moved. Tap homebrew/cask-cask instead.
So let's try to
Emily Shaffer writes:
> As for the content of this change, I absolutely approve. I've stumbled
> across some of these empty docs while looking for answers before and
> found it really demoralizing - the community is so interested in
> teaching me how to contribute that they've sat on a TODO for 1
On 2019-10-22 at 23:28:47, Prarit Bhargava wrote:
> In many projects the number of contributors is low enough that users know
> each other and the full email address doesn't need to be displayed.
> Displaying only the author's username saves a lot of columns on the screen.
> For example displaying
Prarit Bhargava writes:
> Subject: Re: [PATCH] pretty: Add "%aU"|"%au" option to output author's
> username
Downcase "Add" (see "git shortlog --no-merges -100 master" and
mimick the project convention).
> Add a "%aU"|"
Johannes Schindelin writes:
>> This is already in 'next' X-<; reverting a merge is cheap but I
>> prefer to do so when we already have a replacement.
>
> I force-pushed (see https://github.com/gitgitgadget/git/pull/400), and
> once Stolee approves, he will submit v3. This will only change the
> c
On Tue, Oct 22, 2019 at 05:45:54PM -0400, Jeff King wrote:
> On Tue, Oct 22, 2019 at 04:33:16PM -0400, Jeff King wrote:
>
> > > I have failed to produce a test using the file:// protocol that
> > > demonstrates this bug.
> >
> > Hmm, from the description, it sounds like it should be easy. I might
these entries.
> > >
> > > In short, flipping these entries because '.' sorts later than '-' is
> > > making the result look "less sorted", at least to me.
> >
> > The problem with this argument is that it disagrees with ASCII,
From: Johannes Schindelin
The presence of this path will be used in the next commit to fix an
incorrect piece of advice in `git commit` when in the middle of a
rebase.
Signed-off-by: Johannes Schindelin
---
sequencer.c | 4 ++--
sequencer.h | 1 +
2 files changed, 3 insertions(+), 2 deletions(
In dcb500dc16c (cherry-pick/revert: advise using --skip, 2019-07-02), we
introduced a helpful message that suggests to run git cherry-pick --skip
(instead of the previous message that talked about git reset) when a
cherry-pick failed due to an empty patch.
However, the same message is displayed
From: Johannes Schindelin
In dcb500dc16c (cherry-pick/revert: advise using --skip, 2019-07-02),
`git commit` learned to suggest to run `git cherry-pick --skip` when
trying to cherry-pick an empty patch.
However, it was overlooked that there are more conditions than just a
`git cherry-pick` when
From: Johannes Schindelin
In dcb500dc16c (cherry-pick/revert: advise using --skip, 2019-07-02),
`git commit` learned to suggest to run `git cherry-pick --skip` when
trying to cherry-pick an empty patch, but that was never tested for.
Here is a test that verifies that a message is given to the
In many projects the number of contributors is low enough that users know
each other and the full email address doesn't need to be displayed.
Displaying only the author's username saves a lot of columns on the screen.
For example displaying "prarit" instead of "pra...@redhat.com" saves 11
columns.
Hi Junio,
On Mon, 21 Oct 2019, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
> > On Thu, Oct 17, 2019 at 12:47:33PM +, Johannes Schindelin via
> > GitGitGadget wrote:
> >> From: Johannes Schindelin
> >>
> >> The CI builds are failing for Mac OS X due to a change in the
> >
> > s/CI/Azure
Hi Gábor,
On Fri, 18 Oct 2019, SZEDER Gábor wrote:
> On Thu, Oct 17, 2019 at 12:47:33PM +, Johannes Schindelin via
> GitGitGadget wrote:
> > From: Johannes Schindelin
> >
> > The CI builds are failing for Mac OS X due to a change in the
>
> s/CI/Azure Pipelines/
>
> Our Travis CI builds are
On Tue, Oct 22, 2019 at 04:33:16PM -0400, Jeff King wrote:
> > I have failed to produce a test using the file:// protocol that
> > demonstrates this bug.
>
> Hmm, from the description, it sounds like it should be easy. I might
> poke at it a bit.
Hmph. I can reproduce it here, but it seems to de
directory
First patch best viewed with a --histogram diff (sorry, gitgitgadget does
not yet know how to generate those).
Changes since v1:
* Incorporated code cleanups suggested by Dscho
* Fixed to work with an alternate rename-to-root-directory case (end_of_new
== NULL), with new testcase
From: Elijah Newren
We allow renaming all entries in e.g. a directory named z/ into a
directory named y/ to be detected as a z/ -> y/ rename, so that if the
other side of history adds any files to the directory z/ in the mean
time, we can provide the hint that they should be moved to y/.
There i
From: Elijah Newren
Transform the setup "tests" to setup functions, and have the actual
tests call the setup functions. Advantages:
* Should make life easier for people working with webby CI/PR builds
who have to abuse mice (and their own index finger as well) in
order to switch from
From: Elijah Newren
Dscho noted a few things making this function hard to follow.
Restructure it a bit and add comments to make it easier to follow. The
restructurings include:
* There was a special case if-check at the end of the function
checking whether someone just renamed a file with
On Tue, Oct 22, 2019 at 06:19:35PM +, Heba Waly via GitGitGadget wrote:
> From: Heba Waly
>
> Remove empty and redundant documentation files from the
> Documentation/technical/ directory.
>
> As part of moving the documentation from Documentation/technical/api-* to
> header files, the follow
On Tue, Oct 22, 2019 at 07:05:06AM +, Heba Waly via GitGitGadget wrote:
> From: Heba Waly
>
> Move the documentation from Documentation/technical/api-config.txt into
> config.h
This is still a little thin for what we usually want from commit
messages. Try to imagine that five years from now,
On Sun, Oct 20, 2019 at 09:35:17PM +1300, Heba Waly wrote:
> On Sat, Oct 19, 2019 at 11:52 AM Emily Shaffer
> wrote:
> >
> > On Fri, Oct 18, 2019 at 12:06:59AM +, Heba Waly via GitGitGadget wrote:
> > > From: Heba Waly
> >
> > Hi Heba,
> >
On Tue, Oct 22, 2019 at 05:28:55PM +, Derrick Stolee via GitGitGadget wrote:
> However, the UNINTERESTING flag is used in lots of places in the
> codebase. This flag usually means some barrier to stop a commit walk,
> such as in revision-walking to compare histories. It is not often
> cleared
gt; + /* Don't mark objects not in the packfile */
> + if (i > bitmap_git->pack->num_objects / BITS_IN_EWORD)
> + i = bitmap_git->pack->num_objects / BITS_IN_EWORD;
Why is this necessary? Let's say we have 42 fully-1 words, and therefore
i is 42. Shouldn't we al
hat
> succeeded, and only the output of the actual test that actually failed.
>
> It removes context.
>
> I need to understand the scenario where the breakage happens, and the
> only way I can understand is when I understand the context.
>
> So the context needs to be as clos
Remove empty and redundant documentation files from the
Documentation/technical/ directory.
As part of moving the documentation from Documentation/technical/api-* to
header files, the following files are deleted because they include only TODO
messages with no documentation: Documentation/technical
From: Heba Waly
Remove empty and redundant documentation files from the
Documentation/technical/ directory.
As part of moving the documentation from Documentation/technical/api-* to
header files, the following files are deleted because they include only
TODO messages with no documentation to be
including the last one look
good, except the ones that just add a new function because I'll have to
review the last patch to see how they are used.
when calling compute_generation_numbers(). A
commit in the list expects to see a parent, but that parent is not in the
list.
The details above are the start of the commit message for [PATCH 1/1]. I
tried to include as much detail as I could for how I investigated the
problem and why I think this is
From: Derrick Stolee
While dogfooding, Johannes found a bug in the fetch.writeCommitGraph
config behavior. While his example initially happened during a clone
with --recurse-submodules, we found that it is actually a problem with
the first fetch after a new clone and no existing commit-graph file
On Mon, Oct 21, 2019 at 09:54:42PM +, Johannes Schindelin via GitGitGadget
wrote:
> From: Johannes Schindelin
>
> Ever since worktrees were introduced, the `git_path()` function _really_
> needed to be called e.g. to get at the path to `logs/HEAD` (`HEAD` is
> specific to the worktree, and t
This fixes t5516 on Windows. For detailed explanation please refer to code
comments in this commit.
There was a lot of back-and-forth already in vreportf(): d048a96e
(2007-11-09) - 'char msg[256]' is introduced to avoid interleaving 389d1767
(2009-03-25) - Buffer size increased to 1024 to avoid tr
From: Alexandr Miloslavskiy
This also fixes t5516 on Windows VS build.
For detailed explanation please refer to code comments in this commit.
There was a lot of back-and-forth already in vreportf():
d048a96e (2007-11-09) - 'char msg[256]' is introduced to avoid interleaving
389d1767 (2009-03-25)
From: Alexandr Miloslavskiy
This also fixes t5516 on Windows VS build.
For detailed explanation please refer to code comments in this commit.
There was a lot of back-and-forth already in vreportf():
d048a96e (2007-11-09) - 'char msg[256]' is introduced to avoid interleaving
389d1767 (2009-03-25)
This fixes t5516 on Windows. For detailed explanation please refer to code
comments in this commit.
There was a lot of back-and-forth already in vreportf(): d048a96e
(2007-11-09) - 'char msg[256]' is introduced to avoid interleaving 389d1767
(2009-03-25) - Buffer size increased to 1024 to avoid tr
+-e::
+--[no-]exact::
+ Reconstruct the exact commit that the patch was generated from,
+ assuming the mail contains complete metadata (i.e. it was generated
+ using `git format-patch --complete`). This is only possible if all
+ the parent commits are available in the repository
"Metadata" here is used for the raw commit metadata which gets included
in a patch when using 'git format-patch --complete'.
The new email format is roughly:
1. email headers (ends with a blank line)
2. changelog (ends with "---" or when the diff starts)
3.
This option causes the raw commit data to be inserted between the
changelog and the diffstat when you run git-format-patch. With a
following patch to 'git am', this will allow the exact reconstruction
of the commit to the point where the sha1 will be the same.
There is also a new con
to be a consensus in the Linux kernel development community
that tracking patches, patchsets, reviews, and discussion of said patches
is too difficult. One big problem is that there is often no reference to
the email discussion in git history once the patch has been merged.
In order to simplif
Jeff King writes:
>> ...
>> I agree with you that it did correctly sort them in ASCII order.
>
> What's the purpose of sorting them, though? I thought it was less for
> aesthetics and more to to keep lines deterministic (to avoid two
> branches adding the same line in different places, thus causi
expressions:
s/\(\s*\)test \([^=]*\)= "$(cat \([^)]*\))"/\1echo \2>expect
\&\&\n\1test_cmp expect \3/
s/\(\s*\)test "$(cat \([^)]*\))" = \([^&]*\)\( &&\)\?$/\1echo \3
>expect \&\&\n\1test_cmp expect \2\4/
A future patch wil
1 - 100 of 136686 matches
Mail list logo
