Using --squash made git stop regardless of conflicts so that the
user could finish the operation with a later call to git-commit.
Now --squash --commit allows for the operation to finish with the
new revision if there are no conflicts. If the user does not use
--commit, then --no-commit is used as
On Thu, Jul 18, 2019 at 6:31 PM Jonathan Nieder wrote:
>
> This makes sense to me. Not really for the 'for' loop declaration
> aspect: for that, I'd want some more specialized tool that allows
> turning on such a check specifically. But more because Ubuntu trusty
> is still a platform that some
SZEDER Gábor wrote:
> I expected that this will eventually happen after Travis CI's default
> Linux image recently changed from Ubuntu 14.04 to 16.04; explanation
> in the commit message below.
>
> With that patch issues like this could be caught earlier, while they
> are only in 'pu' but not yet
Junio C Hamano wrote:
> -- >8 --
> Even though we have been sticking to C89, there are a few handy
> features we borrow from more recent C language in our codebase after
> trying them in weather balloons and saw that nobody screamed.
>
> Spell them out.
>
> While at it, extend the existing variabl
(I'm resending this cover letter with fixed Message-Id so that threading
@ public-inbox works properly. Sorry for the noise.)
I would like to revive discussion on this series; I have addressed most
of the review comments on the original series sent by Michael, with the
following exceptions:
* Mar
On Thu, Jul 18, 2019 at 09:12:52AM -0700, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
> > With that patch issues like this could be caught earlier, while they
> > are only in 'pu' but not yet in 'next'. But do we really want to do
> > that, is that the right tradeoff?
>
> I am sort of in fav
I would like to revive discussion on this series; I have addressed most
of the review comments on the original series sent by Michael, with the
following exceptions:
* Martin's objection on 1/4 that the sample hook would always exit
successfully is (I believe) incorrect. To test this, I ran
"/
From: Michael J Gruber
Add tests which make sure that the pre-merge-hook is called when
present, allows/disallows merge commits depending on its return value
and is suppressed by "--no-verify".
[js: renamed test as suggested in review comments]
Signed-off-by: Michael J Gruber
Signed-off-by: Jo
From: Michael J Gruber
Analogous to commit, introduce a '--no-verify' option which bypasses the
pre-merge hook. The shorthand '-n' is taken by the (non-existing)
'--no-stat' already.
[js: cleaned up trailing whitespace, moved some documentation changes
from this commit to 2/4.]
Signed-off-by:
From: Michael J Gruber
git-merge does not honor the pre-commit hook when doing automatic merge
commits, and for compatibility reasons this is going to stay.
Introduce a pre-merge hook which is called for an automatic merge commit
just like pre-commit is called for a non-automatic merge commit (o
From: Michael J Gruber
f8b863598c ("builtin/merge: honor commit-msg hook for merges", 2017-09-07)
introduced the no-verify flag to merge for bypassing the commit-msg
hook, though in a different way from the implementation in commit.c.
Change the implementation in merge.c to be the same as in com
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
You can find the changes described
On Thu, Jul 18, 2019 at 02:07:23PM -0700, Junio C Hamano wrote:
> >> + git rm qfwfq >msg &&
> >> + test_i18ngrep ! "needs merge" msg &&
> >
> > Should we capture stderr from "git rm", too, to cover all bases?
>
> Do you mean
>
> git rm blob >msg 2>&1
>
> because we could later change ou
Jeff King writes:
>> +test_expect_success 'Resolving by removal is not a warning-worthy event' '
>> +git reset -q --hard &&
>> +test_when_finished "rm -f .git/index.lock msg && git reset -q --hard" &&
>> +qfwfq=$(echo qfwfq | git hash-object -w --stdin) &&
>
> I'd have called this "$b
I'm Clinton Morgan, I have been instructed to notify you of the
availability of a package deposited by your relative (our client)
in your name at the event of demise. We are entrusted and
empowered with diplomatic immunity and status to safe keep
valuable packages and baggage in trust for our r
"Johannes Schindelin via GitGitGadget"
writes:
> From: Johannes Schindelin
>
> It is a real old anachronism from the Cogito days to have a
> .git/branches/ directory. And to have tests that ensure that Cogito
> users can migrate away from using that directory.
>
> But so be it, let's continue te
On Wed, Jul 17, 2019 at 01:38:35PM -0700, Junio C Hamano wrote:
> When resolving a conflict on a path in favor of removing it, using
> "git rm" on it is the standard way to do so. The user however is
> greeted with a "needs merge" message during that operation:
>
> $ git merge side-branch
On Wed, Jul 17, 2019 at 09:35:34AM -0700, Junio C Hamano wrote:
> "Thurston via GitGitGadget" writes:
>
> > Instead of managing paths and relative paths such as echo
> > "path/to/the/file.txt" >../../../../../../.gitignore git ignore
> > path/to/the/file.txt No matter what directory that is in,
On Thu, Jul 18, 2019 at 12:08:45PM -0700, Doug Ilijev via GitGitGadget wrote:
> Markdown incorrectly interpreted as an HTML tag; use backticks
> to escape Documentation/git-.txt to ensure that it renders the
> text as intended.
>
> An alternative would be to HTML-escape the angle-brackets, at th
Alban Gruin writes:
> The total amount of commands can be used to show the progression of the
> rebasing in a shell. This number is written to the disk by
> read_populate_todo() when the todo list is loaded from
> sequencer_continue() or pick_commits(), but not by complete_action(),
> which rele
Alban Gruin writes:
> In a todo list, `done_nr' is the amount of commands that were executed
> or skipped, but skip_unnecessary_picks() did not update it.
OK. Together with 3/9 and this one, any increment of total_nr and
done_nr in the existing code is not removed; does it mean that
nobody actu
Alban Gruin writes:
> `total_nr' is the total amount of items, done and toto, that are in a
"amount" -> "number" perhaps. Also s/toto/todo/ perhaps but I am
not sure what you wanted to say here, so...
> todo list. But unlike `nr', it was not updated when an item was
> appended to the list.
G
Markdown incorrectly interpreted as an HTML tag; use backticks
to escape Documentation/git-.txt to ensure that it renders the
text as intended.
An alternative would be to HTML-escape the angle-brackets, at the cost of
readability of the markdown in plaintext form. I opted for the backticks to
pre
From: Doug Ilijev
Markdown incorrectly interpreted `` as an HTML tag;
use backticks to escape `Documentation/git-.txt` to ensure
that it renders the text as intended.
Signed-off-by: Doug Ilijev
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README
rebase am already has this flag to "lie" about the committer date
by changing it to the author date. Let's add the same for
interactive machinery.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 7 ++--
builtin/rebase.c| 23 ++---
seque
read_author_script reads name, email and author date from the author
script. However, it does not check if the arguments are NULL. Adding
NULL checks will allow us to selectively get the required value, for
example:
char *date;
if (read_author_script(_path_, NULL, NULL, &date, _int_))
Another revision to keep this thread alive.
Rohit Ashiwal (2):
sequencer: add NULL checks under read_author_script
rebase -i: support --committer-date-is-author-date
Documentation/git-rebase.txt| 7 ++-
builtin/rebase.c| 23 +++--
sequencer.c
There are two backends available for rebasing, viz, the am and the
interactive. Naturally, there shall be some features that are
implemented in one but not in the other. One such flag is
--ignore-whitespace which indicates merge mechanism to treat lines
with only whitespace changes as unchanged. Wi
Another revision to keep the thread alive.
Rohit Ashiwal (1):
rebase -i: add --ignore-whitespace flag
Documentation/git-rebase.txt| 9 +++-
builtin/rebase.c| 26 --
sequencer.h | 1 +
t/t3422-rebase-incompatible-options.
Alban Gruin writes:
> When set to "warn" or "error", `rebase.missingCommitCheck' would make
> rebase -i warn if the user removed commits from the todo list to prevent
> mistakes. Unfortunately, rebase --edit-todo and rebase --continue don't
> take it into account.
>
> This adds three tests to t3
Palmer Dabbelt writes:
> * I'm not sure if it's safe to access the .git database from multiple
> processes at the same time.
It is supposed to, and also you are supposed to keep it that way ;-)
> * As I was writing the documentation I found "fetch --jobs". It seems
> like I should use that
On Thu, Jul 18, 2019 at 11:22 AM SZEDER Gábor wrote:
> C99 'for' loop initial declaration, i.e. 'for (int i = 0; i < n; i++)',
> is not allowed in Git's codebase yet, to maintain compatibility with
> some older compilers.
> [...]
> [1] The Azure Pipelines builds have been using Ubuntu 16.04 images
SZEDER Gábor writes:
> With that patch issues like this could be caught earlier, while they
> are only in 'pu' but not yet in 'next'. But do we really want to do
> that, is that the right tradeoff?
I am sort of in favor of having at least one build with an older
compiler without "-std=c99", lik
"Johannes Schindelin via GitGitGadget"
writes:
> From: Johannes Schindelin
>
> Without an error message when `lstat()` failed, `git clean` would
> abort without an error message, leaving the user quite puzzled.
Let's drop the first three words ;-) Sorry for not catching it
earlier and parrotti
On Tue, Jul 16, 2019 at 09:53:59AM -0700, Junio C Hamano wrote:
> Carlo Arenas writes:
> >> + for (struct ref *it = remote_refs; it; it =
> >> it->next)
> >
> > moving "struct ref it" out of the loop, allows for building with ancient
> > compilers that don't support C90 (ev
From: Johannes Schindelin
This is a dependency required for the non-smart HTTP backend.
Signed-off-by: Johannes Schindelin
---
contrib/buildsystems/engine.pl | 2 ++
1 file changed, 2 insertions(+)
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index c35844a0c7..
From: Johannes Schindelin
The default location for `.exe` files linked by Visual Studio depends on
the mode (debug vs release) and the architecture. Meaning: after a full
build, there is a `git.exe` in the top-level directory, but none of the
built-ins are linked..
When running a test script in
From: Philip Oakley
The error message talked about a "lib option", but it clearly referred
to a link option.
Signed-off-by: Philip Oakley
Signed-off-by: Johannes Schindelin
---
contrib/buildsystems/engine.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/buildsyst
From: Johannes Schindelin
With the recent changes to allow building with MSVC=1, we now pass the
/OPT:REF option to the compiler. This confuses the parser that wants to
turn the output of a dry run into project definitions for QMake and Visual
Studio:
Unhandled link option @ line 213: /O
From: Johannes Schindelin
The Generators/ directory can contain spurious files such as editors'
backup files. Even worse, there could be .swp files which are not even
valid Perl scripts.
Let's just ignore anything but .pm files in said directory.
Signed-off-by: Johannes Schindelin
---
contrib
From: Philip Oakley
Git's build contains steps to handle internationalization. This caused
hiccups in the parser used to generate QMake/Visual Studio project files.
As those steps are irrelevant in this context, let's just ignore them.
Signed-off-by: Philip Oakley
Signed-off-by: Johannes Schin
From: Philip Oakley
The engine.pl script expects file names not to contain spaces. However,
paths with spaces are quite prevalent on Windows. Use shellwords() rather
than split() to parse them correctly.
Helped-by: Junio C Hamano
Signed-off-by: Philip Oakley
Signed-off-by: Johannes Schindelin
From: Johannes Schindelin
This is one of the few places where Git violates its own deprecation of
the dashed form. It is not necessary, either.
As of 595d59e2b53 (git.c: ignore pager.* when launching builtin as
dashed external, 2017-08-02), Git wants to ignore the pager.* config
setting when exp
From: Johannes Schindelin
It is a real old anachronism from the Cogito days to have a
.git/branches/ directory. And to have tests that ensure that Cogito
users can migrate away from using that directory.
But so be it, let's continue testing it.
Let's make sure, however, that git init does not n
From: Johannes Schindelin
Signed-off-by: Johannes Schindelin
---
.gitignore | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitignore b/.gitignore
index e7bb15d301..fcfb708b9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -233,4 +233,7 @@
*.manifest
Debug/
Release/
+/UpgradeLog*.htm
+/
From: Johannes Schindelin
Git's test suite shows tons of breakages unless Git is compiled
*without* NO_ICONV. That means, in turn, that we need to generate
build definitions *with* libiconv, which in turn implies that we
have to handle the -liconv option properly.
Signed-off-by: Johannes Schinde
From: Philip Oakley
Upon seeing the '-lcurl' option, point to the libcurl.lib.
While there, fix the elsif indentation.
Signed-off-by: Philip Oakley
Signed-off-by: Johannes Schindelin
---
contrib/buildsystems/engine.pl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/con
From: Johannes Schindelin
Signed-off-by: Johannes Schindelin
---
contrib/buildsystems/Generators/Vcproj.pm | 8
1 file changed, 8 insertions(+)
diff --git a/contrib/buildsystems/Generators/Vcproj.pm
b/contrib/buildsystems/Generators/Vcproj.pm
index b17800184c..737647e76a 100644
--- a
From: Philip Oakley
Since 4b623d8 (MSVC: link in invalidcontinue.obj for better POSIX
compatibility, 2014-03-29), invalidcontinue.obj is linked in the MSVC
build, but it was not parsed correctly by the buildsystem. Ignore it, as
it is known to Visual Studio and will be handled elsewhere.
Also on
From: Philip Oakley
Rather than swallowing the errors, it is better to have them in a file.
To make it obvious what this is about, use the file name
'msvc-build-makedryerrors.txt'.
Further, if the output is empty, simply delete that file. As we target
Git for Windows' SDK (which, unlike its pre
From: Johannes Schindelin
It is not necessary, and Visual Studio 2015 no longer supports it, anyway.
Signed-off-by: Johannes Schindelin
---
contrib/buildsystems/Generators/Vcproj.pm | 12
1 file changed, 12 deletions(-)
diff --git a/contrib/buildsystems/Generators/Vcproj.pm
b/co
From: Johannes Schindelin
The entire idea of generating the VS solution makes only sense if we
generate it via Continuous Integration; otherwise potential users would
still have to download the entire Git for Windows SDK.
If we pre-generate the Visual Studio solution, Git can be built entirely
w
From: Johannes Schindelin
One time too many did this developer call the `generate` script passing
a `--make-out=` option that was happily ignored (because there
should be a space, not an equal sign, between `--make-out` and the
path).
And one time too many, this script not only ignored it but di
From: Johannes Schindelin
Based on the previous patches in this patch series that fixed the
generator for `.vcproj` files (which were used by Visual Studio prior to
2015 to define projects), this patch offers to generate project
definitions for neweer versions of Visual Studio (which use `.vcxpro
From: Johannes Schindelin
We ran out GUIDs. Again. But there is no need to: we can generate them
semi-randomly from the target file name of the project.
Note: the Vcproj generator is probably only interesting for historical
reasons; nevertheless, the upcoming Vcxproj generator (to support modern
From: Philip Oakley
Add an option for capturing the output of the make dry-run used in
determining the msvc-build structure for easy debugging.
You can use the output of `--make-out ` in subsequent runs via the
`--in ` option.
Signed-off-by: Philip Oakley
Signed-off-by: Johannes Schindelin
--
A long time ago, we added support to build .sln and .vcproj files for use
within Visual Studio, so that Git could be built in that popular IDE.
This support languished for years and was finally brought back into Git for
Windows partially through the jh/msvc branch that was just merged into
master
From: Philip Oakley
Add the Microsoft .manifest pattern, and do not anchor the 'Debug'
and 'Release' entries at the top-level directory, to allow for
multiple projects (one per target).
Signed-off-by: Philip Oakley
Signed-off-by: Johannes Schindelin
---
.gitignore | 5 +++--
1 file changed, 3
From: Johannes Schindelin
When compiling with Visual Studio, the projects' names are identical to
the executables modulo the extensions. Read: there will exist both a
directory called `git` as well as an executable called `git.exe` in the
end. Which means that the bin-wrappers *need* to target th
From: Philip Oakley
Visual Studio takes the first listed application/library as the default
startup project [1].
Detect the 'git' project and place it at the head of the project list,
rather than at the tail.
Export the apps list before libs list for both the projects and global
structures of t
Guten Tag ,
Es tut mir leid, Sie in dieser Angelegenheit ohne Ihre vorherige
Zustimmung zu kontaktieren. Es war wegen der Dringlichkeit der Dinge.
Ich bin Auguste AMAGA, ein Rechtsanwalt, und der persönliche Anwalt
von ein verstorbener Kunde aus Ihrem Land. Ich würde gerne wissen, ob
wir zusamm
Guten Tag ,
Es tut mir leid, Sie in dieser Angelegenheit ohne Ihre vorherige
Zustimmung zu kontaktieren. Es war wegen der Dringlichkeit der Dinge.
Ich bin Auguste AMAGA, ein Rechtsanwalt, und der persönliche Anwalt
von ein verstorbener Kunde aus Ihrem Land. Ich würde gerne wissen, ob
wir zusamm
From: Johannes Schindelin
Without an error message when `lstat()` failed, `git clean` would
abort without an error message, leaving the user quite puzzled.
In particular on Windows, where the default maximum path length is quite
small (yet there are ways to circumvent that limit in many cases),
This is particularly important on Windows, where PATH_MAX is very small
compared to Unix/Linux.
Changes since v1:
* Matched the warning message style to existing ones,
* Fixed test in multiple ways: * Avoiding touch in favor of : >.
* Using test_config.
* Using test_i18ngrep instead of
Hi,
On Wed, 17 Jul 2019, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> >> The other warnings in that function are issued using
> >> warning_errno() (shorter code, consistency is enforced) and
> >> messages are marked for translation. That would be nice to have
> >> here as well, no?
> >
>
65 matches
Mail list logo
