Hi Dscho
On 30/04/2019 23:49, Johannes Schindelin wrote:
Hi Phillip,
On Tue, 30 Apr 2019, Phillip Wood wrote:
On 29/04/2019 17:07, Johannes Schindelin wrote:
On Fri, 26 Apr 2019, Phillip Wood wrote:
From: Phillip Wood
When `rebase -r` finishes it removes any refs under refs/rewritten
Hi Duy
On 01/05/2019 14:11, Nguyễn Thái Ngọc Duy wrote:
> nd/switch-and-restore suggests 'git merge --quit' to get out of a merge
> even though this option is not implemented [1]. It's a soft dependency, no
> actual functionality is broken by the lack of --quit, so I'm sending
> it separately.
Bo
From: Phillip Wood
If a merge can be fast-forwarded then make sure that we still edit the
commit message if the user specifies -c. The implementation follows the
same pattern that is used for ordinary rewords that are fast-forwarded.
Signed-off-by: Phillip Wood
---
Thanks to Dscho for his
qmjkuzd@assigned-by-dhcp.cox.net/T/#u
[3]https://public-inbox.org/git/pine.lnx.4.64.0610081657400.3...@g5.osdl.org/
On Fri, Apr 12, 2019 at 9:30 AM Phillip Wood wrote:
Hi
On 12/04/2019 00:56, wh wrote:
I'm using git 2.20.1 from Debian. Git is usually careful not to
overwrite un
Hi Dscho
On 03/05/2019 10:21, Johannes Schindelin wrote:
Hi Phillip,
On Wed, 1 May 2019, Phillip Wood wrote:
On 30/04/2019 23:49, Johannes Schindelin wrote:
On Tue, 30 Apr 2019, Phillip Wood wrote:
On 29/04/2019 17:07, Johannes Schindelin wrote:
On Fri, 26 Apr 2019, Phillip Wood wrote
On 02/05/2019 11:38, Duy Nguyen wrote:
On Wed, May 1, 2019 at 5:14 PM Phillip Wood wrote:
From: Phillip Wood
Currently there is no way to get git to discard changes to the
worktree without overwriting untracked files. `reset --hard`,
`checkout --force`, `checkout :/` and `read-tree --reset
On 03/05/2019 11:28, Duy Nguyen wrote:
On Fri, May 3, 2019 at 5:25 PM Christian Spanier wrote:
Hi,
I found a bug where Git may delete untracked files without notice in
certain situations. This bug effects Git 2.21.0 both on Linux and Windows.
In summary this happens when git pull merges a com
On 02/05/2019 11:53, Duy Nguyen wrote:
On Wed, May 1, 2019 at 9:58 PM Phillip Wood wrote:
On 01/05/2019 11:31, Duy Nguyen wrote:
On Wed, May 1, 2019 at 5:14 PM Phillip Wood wrote:
From: Phillip Wood
These two patches teach read-tree how to avoid overwriting untracked
files when doing
Hi Junio
On 05/05/2019 05:02, Junio C Hamano wrote:
Phillip Wood writes:
I've had a look at the rebase -i code and I think it only overwrites
ignored files when it is fast-forwarding. This matches what merge does
when fast-forwarding but I'm not convinced either of them should be
On 07/05/2019 17:07, Junio C Hamano wrote:
SZEDER Gábor writes:
This patch and the topic 'pw/rebase-abort-clean-rewritten' can't be
compiled on its own, because it starts using 'struct replay_opts'
here, which is defined in 'sequencer.h', but 'builtin/rebase.c'
doesn't include that header yet.
On 08/05/2019 18:23, Junio C Hamano wrote:
* pw/rebase-abort-clean-rewritten (2019-05-08) 1 commit
- rebase --abort: cleanup refs/rewritten
(this branch uses pw/rebase-i-internal.)
"git rebase --abort" used to leave refs/rewritten/ when concluding
"git rebase -r", which has been correcte
Hi Dscho
On 10/05/2019 14:49, Johannes Schindelin wrote:
Hi Phillip,
On Thu, 9 May 2019, Phillip Wood wrote:
On 08/05/2019 18:23, Junio C Hamano wrote:
* pw/rebase-abort-clean-rewritten (2019-05-08) 1 commit
- rebase --abort: cleanup refs/rewritten
(this branch uses pw/rebase-i
From: Phillip Wood
When `rebase -r` finishes it removes any refs under refs/rewritten that
it has created. However if the user aborts or quits the rebase refs are
not removed. This can cause problems for future rebases. For example I
recently wanted to merge a updated version of a topic branch
From: Phillip Wood
refs/rewritten/ is now cleaned up on --quit as well as --abort. I've
also added a patch to make sequencer_remove_state() to return any
errors, so rebase now always reports any errors that occur when
cleaning up the state directory.
These patches are still based on pw/reb
From: Phillip Wood
If rebase --quit cannot remove the state directory then it dies. However
when rebase finishes normally or the user runs rebase --abort any errors
that occur when removing the state directory are ignored. That is fixed
by this commit.
All of the callers of finish_rebase
From: Phillip Wood
If there is an error when removing the state directory then we should
report it. This matches what the non-interactive rebase does.
Signed-off-by: Phillip Wood
---
sequencer.c | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/sequencer.c b
From: Phillip Wood
buf was never freed.
Signed-off-by: Phillip Wood
---
builtin/rebase.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 82bd50a1b4..90037c9c45 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -2168,6 +2168,7 @@ int
Hi Dscho
Sorry it's taken me so long to get round to replying to this
On 22/03/2019 14:06, Johannes Schindelin wrote:
Hi,
On Thu, 13 Sep 2018, Phillip Wood wrote:
On 03/09/2018 20:01, Jochen Sprickerhof wrote:
* Phillip Wood [2018-08-30 14:47]:
When $newhunk is created it is mark
Hi
On 03/06/2019 14:40, Johannes Schindelin wrote:
Hi Phillip,
On Sun, 2 Jun 2019, Phillip Wood wrote:
On 22/03/2019 14:06, Johannes Schindelin wrote:
On Thu, 13 Sep 2018, Phillip Wood wrote:
On 03/09/2018 20:01, Jochen Sprickerhof wrote:
* Phillip Wood [2018-08-30 14:47]:
We could
Hi Rohit
Congratulations on your first GSoC patch series!
On 08/06/2019 20:19, Rohit Ashiwal wrote:
> In the case of merge conflicts, while performing a revert, we are
> currently advised to use `git cherry-pick --`
> of which --continue is incompatible for continuing the revert.
> Introduce a se
Hi Rohit
--skip is definitely a useful addition to cherry-pick/revert
On 08/06/2019 20:19, Rohit Ashiwal wrote:
> git am or rebase advise the user to use `git (am | rebase) --skip` to
> skip the commit. cherry-pick and revert also have this concept of
> skipping commits but they advise the user t
Hi Rohit
On 08/06/2019 20:19, Rohit Ashiwal wrote:
> Signed-off-by: Rohit Ashiwal
> ---
> builtin/commit.c | 13 -
> sequencer.c | 4 ++--
> 2 files changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/builtin/commit.c b/builtin/commit.c
> index 1c9e8e2228..1f47c51bdc 10
Hi Rohit
On 10/06/2019 06:13, Rohit Ashiwal wrote:
> Hi Philip
>
> On 2019-06-09 17:52 UTC Phillip Wood wrote:
>>
>> Hi Rohit
>>
>> Congratulations on your first GSoC patch series!
>
> Thank you very much :)
>
>> On 08/06/2019 20:19, Rohit
Hi Rohit
On 10/06/2019 06:57, Rohit Ashiwal wrote:
> Hey Phillip
>
> On Sun, 9 Jun 2019 19:01:35 +0100 Phillip Wood
> wrote:
>>
>> Hi Rohit
>>
>> --skip is definitely a useful addition to cherry-pick/revert
>>
>> On 08/06/2019 20:19, Rohit Ashi
Hi Rohit
On 10/06/2019 06:28, Rohit Ashiwal wrote:
> Hey Phillip
>
> On Sun, 9 Jun 2019 19:03:02 +0100 Phillip Wood
> wrote:
>>
>> Hi Rohit
>>
>> On 08/06/2019 20:19, Rohit Ashiwal wrote:
>>> [...]
>>> @@ -2654,8 +2654,8 @@ static i
Hi Rohit
On 10/06/2019 14:25, Rohit Ashiwal wrote:
> Hi Phillip
>
> On 2019-06-10 10:39 UTC Phillip Wood wrote:
>>
>> Hi Rohit
>>
>> On 10/06/2019 06:13, Rohit Ashiwal wrote:
>>>
>>> [...]
>>> Firstly, signature of `create_seq_d
Hi Rohit
On 10/06/2019 14:43, Rohit Ashiwal wrote:
> Hi Phillip
>
> On 2019-06-10 10:40 UTC Phillip Wood wrote:
>>
>> [...]
>> It's actually a bit more complicated as if the cherry-pick failed
>> because it would have overwriten untracked files then CHE
Hi Rohit
On 10/06/2019 14:33, Rohit Ashiwal wrote:
> Hi Phillip
>
> On 2019-06-10 10:40 UTC Phillip Wood wrote:
>>
>> Hi Rohit
>>
>> On 10/06/2019 06:28, Rohit Ashiwal wrote:
>>> Hey Phillip
>>>
>>> On Sun, 9 Jun 2019 19:03:02 +0100
Hi Rohit
Thanks for the new version, this is looking pretty good now, just a few
comments below
On 11/06/2019 08:31, Rohit Ashiwal wrote:
git am or rebase have a --skip flag to skip the current commit if the
user wishes to do so. During a cherry-pick or revert a user could
likewise skip a com
Hi Rohit
On 11/06/2019 08:31, Rohit Ashiwal wrote:
The previous commit introduced a --skip flag for cherry-pick and
revert. Update the advice messages, to tell users about this less
cumbersome way of skipping commits. Also add tests to ensure
everything is working fine.
Signed-off-by: Rohit Ash
On 12/06/2019 19:11, Junio C Hamano wrote:
Phillip Wood writes:
Thanks for the new version, this is looking pretty good now, just a
few comments below
I agree that this step is looking pretty good now.
I didn't check closely, but when 1/3 undergoes necessary polishing,
it may
On 13/06/2019 17:24, Jeff King wrote:
> On Thu, Jun 13, 2019 at 09:05:16AM -0700, Junio C Hamano wrote:
>
>> aleksan...@ledovskis.lv writes:
>>
>>> My repo indeed contains a ".git/sequencer/todo" file which
>>> contains references to commits long-gone (i.e., rebased).
>>> Renaming or deleting this
On 13/06/2019 05:05, Rohit Ashiwal wrote:
> In the case of merge conflicts, while performing a revert, we are
> currently advised to use `git cherry-pick --`
> of which --continue is incompatible for continuing the revert.
> Introduce a separate advice message for `git revert`. Also change
> the si
Hi Rohit
This is definitely moving in the right direction.
On 13/06/2019 05:05, Rohit Ashiwal wrote:
> git am or rebase have a --skip flag to skip the current commit if the
> user wishes to do so. During a cherry-pick or revert a user could
> likewise skip a commit, but needs to use 'git reset' (
From: Phillip Wood
The synopsis for am shows the command mode options as
(--continue | --skip | --abort | --quit)
They are on a single line and in parenthesis as they are not
optional. Fix the merge and rebase docs to match this style.
---
This patch is based on top of nd/merge-quit.
The
On 17/06/2019 03:02, Elijah Newren wrote:
> On Sun, Jun 16, 2019 at 6:29 AM Phillip Wood
> wrote:
>>
>> From: Phillip Wood
>>
>> The synopsis for am shows the command mode options as
>> (--continue | --skip | --abort | --quit)
>> They are on a sing
On 16/06/2019 23:33, Junio C Hamano wrote:
> Phillip Wood writes:
>
>> From: Phillip Wood
>>
>> The synopsis for am shows the command mode options as
>> (--continue | --skip | --abort | --quit)
>> They are on a single line and in parenthesis as they ar
From: Phillip Wood
The synopsis for am shows the command mode options as
(--continue | --skip | --abort | --quit)
They are on a single line and in parenthesis as they are not
optional. Fix the merge and rebase docs to match this style.
Signed-off-by: Phillip Wood
---
Notes:
This patch
Hi Dscho & Junio
On 17/06/2019 19:06, Johannes Schindelin wrote:
Hi Junio & Phillip,
On Fri, 14 Jun 2019, Junio C Hamano wrote:
* pw/rebase-abort-clean-rewritten (2019-05-15) 4 commits
- rebase --abort/--quit: cleanup refs/rewritten
- sequencer: return errors from sequencer_remove_state()
Hi Junio & dscho
On 18/06/2019 04:30, Junio C Hamano wrote:
Phillip Wood writes:
Yes I sent it just before I went offline, but that's a while ago now
Yup. IIRC, you told us not to look at the patch "for now" as you
would be offline, and I was fully expecting that a regu
On 20/06/2019 04:40, Junio C Hamano wrote:
Rohit Ashiwal writes:
+give_advice:
+ advise(_("have you committed already?\n"
+"try \"git %s --continue\""),
+action == REPLAY_REVERT ? "revert" : "cherry-pick");
+ return error(_("there is nothing to skip"
Hi Rohit
On 18/06/2019 18:06, Rohit Ashiwal wrote:
git am or rebase have a --skip flag to skip the current commit if the
user wishes to do so. During a cherry-pick or revert a user could
likewise skip a commit, but needs to use 'git reset' (or in the case
of conflicts 'git reset --merge'), follo
Hi Rohit
On 20/06/2019 11:34, Rohit Ashiwal wrote:
Hi Phillip
On 2019-06-20 10:02 UTC Phillip Wood wrote:
+test_expect_success 'allow skipping stopped cherry-pick because of untracked
file modifications' '
+ pristine_detach initial &&
+ git rm --cached u
Hi dscho and Gábor
On 24/06/2019 19:39, SZEDER Gábor wrote:
> On Wed, Jun 12, 2019 at 09:14:40PM +0200, Johannes Schindelin wrote:
>> Hi,
>>
>> On Tue, 11 Jun 2019, SZEDER Gábor wrote:
>>
>>> On Tue, Jun 11, 2019 at 01:36:16PM -0700, Junio C Hamano wrote:
SZEDER Gábor writes:
> -Reb
On 13/06/2019 18:43, Phillip Wood wrote:
On 13/06/2019 17:24, Jeff King wrote:
On Thu, Jun 13, 2019 at 09:05:16AM -0700, Junio C Hamano wrote:
Two issues "the sequencer" folks may want to address are
(1) make the one that reads an irrelevant/stale 'todo' file more
Please ignore the 'Wip' in the title, I forget to edit it on gitgitgadget
Best Wishes
Phillip
On 25/06/2019 11:11, Phillip Wood via GitGitGadget wrote:
If we cannot parse the oid in the sequencer todo file do not show an error
when running git status but instead report that a cher
On 25/06/2019 12:31, SZEDER Gábor wrote:
On Tue, Jun 25, 2019 at 11:08:04AM +0100, Phillip Wood wrote:
Rebasing (1/4)QRebasing (2/4)QRebasing (3/4)QRebasing (4/4)QQ
QSuccessfully
rebased and updated refs/heads
Hi Dscho
On 25/06/2019 12:38, Johannes Schindelin wrote:
Hi Phillip,
On Tue, 25 Jun 2019, Phillip Wood wrote:
On 24/06/2019 19:39, SZEDER Gábor wrote:
On Wed, Jun 12, 2019 at 09:14:40PM +0200, Johannes Schindelin wrote:
The other yucks affect the following four tests in
't3420-r
Hi René
On 25/06/2019 18:03, René Scharfe wrote:
> Am 25.06.19 um 12:11 schrieb Phillip Wood via GitGitGadget:
>> From: Phillip Wood
>>
>> Factor out the code that parses the name of the command at the start of
>> each line in the todo file into it's own function
Hi Gábor and Dscho
On 25/06/2019 12:31, SZEDER Gábor wrote:
> On Tue, Jun 25, 2019 at 11:08:04AM +0100, Phillip Wood wrote:
>>>> Rebasing (1/4)QRebasing (2/4)QRebasing (3/4)QRebasing (4/4)QQ
>>>>
Hi Junio
Thanks for the comments
On 25/06/2019 21:44, Junio C Hamano wrote:
"Phillip Wood via GitGitGadget" writes:
From: Phillip Wood
commit 4a72486de9 ("fix cherry-pick/revert status after commit",
2019-04-16) used parse_insn_line() to parse the first line of the t
Hi Junio
On 20/06/2019 05:35, Junio C Hamano wrote:
* pw/doc-synopsis-markup-opmode-options (2019-06-17) 1 commit
- show --continue/skip etc. consistently in synopsis
Docfix.
Will merge to 'next' and then to 'master'.
Thanks for fixing up the commit message an this one
Best Wishes
Ph
Dear Peff and Dscho
On 27/06/2019 22:10, Jeff King wrote:
> On Thu, Jun 27, 2019 at 02:00:54PM +0200, Johannes Schindelin wrote:
>
>>> We can use setvbuf() to toggle buffering back and forth, but I'm not
>>> sure if there's a way to query the current buffering scheme for a stdio
>>> stream.
>>
>>
Hi Junio and Dscho
On 28/06/2019 12:49, Johannes Schindelin wrote:
Hi Junio,
On Thu, 27 Jun 2019, Junio C Hamano wrote:
"Johannes Schindelin via GitGitGadget"
writes:
- if (options.reschedule_failed_exec && !is_interactive(&options))
+ if (reschedule_failed_exec > 0 && !is_inte
Hi Rohit
On 23/06/2019 21:03, Rohit Ashiwal wrote:
In the case of merge conflicts, while performing a revert, we are
currently advised to use `git cherry-pick --`
of which --continue is incompatible for continuing the revert.
I'm not sure why this says we cannot use --continue with revert, I t
On 28/06/2019 20:11, Thomas Gummerer wrote:
On 06/26, Junio C Hamano wrote:
* ra/cherry-pick-revert-skip (2019-06-24) 6 commits
- cherry-pick/revert: advise using --skip
- cherry-pick/revert: add --skip option
- sequencer: use argv_array in reset_merge
- sequencer: rename reset_for_ro
On 28/06/2019 23:08, Junio C Hamano wrote:
Phillip Wood writes:
I wonder if users understand that '-x' is "an interctive rebase".
The documentation can read both ways, and one of these may want to
be clarified.
-x , --exec
...
This uses the --i
On 26/06/2019 09:57, Phillip Wood wrote:
On 25/06/2019 21:44, Junio C Hamano wrote:
"Phillip Wood via GitGitGadget" writes:
From: Phillip Wood
commit 4a72486de9 ("fix cherry-pick/revert status after commit",
2019-04-16) used parse_insn_line() to parse the first line
Hi Rohit
Thanks for re-rolling again (and bearing with all the review rounds), I
think the range-diff looks good. These are ready for next as far as I'm
concerned.
Best Wishes
Phillip
On 02/07/2019 10:11, Rohit Ashiwal wrote:
Another revision of my patch which takes care of all the nits.
On 01/07/2019 22:01, Junio C Hamano wrote:
"Phillip Wood via GitGitGadget" writes:
progress output before comparing it to the expected output. We do this
by removing everything before the final "\r" on each line as we don't
care about the progress indicator, but
On 02/07/2019 18:23, Junio C Hamano wrote:
> Phillip Wood writes:
>
>>> As long as sed implementation used here does not do anything funny
>>> to CR, I think the approach to strip everything before the last CR
>>> on the line is sensible. As I am not familiar
On 03/07/2019 23:28, Junio C Hamano wrote:
> 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 hol
On 08/07/2019 23:02, Junio C Hamano wrote:
> Phillip Wood writes:
>
>>> * pw/rebase-progress-test-cleanup (2019-07-01) 1 commit
>>> - t3420: remove progress lines before comparing output
>>> (this branch uses sg/rebase-progress.)
>>>
>>> Test
Hi Rohit
It's good to see this patch reducing the differences between the rebase
backends.
On 18/07/2019 20:03, Rohit Ashiwal wrote:
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-b
Hi Rohit,
It's good to see another patch reducing the differences between the
rebase back ends.
On 18/07/2019 19:55, Rohit Ashiwal wrote:
> 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 n
g point of the rebase. I think
dscho's garden-shears script does something similar. Under the proposed
scheme if I subsequently edit the todo list it will not catch any
deleted commits as the original list is empty.
Best Wishes
Phillip
The idea to extend this feature was suggested to me mo
Hi Rohit
On 23/07/2019 20:57, Rohit Ashiwal wrote:
Hi Phillip
On Sat, 20 Jul 2019 15:56:50 +0100 Phillip Wood
wrote:
[...]
@@ -467,6 +470,9 @@ int cmd_rebase__interactive(int argc, const char **argv,
const char *prefix)
OPT_BOOL(0, "autosquash", &o
Hi Alban
On 25/07/2019 21:26, Alban Gruin wrote:
Hi Phillip,
Le 24/07/2019 à 15:29, Phillip Wood a écrit :
Hi Alban
Thanks for working on this, it's great to see you back on the list and I
think it would be a useful addition to rebase. Unfortunately I'm not
sure about this impl
Hi Andreas
On 30/07/2019 18:24, Andreas Wiesinger wrote:
Hello,
git revert for merges will mark merged files as deleted and commit
them as if they would have been deleted, but that is for sure never
what anybody would expect and has deleted many files unintentionally
and unrecognized in our rep
On 01/08/2019 14:25, Alexandr Miloslavskiy wrote:
On 31.07.2019 19:19, Jeff King wrote:
I don't have any real objection to adding stdin support for more
commands. Bu tin the specific case you're discussing, it seems like
using "git update-index" might already solve your problem. It's the
intende
On 06/08/2019 04:53, Junio C Hamano wrote:
Junio C Hamano writes:
Jonathan Nieder writes:
Some non-judgemental descriptive output like
$ git commit --amend --no-edit
No changes.
$
would address this case, without bothering people who are doing it
intentionally. So
Hi Junio
On 25/10/2018 09:59, Junio C Hamano wrote:
> Phillip Wood writes:
>
>> From: Phillip Wood
>>
>> Thanks to Eric for his feedback on v1. I've rerolled based on
>> that. Patches 1 & 2 are new and try to address some of the concerns
>> Eric
From: Phillip Wood
Add read_author_script() to sequencer.c based on the implementation in
builtin/am.c and update read_am_author_script() to use
read_author_script(). The sequencer code that reads the author script
will be updated in the next commit.
Signed-off-by: Phillip Wood
---
Notes
From: Phillip Wood
The caller is already prepared to handle errors returned from this
function so there is no need for it to die if it cannot read the file.
Suggested-by: Eric Sunshine
Signed-off-by: Phillip Wood
---
builtin/am.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff
From: Phillip Wood
Use the new function added in the last commit to read the author
script, updating read_env_script() and read_author_ident(). We now
have a single code path that reads the author script for am and all
flavors of rebase. This changes the behavior of read_env_script() as
From: Phillip Wood
If there are errors in a user edited author-script there was no
indication of what was wrong. This commit adds some specific error messages
depending on the problem. It also relaxes the requirement that the
variables appear in a specific order in the file to match the behavior
From: Phillip Wood
Thanks to Junio for the feedback on v2. I've updated patch 4 based on
those comments, the rest are unchanged.
v1 cover letter:
This is a follow up to pw/rebase-i-author-script-fix, it reduces code
duplication and improves rebase's parsing of the author script.
From: Phillip Wood
Rename read_author_script() in preparation for adding a shared
read_author_script() function to libgit.
Signed-off-by: Phillip Wood
---
builtin/am.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index d42b725273
Hi Alban
I like the direction this is going, it is an improvement on re-scanning
the list at the end of each function.
On 27/10/2018 22:29, Alban Gruin wrote:
This introduce a new function to recreate the text of a todo list from
its commands, and then to write it to the disk. This will be u
On 27/10/2018 22:29, Alban Gruin wrote:
This refactors sequencer_add_exec_commands() to work on a todo_list to
avoid redundant reads and writes to the disk.
An obvious way to do this would be to insert the `exec' command between
the other commands, and reparse it once this is done. This is not
On 31/10/2018 02:50, Junio C Hamano wrote:
> Phillip Wood writes:
>
>> From: Phillip Wood
>>
>> Thanks to Junio for the feedback on v2. I've updated patch 4 based on
>> those comments, the rest are unchanged.
>
> Hmph, all these five patches seem to be
From: Phillip Wood
Rename read_author_script() in preparation for adding a shared
read_author_script() function to libgit.
Signed-off-by: Phillip Wood
---
builtin/am.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index d42b725273
From: Phillip Wood
If there are errors in a user edited author-script there was no
indication of what was wrong. This commit adds some specific error messages
depending on the problem. It also relaxes the requirement that the
variables appear in a specific order in the file to match the behavior
From: Phillip Wood
Sorry for the confusion with v3, here are the updated patches.
Thanks to Junio for the feedback on v2. I've updated patch 4 based on
those comments, the rest are unchanged.
v1 cover letter:
This is a follow up to pw/rebase-i-author-script-fix, it reduces code
duplic
From: Phillip Wood
Add read_author_script() to sequencer.c based on the implementation in
builtin/am.c and update read_am_author_script() to use
read_author_script(). The sequencer code that reads the author script
will be updated in the next commit.
Signed-off-by: Phillip Wood
---
Notes
From: Phillip Wood
The caller is already prepared to handle errors returned from this
function so there is no need for it to die if it cannot read the file.
Suggested-by: Eric Sunshine
Signed-off-by: Phillip Wood
---
builtin/am.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff
From: Phillip Wood
Use the new function added in the last commit to read the author
script, updating read_env_script() and read_author_ident(). We now
have a single code path that reads the author script for am and all
flavors of rebase. This changes the behavior of read_env_script() as
Hi Junio
On 01/11/2018 03:01, Junio C Hamano wrote:
Phillip Wood writes:
From: Phillip Wood
Sorry for the confusion with v3, here are the updated patches.
Thanks to Junio for the feedback on v2. I've updated patch 4 based on
those comments, the rest are unchanged.
The mista
Hi Alban
On 01/11/2018 23:31, Alban Gruin wrote:
> Le 30/10/2018 à 17:47, Phillip Wood a écrit :
>> On 27/10/2018 22:29, Alban Gruin wrote:
>>> This refactors sequencer_add_exec_commands() to work on a todo_list to
>>> avoid redundant reads and writes to the disk.
&
Hi Alban
On 02/11/2018 16:26, Alban Gruin wrote:
Hi Phillip,
Le 02/11/2018 à 11:09, Phillip Wood a écrit :
+ struct todo_item *items = NULL,
+ base_item = {TODO_EXEC, NULL, 0, 0, commands_len, 0};
+
+ strbuf_addstr(buf, commands);
+ base_item.offset_in_buf = buf->
On 04/11/2018 07:22, Nguyễn Thái Ngọc Duy wrote:
When a commit is reverted (or cherry-picked with -x) we add an English
sentence recording that commit id in the new commit message. Make
these real trailer lines instead so that they are more friendly to
parsers (especially "git interpret-trailers"
Hi Duy
On 04/11/2018 17:41, Duy Nguyen wrote:
On Sun, Nov 4, 2018 at 5:45 PM Phillip Wood wrote:
On 04/11/2018 07:22, Nguyễn Thái Ngọc Duy wrote:
When a commit is reverted (or cherry-picked with -x) we add an English
sentence recording that commit id in the new commit message. Make
these
On 07/11/2018 09:41, Junio C Hamano wrote:
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 o
Hi Elijah
It's good to see these patches progressing, I've just got a couple of
comments related to Johannes' points below
On 12/11/2018 16:21, Johannes Schindelin wrote:
> Hi Elijah,
>
> On Wed, 7 Nov 2018, Elijah Newren wrote:
>
>> Interactive rebases are implemented in terms of cherry-pick r
I've just tried running
bin-wrappers/git rebase -C1 @^
and I get
error: unknown switch `1'
usage: git rebase [-i] [options] [--exec ] [--onto ]
[] []
or: git rebase [-i] [options] [--exec ] [--onto ]
--root []
or: git rebase --continue | --abort | --skip | --edit-todo
...
bin-wrappers/git
mentored Pratik to implement these options): OPT_PASSTHRU_ARGV.
It is intended for exactly this use case, where command-line options
want to be parsed into a separate `argv_array`.
Let's use this feature.
Incidentally, this also allows us to address a bug discovered by Phillip
Wood, wher
Hi Johannes
On 13/11/2018 19:21, Johannes Schindelin wrote:
Hi Phillip,
On Tue, 13 Nov 2018, Phillip Wood wrote:
Thanks for looking at this. Unfortunately using OPT_PASSTHRU_ARGV seems to
break the error reporting
Running
bin/wrappers/git rebase --onto @ @^^ -Cbad
Gives
git
Hi Johannes
Thanks for doing this, I think this patch is good. I've not checked the
first patch as I think it is the same as before judging from the
covering letter.
Best Wishes
Phillip
On 14/11/2018 16:25, Johannes Schindelin via GitGitGadget wrote:
From: Johannes Schindelin
It is a goo
From: Phillip Wood
'diff --color-moved-ws=allow-indentation-change' can color lines as
moved when they are in fact different. For example in commit
1a07e59c3e ("Update messages in preparation for i18n", 2018-07-21) the
lines
- die (_("must end with a colo
From: Phillip Wood
When using --color-moved-ws=allow-indentation-change allow lines with
the same indentation change to be grouped across blank lines. For now
this only works if the blank lines have been moved as well, not for
blocks that have just had their indentation changed.
This completes
101 - 200 of 906 matches
Mail list logo
