er we flex "Index" like a foreign word in
>German or like a German word:
>
>der Index, des Index, ...; die Indizes (pl.)
>
>or
>
>der Index, des Indexes, ...; die Indexe (pl.)
>
>I'd vote the former.
>
You can use Indizes and Indexe both as german word
dene Git-Kommandos irgendwo in Ihrem $PATH
>
> imerge
>...
>
>What about changing it to
>"Vorhandene Git-Kommandos anderswo in Ihrem $PATH"?
Yeah that's good.
Phillip
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message
Acked-by: Phillip Sz
>Signed-off-by: Ralf Thielow
>---
> po/de.po | 28 ++--
> 1 file changed, 10 insertions(+), 18 deletions(-)
>
>diff --git a/po/de.po b/po/de.po
>index 64070cd..6ed3509 100644
>--- a/po/de.po
>+++ b/po/de.po
>@@ -1046
>Currently we almost always translate as "Kommando", which,
>following this guidance, is only partially correct.
>In this case here I'd interpret it as "Befehl", too.
>
>I personally am happy to go this way. However, this should
>be done in a separate patch t
Hi,
all good.
Acked-by: Phillip Sz
>Signed-off-by: Ralf Thielow
>---
> po/de.po | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/po/de.po b/po/de.po
>index c682aaf..be30642 100644
>--- a/po/de.po
>+++ b/po/de.po
>@@ -592,7 +592,7 @@
27;."
A Space is missing: "Fehler beim Hinzufügen von Packdatei '%s'."
#: run-command.c:1229
-#, fuzzy, c-format
+#, c-format
msgid "cannot create async thread: %s"
-msgstr "kann Thread nicht erzeugen: %s"
+msgstr "Kann Thread für async nicht erzeugen: %s"
I think we should use "Konnte" here.
Best regards,
Phillip
l?
>>
>
>What about "Datenstrom"?
Yeah, that would work.
Phillip
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
aus)"
>
+msgstr "Anstatt des Namens die E-Mail-Adresse des Autors anzeigen
(Standard: aus)" is better.
All other strings are fine.
Phillip
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
d". Since the
>possible values
>are either "check" or "on-demand", we shouldn't translate this string
>at all and
>should just write "check|on-demand" as shown in "git help push".
>
>Perhaps this message need to be adjusted and excl
Hi,
for my feeling Beobachten is better then Versionieren. Its more natural and
easier to understand, but okey ;)
Phillip
On 6 December 2014 20:28:49 CET, Ralf Thielow wrote:
>Suggested-by: Torsten Bögershausen
>Signed-off-by: Ralf Thielow
>---
> p
Hi,
looks good!
Phillip
> po/de.po | 39 +++
> 1 file changed, 15 insertions(+), 24 deletions(-)
>
>diff --git a/po/de.po b/po/de.po
>index 2fa5832..70ca3ff 100644
>--- a/po/de.po
>+++ b/po/de.po
>@@ -3129,9 +3129,8 @@ msgid "
Thanks a lot for fixing!
Phillip
>
>Let's apply this instead.
>
>-- >8 --
>From: Phillip Sz
>Date: Sat, 21 Mar 2015 13:52:37 +0100
>Subject: [PATCH] l10n: de.po: add space before ellipsis
>
>Signed-off-by: Phillip Sz
>Signed-off-
>detail)
>and translate it as
>"'%s' ist hinter einem symbolischen Verweis"
>to match other similar messages?
>
Good idea, let's use that.
Phillip
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
ot;"
> -"über eine Binärsuche die Änderungen finden, die einen Fehler verursacht
> haben"
> +msgstr "Binärsuche verwenden, um den Commit finden, der einen Fehler "
> +"verursacht hat"
>
"Binärsuche verwenden, um den Commit zu finden, der einen Fehler
verursacht hat"
The rest is fine. Thanks.
Phillip
signature.asc
Description: OpenPGP digital signature
Acked-by: Phillip Sz
> Signed-off-by: Ralf Thielow
> ---
> po/de.po | 395
> ++-
> 1 file changed, 188 insertions(+), 207 deletions(-)
>
> diff --git a/po/de.po b/po/de.po
> index b6fa9b4..7354c59 100644
>
Acked-by: Phillip Sz
> Signed-off-by: Ralf Thielow
> ---
> po/de.po | 6 ++
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/po/de.po b/po/de.po
> index e5b523d..c9b4d16 100644
> --- a/po/de.po
> +++ b/po/de.po
> @@ -10530,9 +10530,8 @@ ms
just 2 strings I think we could translate better.
Signed-off-by: Phillip Sz
---
po/de.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/po/de.po b/po/de.po
index 6ed3509..2f54093 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10785,7 +10785,7 @@ msgid ""
"it
ring has been removed in 40147ec (l10n: de.po: translate 123
> new messages), so I've updated the commit accordingly.
>
Thanks, a lot!
> From: Phillip Sz
> Date: Thu, 17 Sep 2015 17:50:32 +0200
> Subject: [PATCH] l10n: de.po: better language for one string
>
> Just one str
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512
On 06/01/2015 04:58 PM, Jeff King wrote:
> How many processors do you have? The window-memory is per-thread.
> Try with --threads=1.
Ahh, right... 8... that explains it ;)
-BEGIN PGP SIGNATURE-
Version: GnuPG v1
iQEcBAEBCgAGBQJVbPMBAAoJEN
Acked-by: Phillip Sz
> Signed-off-by: Ralf Thielow
> ---
> po/de.po | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/po/de.po b/po/de.po
> index 7d603c2..945bd13 100644
> --- a/po/de.po
> +++ b/po/de.po
> @@ -5679,11 +5679,11
remote.c:2124
> #, c-format
> msgid "Your branch is based on '%s', but the upstream is gone.\n"
> msgstr "Ihr Branch basiert auf '%s', aber Upstream-Branch wurde entfernt.\n"
>
Maybe "Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde
entfernt.\n" ? I think we should use a full sentence, because it has a
dot at the end.
Phillip
signature.asc
Description: OpenPGP digital signature
rebase.missingCommitsCheck
Could not execute editor
$ git rebase --abort
No rebase in progress?
Best Wishes
Phillip
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org
On 28/07/16 14:02, Remi Galan Alfonso wrote:
> Hi Phillip,
>
> Phillip Wood writes:
>> When running ‘git rebase -i --autostash’ if the editor fails then the
>> rebase fails but stash is not applied so the working files are not
>> restored. Running ‘git rebase --abo
interactive.perl:1074
> #, perl-format
> msgid ""
> "---\n"
> "To remove '%s' lines, make them ' ' lines (context).\n"
> "To remove '%s' lines, delete them.\n"
> "Lines starting with %s will be removed.\n"
> msgstr ""
> +"---\n"
> +"Um '%s' Zeilen zu entfernen, machen Sie aus diesen ' ' Zeilen (Kontext).\n"
> +"Um '%s' Zeilen zu entferenen, löschen Sie diese.\n"
> +"Zeilen, die mit %s beginnen, werden entfernt.\n"
>
"Um '%s' Zeilen zu entfernen, löschen Sie diese.\n"
Anyway thanks a lot for your awesome work!
Phillip
Hi,
just found this while translating, sorry if this is intended.
Best regards,
Phillip
---
submodule.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/submodule.c b/submodule.c
index 3b98766a6..b064ed080 100644
--- a/submodule.c
+++ b/submodule.c
@@ -1181,7 +1181,7
Acked-by: Phillip Sz
> Signed-off-by: Ralf Thielow
> ---
> po/de.po | 750
> ++-
> 1 file changed, 409 insertions(+), 341 deletions(-)
>
> diff --git a/po/de.po b/po/de.po
> index 2326da1fd..e9c86f548 100644
Acked-by: Phillip Sz
> Signed-off-by: Ralf Thielow
> ---
> po/de.po | 80
>
> 1 file changed, 40 insertions(+), 40 deletions(-)
>
> diff --git a/po/de.po b/po/de.po
> index 5422ee3..8d1ccbb 100644
>
ot;
> +"Bitte beheben Sie das Hauptproblem und löschen Sie %s.\n"
> +"Ein automatisches Cleanup wird nicht ausgeführt, bis diese Datei entfernt\n"
> +"wurde.\n"
> +"\n"
> +"%s"
>
"Ein automatischer Cleanup wird nicht ausgeführt, bis diese Datei
entfernt\n"
"wurde.\n" ?
Merry Christmas.
Phillip
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
I also tried gitg, tig and hg commit -i
but I couldn't get them to do modified lines either)
I'll try and re-roll in the New Year, when does the outreachy project
for converting add -i start? - it would be good to try and get this
pinned down before then.
Best Wishes
Phillip
Ciao,
Dscho
On 30/11/2018 19:06, Johannes Schindelin wrote:
Hi,
On Fri, 30 Nov 2018, Phillip Wood wrote:
diff --git a/sequencer.c b/sequencer.c
index 900899ef20..11692d0b98 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -4394,24 +4394,29 @@ int sequencer_make_script(FILE *out, int argc, const
char **argv
On 06/12/2018 18:11, Stefan Beller wrote:
On Thu, Dec 6, 2018 at 6:58 AM Phillip Wood wrote:
So is there some "must be at least two consecutive lines" condition for
not-plain, or is something else going on here?
To be considered a block has to have 20 alphanumeric characters -
Hi Dscho and Slavica
On 11/12/2018 09:56, Johannes Schindelin wrote:
Hi Phillip,
[Cc:ing Slavica, the Outreachy intern working on converting `add -i` to a
built-in]
On Mon, 10 Dec 2018, Phillip Wood wrote:
On 09/12/2018 20:31, Johannes Schindelin wrote:
(which I take as being
Hi Junio
I just wanted to check that these patches are on your radar as they
haven't made it into pu yet.
Best Wishes for the New Year
Phillip
On 23/11/2018 11:16, Phillip Wood wrote:
From: Phillip Wood
Thanks to Stefan for his feedback on v1. I've updated patches 2 & 8
eractive.h b/add-interactive.h
> index 1f4747553c..a74c65b7e1 100644
> --- a/add-interactive.h
> +++ b/add-interactive.h
> @@ -5,4 +5,6 @@ int add_i_config(const char *var, const char *value, void
> *cbdata);
>
> void add_i_print_modified(void);
>
> +void show_help(void
n.
I normally use GIT_PAGER_IN_USE=1 to force colored output, is there some
reason that does not work here?
Best Wishes
Phillip
>
> Signed-off-by: Slavica Djukic
> ---
> color.c | 4
> perl/Git.pm | 2 +-
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
&
no changes introduced by the conversion to C.
Best Wishes
Phillip
> Signed-off-by: Slavica Djukic
> ---
> git-add--interactive.perl | 11 +--
> t/t3701-add-interactive.sh | 25 +
> 2 files changed, 26 insertions(+), 10 deletions(-
sing the merge, the result automerges to exactly
> the same thing (which would happen if both merges were the result of
> running the automerger on incremental versions of the same two
> changes), the divergence would instantly resolve itself because the
> two changes are aliases. Otherwise, this new divergence would be
> treated like any other and evolve would eventually try to apply the
> same algorithm recursively on the new divergent changes.
>
> I'll elaborate more on the supported transformations in the doc for
> the evolve command.
Thanks for the explanation, as you say it can get quite complicated so I
think good user documentation would be important. I'm conflicted about
having merge create non-merge commits as I think users are used to it
creating a commit with more than one parent. One of the things I found
difficult to understand when I first started using git was the
difference between a merge commit and performing a three-way merge. The
documentation tends just to use 'merge' when the two concepts are
somewhat orthogonal as rebase and cherry-pick use the same three-way
merge algorithm as 'git merge' but create commits with a single parent.
Best Wishes
Phillip
On 15/01/2019 13:50, Johannes Schindelin wrote:
Hi Phillip,
On Mon, 14 Jan 2019, Phillip Wood wrote:
Hi Salvica/Johannes
Close ;-)
Sorry Slavica
On 20/12/2018 12:09, Slavica Djukic via GitGitGadget wrote:
From: Slavica Djukic
To enable testing the colored output on Windows, enable
ishes
Phillip
$ git clone --shallow-since='11-1-2019'
https://github.com/illumos/illumos-gate.git
Cloning into 'illumos-gate'...
remote: Enumerating objects: 54348, done.
remote: Counting objects: 100% (54348/54348), done.
remote: Compressing objects: 100% (39008/39008), done.
r
Hi Michal
On 16/01/2019 21:36, Michal Nowak wrote:
Hello Phillip, thanks for reaching out.
This is what I see with your suggested command:
$ GIT_SEQUENCE_EDITOR=cat git rebase -i
08487eea68a2fa501b5042131c6db068089f82e1
hint: Waiting for your editor to close the file... pick 1ea94c756c
o anything when the program runs - if you have 'const char *s =
N_(hello);' you have to do '_(s)' to get the translated version. Here we
can just pass the untranslated string directly to gettext so it should
be _("show paths with changes"). Putting all that together we g
Hi Slavica
Thanks for moving this up, it's really good to add the test before the
conversion to C.
Best Wishes
Phillip
On 18/01/2019 07:47, Slavica Djukic via GitGitGadget wrote:
> From: Slavica Djukic
>
> Add test to t3701-add-interactive to verify that add_i_show_help()
>
Hi Slavica
On 18/01/2019 12:19, Slavica Đukić wrote:
Hi Phillip,
On 18-Jan-19 12:20 PM, Phillip Wood wrote:
Hi Slavica
I think this round is looking good I've got a couple of comments about
the translation of the help text but everything else looks fine to me
now. In future when y
item = todo_list.items, i = 0; i < todo_list.nr; i++, item++) {
I think the changes to this function would be clearer with
+ const char *arg = todo_list.buf.buf + item->arg_offset
here and then used arg instead of item->arg rather than calculating arg
twice.
Hi Dscho
On 21/01/2019 20:58, Johannes Schindelin wrote:
Hi Phillip,
On Tue, 11 Dec 2018, Phillip Wood wrote:
On 11/12/2018 09:56, Johannes Schindelin wrote:
On Mon, 10 Dec 2018, Phillip Wood wrote:
On 09/12/2018 20:31, Johannes Schindelin wrote:
I could imagine, however, that it
h is already
set up in earlier tests to avoid trailing whitespace in here documents.
You'll need to change
cat >expect <<-\EOF
to
cat >expect <<-EOF
to enable variable interpolation in the here document as well.
Best Wishes
Phillip
On 21/01/2019 09:13, Slavica Djukic via GitG
From: Phillip Wood
If the user gives an empty argument to --exec then the rebase starts to
run before erroring out with
error: missing arguments for exec
error: invalid line 2: exec
You can fix this with 'git rebase --edit-todo' and then run 'git rebase
--continue'
From: Phillip Wood
If GIT_SEQUENCE_EDITOR is set then rebase runs it when executing
implicit interactive rebases which are supposed to appear
non-interactive to the user. Fix this by setting GIT_SEQUENCE_EDITOR=:
rather than GIT_EDITOR=:. A couple of tests relied on the old behavior
so they are
Hi Dscho
On 28/01/2019 22:03, Johannes Schindelin wrote:
> Hi Phillip,
>
> On Mon, 28 Jan 2019, Phillip Wood wrote:
>
>> From: Phillip Wood
>>
>> If the user gives an empty argument to --exec then the rebase starts to
>> run before erroring out with
>&
Dear Junio & Dscho
On 28/01/2019 21:56, Johannes Schindelin wrote:
> Hi Junio,
>
> On Mon, 28 Jan 2019, Junio C Hamano wrote:
>
>> Phillip Wood writes:
>>
>>> From: Phillip Wood
>>>
>>> If the user gives an empty argument to --exec the
From: Phillip Wood
If the user gives an empty argument to --exec then git creates a todo
list that it cannot parse. The rebase starts to run before erroring out
with
error: missing arguments for exec
error: invalid line 2: exec
You can fix this with 'git rebase --edit-todo' an
ented out pick as
it ignores the value of insert. I think it's probably easiest to add an
INSERT_ARRAY macro to insert it in the right place. An alternative might
be to track the last insert position and only copy commands across when
there is another exec to insert but that might get compl
Hi Alban
On 31/01/2019 17:43, Alban Gruin wrote:
Hi Phillip and Michal,
I think I found the bug.
Good find! Which os are you on?
If you look at .git/rebase-merge/git-rebase-todo.backup, which is
created before the editor is opened, you can see that it does not have
this problem. In
Hi Alban
On 31/01/2019 20:37, Alban Gruin wrote:
Hi Phillip,
Le 31/01/2019 à 15:30, Phillip Wood a écrit :
Hi Alban
On 29/01/2019 15:01, Alban Gruin wrote:
This refactors sequencer_add_exec_commands() to work on a todo_list to
avoid redundant reads and writes to the disk.
Instead of
flags & ~(TODO_LIST_SHORTEN_IDS));
+ strbuf_stripspace(&new_todo->buf, 1);
+ if (initial && new_todo->buf.len == 0)
+ return -3;
- todo_list_release(&todo_list);
- return res;
+ if (!initial)
+ todo_list_parse_insn_buffer(r, new_todo->bu
obably be a separate series.
Thanks for working on this series, it's great to see the todo list
handling becoming more efficient.
Best Wishes
Phillip
Signed-off-by: Alban Gruin
---
builtin/rebase--interactive.c | 26 +-
sequencer
Hi Slavica
On 25/01/2019 12:37, Slavica Djukic wrote:
Hi Phillip,
Sorry for omitting you in Cc, again.
I accidentally wrote yours and Ævar's email prefixed with Cc:, rather
then separating
them with comma, like Johannes said I should.
Don't worry, thanks for emailing here. I&#x
On 31/01/2019 14:30, Phillip Wood wrote:
Hi Alban
On 29/01/2019 15:01, Alban Gruin wrote:
This refactors sequencer_add_exec_commands() to work on a todo_list to
avoid redundant reads and writes to the disk.
Instead of inserting the `exec' commands between the other commands and
re-parsin
On 28/03/2019 11:04, Duy Nguyen wrote:
On Wed, Mar 27, 2019 at 5:24 PM Phillip Wood wrote:
On 26/03/2019 15:48, Elijah Newren wrote:
On Tue, Mar 26, 2019 at 8:24 AM Duy Nguyen wrote:
On Tue, Mar 26, 2019 at 10:01 PM Elijah Newren wrote:
Yeah.. --ignore-in-process does not necessarily
Hi Elijah
On 28/03/2019 17:39, Elijah Newren wrote:
Hi Phillip,
On Thu, Mar 28, 2019 at 9:23 AM Phillip Wood wrote:
On 28/03/2019 11:04, Duy Nguyen wrote:
On Wed, Mar 27, 2019 at 5:24 PM Phillip Wood wrote:
On 26/03/2019 15:48, Elijah Newren wrote:
On Tue, Mar 26, 2019 at 8:24 AM Duy
From: Phillip Wood
Before commit 356ee4659b ("sequencer: try to commit without forking 'git
commit'", 2017-11-24) when --signoff or -x were given on the command
line the commit message was cleaned up with --cleanup=space or
commit.cleanup if it was set. Unfortunately this be
From: Phillip Wood
See the actual patches for a description of the fixes, I'm not sure
about the second one, see the notes on it. I'm going to be mostly
off-line for the next couple of weeks so it might take me a while to
respond to any comments.
Phillip Wood (2):
commit/reset: tr
From: Phillip Wood
If the user commits a conflict resolution using 'git commit' during a
sequence of picks then 'git status' missed the fact that a
cherry-pick/revert is still in progress.
Signed-off-by: Phillip Wood
---
Notes:
I'm not user about printing the o
From: Phillip Wood
When cherry-picking or reverting a sequence of commits and if the final
pick/revert has conflicts and the user uses `git commit` to commit the
conflict resolution and does not run `git cherry-pick --continue` then
the sequencer state is left behind. This can cause problems
Hi Junio
On 01/04/2019 09:28, Junio C Hamano wrote:
Phillip Wood writes:
From: Phillip Wood
When cherry-picking or reverting a sequence of commits and if the final
pick/revert has conflicts and the user uses `git commit` to commit the
conflict resolution and does not run `git cherry-pick
On 01/04/2019 09:34, Junio C Hamano wrote:
Phillip Wood writes:
From: Phillip Wood
If the user commits a conflict resolution using 'git commit' during a
sequence of picks then 'git status' missed the fact that a
cherry-pick/revert is still in progress.
How well woul
On 01/04/2019 11:09, Duy Nguyen wrote:
On Fri, Mar 29, 2019 at 11:32 PM Phillip Wood wrote:
From: Phillip Wood
When cherry-picking or reverting a sequence of commits and if the final
pick/revert has conflicts and the user uses `git commit` to commit the
conflict resolution and does not run
om
rebase--interactive as it will only be called by
git-rebase--preserve-merges.sh which only uses a subset of the current
options but that could always come separately later.
Best Wishes
Phillip
[1]
https://public-inbox.org/git/20190329110842.30604-1-phillip.wood...@gmail.com/
Hi Alban
sorry for the slow reply, I think you're probably off-list for a while
by now
On 21/03/2019 21:13, Alban Gruin wrote:
Hi Phillip,
It’s nice to see your work on this on the list.
Le 19/03/2019 à 20:03, Phillip Wood a écrit :
From: Phillip Wood
In order to run `rebase -i` wi
sed rebase does
not overwrite the ignored file. There has been some discussion about
introducing 'precious' files that are ignored but protected in the same
way as untracked files [1].
Best Wishes
Phillip
[1] https://public-inbox.org/git/20190409102649.22115-1-pclo...@gmail.com/
But
try and take a look at what's going sometime in the not
too distant future.
Best Wishes
Phillip
[1]
https://public-inbox.org/git/cacsjy8aez-lz6zgesunukvphb9tta9fac1gk05fhnie2xtf...@mail.gmail.com/T/#u
On Fri, Apr 12, 2019 at 9:30 AM Phillip Wood wrote:
Hi
On 12/04/2019 00:56, wh wrote:
From: Phillip Wood
If the user commits a conflict resolution using `git commit` in the
middle of a sequence of cherry-picks/reverts then `git status` missed
the fact that a cherry-pick/revert is still in progress.
Signed-off-by: Phillip Wood
---
sequencer.c| 35
From: Phillip Wood
I've updated the first patch as per Junio's suggestions and added
tests for revert as well as cherry-pick. I've also changed the second
patch to avoid printing the oid of the origin of the commit that's
just been created and added tests for revert as wel
From: Phillip Wood
When cherry-picking or reverting a sequence of commits and if the final
pick/revert has conflicts and the user uses `git commit` to commit the
conflict resolution and does not run `git cherry-pick --continue` then
the sequencer state is left behind. This can cause problems
f this is not an interactive rebase.
+* but this should be done if this is not an interactive rebase.
*/
- if (can_fast_forward(options.onto, &options.orig_head, &merge_base) &&
- !is_interactive(&options) && !options.restrict_rev
nder if some of the improvement is due to
ag/sequencer-reduce-rewriting-todo if that wasn't in master when you ran
the benchmarks but I haven't had time to investigate.
Best Wishes
Phillip
From: Denton Liu
If the user specifies an explicit cleanup mode then save and restore it
so that it is preserved by 'git cherry-pick --continue'.
Signed-off-by: Phillip Wood
---
sequencer.c | 28 +++-
1 file changed, 27 insertions(+), 1 deletion(-)
di
that messages are properly cleaned up.
Note that some newlines that were added to the commit message were
removed so that if a file were read via -F, it would be copied
faithfully.
Helped-by: Eric Sunshine
Signed-off-by: Phillip Wood
Signed-off-by: Denton Liu
---
Documentation/merge-options.txt
From: Denton Liu
Clean up the 'merge --squash c3 with c7' test by removing some
unnecessary braces and removing a pipe.
Also, generally cleanup style by unindenting a here-doc, removing stray
spaces after a redirection operator and allowing sed to open its own
input instead of redirecting input
From: Denton Liu
Fix a bug where the scissors line is placed after the Conflicts:
section, in the case where a merge conflict occurs and
commit.cleanup = scissors.
Helped-by: Phillip Wood
Signed-off-by: Denton Liu
---
Documentation/git-cherry-pick.txt | 7 +++
Documentation/git-revert.txt
From: Denton Liu
Signed-off-by: Denton Liu
---
builtin/commit.c | 25 ++---
sequencer.c | 29 +
sequencer.h | 6 ++
3 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index f17537474
From: Denton Liu
The --cleanup option is commonly used. Extract it so that its definition
is not repeated.
Helped-by: Phillip Wood
Signed-off-by: Denton Liu
---
builtin/commit.c | 2 +-
builtin/tag.c| 3 +--
parse-options.h | 1 +
3 files changed, 3 insertions(+), 3 deletions(-)
diff
From: Denton Liu
This fixes a bug where the scissors line is placed after the Conflicts:
section, in the case where a merge conflict occurs and
commit.cleanup = scissors.
Next, if commit.cleanup = scissors is specified, don't produce a
scissors line in commit if one already exists in the MERGE_M
From: Denton Liu
Remove space after redirection operators for style. Also, remove a git
command which was upstream of a pipe. Finally, let grep and sed open
their own input instead of letting the shell redirect the input.
Helped-by: SZEDER Gábor
Signed-off-by: Denton Liu
---
t/t3507-cherry-pi
From: Denton Liu
Refactor out Git commands that were upstream of a pipe. Remove spaces
after "> ". Indent here-docs appropriately. Convert echo chains to use
the test_write_lines function. Refactor 'sign off' test to use test_cmp
instead of comparing variables.
Helped-by: Eric Sunshine
Helped-b
From: Phillip Wood
With Denton's blessing I've rebased his patches on top of my patch to
fix the message cleanup with cherry-pick --signoff and -x [1]. I've
also refactored a couple of the patches and cleaned up the coding
style in places. The refactoring aims to simplify the
From: Denton Liu
Before, we had some Git commands which were upstream of the pipe. This
meant that if it produced an error, it would've gone unnoticed. Refactor
to place Git commands on their own.
Also, while we're at it, remove spaces after redirection operators.
Helped-by: Eric Sunshine
Help
On 17/04/2019 07:44, Denton Liu wrote:
On Tue, Apr 16, 2019 at 02:59:12PM +0100, Phillip Wood wrote:
Hi Denton
It's good to see rebase fast-forwarding properly when it should
On 15/04/2019 23:29, Denton Liu wrote:
Before, when we had the following graph,
A---B---C (m
From: Phillip Wood
Thanks for the feedback on the last version. I've updated the final
commit message to mention the speed up reported by Ævar. I've also
removed the translation of the trace strings. Apart from that this
series is unchanged. There shouldn't be any merge con
From: Phillip Wood
As the checkout runs in a separate process our index will be out of date
so it should be discarded. The existing callers are not doing this
consistently so do it here to avoid the callers having to worry about
it.
This fixes some test failures that happen if
From: Phillip Wood
commit b3a5d5a80c ("trace2:data: add subverb for rebase", 2019-02-22)
mistakenly marked the subverb names for translation and unnecessarily
NULL terminated the array.
Signed-off-by: Phillip Wood
---
builtin/rebase.c | 15 +++
1 file changed, 7 insert
From: Phillip Wood
This clashes with a function in sequencer.c
Signed-off-by: Phillip Wood
---
builtin/rebase.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 239a54ecfe..0b1a193a8e 100644
--- a/builtin/rebase.c
+++ b/builtin
From: Phillip Wood
As we have a macro for this it makes sense to use it. Having
cmd_rebase() and cmd_rebase__interactive() use the same values for
this option will be helpful when we start running interactive rebases
without forking rebase--interactive.
Signed-off-by: Phillip Wood
---
builtin
From: Phillip Wood
In order to run `rebase -i` without forking `rebase--interactive` it
will be convenient to have all the code from rebase--interactive.c in
rebase.c. This is a straight forward copy of the code from
rebase--interactive.c, it will be simplified slightly in the next
commit
From: Phillip Wood
path_state_dir() and merge_dir() refer to the same path so remove one of
them.
Signed-off-by: Phillip Wood
---
builtin/rebase.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 57a3c9caf1..610b67827b 100644
From: Phillip Wood
In order to run `rebase -i` without forking `rebase--interactive` it
will be convenient to use the same structure when parsing the options in
cmd_rebase() and cmd_rebase__interactive().
Signed-off-by: Phillip Wood
---
builtin/rebase.c | 203
From: Phillip Wood
When the builtin rebase starts an interactive rebase it parses the
options and then repackages them and forks
`rebase--interactive`. Separate the option parsing in
cmd_rebase__interactive() from the business logic to allow interactive
rebases can be run without forking
From: Phillip Wood
cmd_rebase() and cmd_rebase__interactive() used different enums to hold
the current action. Change to using a common enum so the values are the
same when we change `rebase -i` to avoid forking `rebase--interactive`.
Signed-off-by: Phillip Wood
---
builtin/rebase.c | 91
From: Phillip Wood
This is in preparation for using `struct rebase_options` when parsing
options in cmd_rebase__interactive(). Using a string for onto,
restrict_revision and upstream, was a hangover from the scripted version
of rebase. The functions that use these variables are updated to take a
From: Phillip Wood
More preparation for using `struct rebase_options` in
cmd_rebase__interactive(). Using a string was a hangover from the
scripted version of rebase, update the functions that use `squash_onto`
to take a `sturct object_id`.
Signed-off-by: Phillip Wood
---
builtin/rebase.c
1 - 100 of 976 matches
Mail list logo
