On Fri, 27 Sep 2019 11:00:58 +0100 Phillip Wood
wrote:
>
> [...]
Thanks for all the advice and improvements.
> [...]
> It's good to see the new test. Did you see Stolee's email [4] about the
> test coverage of the previous version of this series? You should check
> that this series tests all th
On Fri, 4 Oct 2019 10:37:43 +0100 Phillip Wood
wrote:
>
> > + if (opts->committer_date_is_author_date) {
> > + int len = strlen(author);
> > + struct ident_split ident;
> > + struct strbuf date = STRBUF_INIT;
> > +
> > + if (split_ident_line(&ident, autho
Hi Phillip
On Fri, 4 Oct 2019 10:29:36 +0100 Phillip Wood
wrote:
>
> [...]
> --rebase-merges now supports --strategy_option so we should fix this.
Yes, now that it supports --strategy_options I'll remove it from
here.
> [...]
Thanks
Rohit
On Sat, 7 Sep 2019 17:20:33 +0530 Rohit Ashiwal
wrote:
> [...]
> +test_expect_success '--ignore-date works with rebase -r' '
> + git checkout side &&
> + git merge commit3 &&
Should use --no-ff option to be sure that it handles "merge
rebase am already has this flag to "lie" about the author date
by changing it to the committer (current) date. Let's add the same
for interactive machinery.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 6 +--
builtin/rebase.c
The purpose of amend_author was to free() the malloc()'d string
obtained from get_author() while amending a commit. But we can
also use the variable to free() the author at our convenience.
Rename it to convey this meaning.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 6 +++---
1 file ch
The previous commit introduced --ignore-date flag to interactive
rebase, but the name is actually very vague in context of rebase -i
since there are two dates we can work with. Add an alias to convey
the precise purpose.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt | 1
. Wire the interactive
rebase to also understand the --ignore-whitespace flag by
translating it to -Xignore-space-change.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 13 -
builtin/rebase.c| 22 +++--
t/t3422-rebase-incompatible
push GIT_AUTHOR_DATE instead of providing it with --date so
that "git merge" can also use push_dates function
- add test for rebase -r
Rohit Ashiwal (6):
rebase -i: add --ignore-whitespace flag
sequencer: allow callers of read_author_script() to ignore fields
rebase -i: supp
author script.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index e0510a..adeff2561e 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -824,9 +824,19 @@ int read_author_script(const char
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| 10 ++--
builtin/rebase.c
Hey Everyone!
GSoC is finally over and I present to you my final report[1].
Thanks for all your support and reviews without which this
would not be possible.
Thanks
Rohit
[1]: https://rashiwal.me/2019/final-report/
Hi Phillip
On Wed, Aug 21, 2019 at 12:10 AM Phillip Wood wrote:
>
> Thanks for spelling out exactly what this does. I had not appreciated
> the difference before. Does this mean that if I have a branch with some
> whitespace cleanups I'll get different results if I rebase it with the
> sequencer
Hi Everyone
Please ignore this patch. I forgot to clean the output dir before
sending this iteration.
Thanks
Rohit
On Tue, Aug 20, 2019 at 9:15 AM Rohit Ashiwal
wrote:
>
> I've tries to incorporated all the suggestions.
I've tried to incorporate all the suggestions.
rebase am already has this flag to "lie" about the author date
by changing it to the committer (current) date. Let's add the same
for interactive machinery.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 6 +--
builtin/rebase.c
. Wire the interactive
rebase to also understand the --ignore-whitespace flag by
translating it to -Xignore-space-change.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 13 -
builtin/rebase.c| 22 +++--
t/t3422-rebase-incompatible
The previous commit introduced --ignore-date flag to interactive
rebase, but the name is actually very vague in context of rebase -i
since there are two dates we can work with. Add an alias to convey
the precise purpose.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt | 1
The previous commit introduced --ignore-date flag to interactive
rebase, but the name is actually very vague in context of rebase -i
since there are two dates we can work with. Add an alias to convey
the precise purpose.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt | 1
The purpose of amend_author was to free() the malloc()'d string
obtained from get_author() while amending a commit. But we can
also use the variable to free() the author at our convenience.
Rename it to convey this meaning.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 6 +++---
1 file ch
it is leaving
a false impression that author should not be free()'d.
[1]: git show v2.0.0:git-am.sh
[2]: https://github.com/git/git/blob/v2.23.0/sequencer.c#L959
Rohit Ashiwal (6):
rebase -i: add --ignore-whitespace flag
sequencer: add NULL checks under read_author_script
rebas
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| 10 +++--
builtin/rebase.c
int_))
die(_("failed to read author date"));
/* needs to be free()'d */
return date;
Add NULL checks for better control over the information retrieved.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 16 +---
1 file changed, 13 insertions(+), 3 deletio
Hi All!
Here[1] is an update about the last week. Sorry for a late update.
I couldn't find time to post since we are in the middle of an
internship season.
Thanks for reading
Rohit
[1]: https://rashiwal.me/2019/another-iteration/
The purpose of amend_author was to free() the malloc()'d string
obtained from get_author() while amending a commit. But we can
also use the variable to free() the author at our convenience.
Rename it to convey this meaning.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 6 +++---
1 file ch
The previous commit introduced --ignore-date flag to interactive
rebase, but the name is actually very vague in context of rebase -i
since there are two dates we can work with. Add an alias to convey
the precise purpose.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt | 1
I've tried to work on all the suggestion in this revision.
Based on: 2e27de94d485a6da0c8e264c165e55100f1a13a8 (tag: v2.23.0-rc2)
Rohit Ashiwal (6):
rebase -i: add --ignore-whitespace flag
sequencer: add NULL checks under read_author_script
rebase -i: support --committer-date-is-author
rebase am already has this flag to "lie" about the author date
by changing it to the committer (current) date. Let's add the same
for interactive machinery.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 6 +--
builtin/rebase.c
. Wire the interactive
rebase to also understand the --ignore-whitespace flag by
translating it to -Xignore-space-change.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 10 +++-
builtin/rebase.c| 29 +--
t/t3422-rebase-incompatible
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| 8 +++-
builtin/rebase.c
int_))
die(_("failed to read author date"));
/* needs to be free()'d */
return date;
Add NULL checks for better control over the information retrieved.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 16 +---
1 file changed, 13 insertions(+), 3 deletio
Hi Phillip
On Thu, 8 Aug 2019 17:44:38 +0100 Phillip Wood
wrote:
>
> [...]
> > --ignore-whitespace::
> > + This flag is either passed to the 'git apply' program
> > + (see linkgit:git-apply[1]), or to 'git merge' program
> > + (see linkgit:git-merge[1]) as `-Xignore-space-change`,
> > +
Hi Junio and Dscho
On Thu, Aug 8, 2019 at 1:52 AM Junio C Hamano wrote:
>
> Johannes Schindelin writes:
>
> > On Tue, 6 Aug 2019, Rohit Ashiwal wrote:
> >
> >> @@ -1046,6 +1066,8 @@ static int run_git_commit(struct repository *r,
> >>
Hi Junio
On Wed, Aug 7, 2019 at 11:08 AM Junio C Hamano wrote:
>
> Rohit Ashiwal writes:
>
> > diff --git a/builtin/rebase.c b/builtin/rebase.c
> > index db6ca9bd7d..3c195ddc73 100644
> > --- a/builtin/rebase.c
> > +++ b/builtin/rebase.c
&g
Hi Junio
On Tue, 06 Aug 2019 14:58:38 -0700 Junio C Hamano wrote:
>
> [...]
> * ra/rebase-i-more-options (2019-07-23) 4 commits
> - SQUASH???
> - rebase -i: support --committer-date-is-author-date
> - sequencer: add NULL checks under read_author_script
> - rebase -i: add --ignore-whitespace f
rebase am already has this flag to "lie" about the author date
by changing it to the committer (current) date. Let's add the same
for interactive machinery.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 6 ++--
builtin/rebase.c
The previous commit introduced --ignore-date flag to interactive
rebase, but the name is actually very vague in context of rebase -i
since there are two dates we can work with. Add an alias to convey
the precise purpose.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt | 1
The purpose of amend_author was to free() the malloc()'d string
obtained from get_author(). But the name does not actually convey
this purpose. Rename it to something meaningful.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff
--committer-date-is-author-date flag. This behaviour is not actually
documented. I've made rebase -i to replicate this behaviour anyway.
Thanks
Rohit
[1]:
https://public-inbox.org/git/20190712185015.20585-1-rohit.ashiwal...@gmail.com/
Rohit Ashiwal (6):
rebase -i: add --i
. Wire the interactive
rebase to also understand the --ignore-whitespace flag by
translating it to -Xignore-space-change.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 10 +++-
builtin/rebase.c| 26 --
t/t3422-rebase-incompatible
int_))
die(_("failed to read author date"));
/* needs to be free()'d */
return date;
Add NULL checks for better control over the information retrieved.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 16 +---
1 file changed, 13 insertions(+), 3 deletio
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| 8 +++-
builtin/rebase.c
Hi Everyone!
Here[1] is an update about my last week and some insight on the
future work.
Thanks
Rohit
[1]: https://rashiwal.me/2019/the-discussion/
Hi Junio
On Fri, 19 Jul 2019 15:36:15 -0700 Junio C Hamano wrote:
>
> [...]
> Hmph, are we sure that author-script is always available at this
> point so that a call to read_author_date_or_die() is safe? There
> are three callers to the run_git_commit() function and I am not sure
> if codepaths
Hey Everyone!
Here an update about my last week[1]. There were reviews on
patches I submitted which need to be accounted. There is also
some _mess_ (commit ordering and merging topics) that needs to
be taken out. Polishing them will teach rebase -i some new flags!
Thanks
Rohit
[1]: https://rashi
Hi Elijah
On Sat, 27 Jul 2019 13:40:13 -0700 Elijah Newren wrote:
>
> Let me attempt to answer on Junio's behalf...
:)
> [...]
> There are four, including Junio's commit he had to add in order to
> make the series merge with pu (a rename of your t3431 to the
> unoccupied t3433 slot). He label
Hi Junio
On Thu, 25 Jul 2019 17:19:23 -0700 Junio C Hamano wrote:
>
> [...]
> [New Topics]
>
> * bb/grep-pcre2-bug-message-fix (2019-07-23) 1 commit
> (merged to 'next' on 2019-07-23 at 8bd5a68618)
> + grep: print the pcre2_jit_on value
>
> BUG() message fix.
>
> The codepath may want to
. Wire the interactive
rebase to also understand the --ignore-whitespace flag by
translating it to -Xignore-space-change.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 10 +++-
builtin/rebase.c| 26 --
t/t3422-rebase-incompatible
This revision removes --ignore-whitespace from rebase--interactive since its
only caller preserve-merges is now deprecated. Also rename t3431 to t3433.
Rohit Ashiwal (1):
rebase -i: add --ignore-whitespace flag
Documentation/git-rebase.txt| 10 +++-
builtin/rebase.c
Hi Junio
On Fri, 19 Jul 2019 14:33:49 -0700 Junio C Hamano wrote:
>
> > t/t3431-rebase-options-compatibility.sh | 66 +
>
> Isn't 3431 already taken?
It is not in git/git[1].
> > 5 files changed, 97 insertions(+), 6 deletions(-)
> > create mode 100755 t/t3431-rebase-
Hi Phillip
On Mon, 22 Jul 2019 11:00:40 +0100 Phillip Wood
wrote:
>
> [...]
> >
> > + if (opts->ignore_whitespace) {
> > + struct strbuf buf = STRBUF_INIT;
> > +
> > + if (opts->strategy_opts)
> > + strbuf_addstr(&buf, opts->strategy_opts);
> > +
> > +
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", &opts.autosquash,
> > N_("move commits that beg
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
int_))
die(_("failed to read author date"));
/* needs to be free()'d */
return date;
Add NULL checks for better control over the information retrieved.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 16 +---
1 file changed, 13 insertions(+), 3 deletio
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
. Wire the interactive
rebase to also understand the --ignore-whitespace flag by
translating it to -Xignore-space-change.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 9 +++-
builtin/rebase.c| 26 --
sequencer.h
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
Hi Junio
On Mon, 15 Jul 2019 15:08:30 -0700 Junio C Hamano wrote:
>
> Doesn't it also come from handling OPT_STRING() via parse_options(),
> which gives a pointer from argv[], freeing something that is not
> allocated in the first place?
Ah! The path from cmd_rebase__interactive! A simple workar
Hi Junio
On Mon, 15 Jul 2019 10:57:18 -0700 Junio C Hamano wrote:
>
> Rohit Ashiwal writes:
>
> > + if (opts->ignore_whitespace) {
> > + struct strbuf buf = STRBUF_INIT;
> > +
> > + if (opts->strategy_opts)
> > +
Hey all!
Here is an update about my last week. I submitted two patches.
And currently, I'm working on porting --ignore-date flag to
the interactive rebase.
Best
Rohit
[1]: https://rashiwal.me/2019/tale-of-two-patches/
On Sat, 13 Jul 2019 00:23:57 +0530 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-by: Rohit Ashiwal
> [...]
>
&
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
onflicts on the reviewer's part, I've based this patch
series on my previous patch series[1].
[1]:
https://public-inbox.org/git/20190712185015.20585-1-rohit.ashiwal...@gmail.com/
Rohit Ashiwal (2):
sequencer: add NULL checks under read_author_script
rebase -i: support --comm
int_))
die(_("failed to read author date"));
/* needs to be free()'d */
return date;
Add NULL checks for better control over the information retrieved.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 16 +---
1 file changed, 13 insertions(+), 3 deletio
. Wire the interactive
rebase to also understand the --ignore-whitespace flag by
translating it to -Xignore-space-change.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 9 +++-
builtin/rebase.c| 24 +++--
sequencer.h
t
ways. Fixing these differences in edge cases is left for future work.
Rohit Ashiwal (1):
rebase -i: add --ignore-whitespace flag
Documentation/git-rebase.txt| 9 +++-
builtin/rebase.c| 24 +++--
sequencer.h | 1 +
Hi Everyone!
Here is the update about the last week[1]. I'm about to complete all
the code needed to support --committer-date-is-author-date for the
interactive rebase. Also, I'll be sending one more patch about the
flag that I implemented last week, "--ignore-whitespace", also for
the rebase -i.
Hi Philip
On 2019-07-05 14:09 UTC Philip Oakley wrote:
>
> Will there also be an opportunity for a listen/read -only mode for those
> of us on the lower reaches of the contributor list? I'd certainly like
> to at least keep up with progress.
+1
It'd really be a nice addition if contributors, li
the process of teaching revert and cherry-pick "how to skip commits".
Signed-off-by: Rohit Ashiwal
---
Documentation/git-cherry-pick.txt | 4 +-
Documentation/git-revert.txt | 4 +-
Documentation/sequencer.txt | 4 ++
builtin/revert.c |
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 Ashiwal
---
builtin/commit.c| 13
Another revision of my patch which takes care of all the nits.
Rohit Ashiwal (5):
sequencer: add advice for revert
sequencer: rename reset_for_rollback to reset_merge
sequencer: use argv_array in reset_merge
cherry-pick/revert: add --skip option
cherry-pick/revert: advise using --skip
In the case of merge conflicts, while performing a revert, we are
currently advised to use `git cherry-pick --`.
Introduce a separate advice message for `git revert`. Also change
the signature of `create_seq_dir` to handle which advice to display
selectively.
Signed-off-by: Rohit Ashiwal
evert: introduce --abort to cancel a failed
cherry-pick", 2011-11-23). Change the name to reset_merge to make
it more intuitive.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 0ef2622a69..
Avoid using magic numbers for array size and index under `reset_merge`
function. Use `argv_array` instead. This will make code shorter and
easier to extend.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a
Hi Junio
On Fri, 28 Jun 2019 15:17:42 -0700 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_
Hey Everyone!
Here[1] is an update of my past week.
Thanks
Rohit
[1]: https://rashiwal.me/2019/first-evaluation/
trols whether to
display advice when any sequencer command is in progress.
Signed-off-by: Rohit Ashiwal
---
Documentation/config/advice.txt | 2 ++
advice.c| 2 ++
advice.h| 1 +
3 files changed, 5 insertions(+)
diff --git a/Documentation/config/advi
the process of teaching revert and cherry-pick "how to skip commits".
Signed-off-by: Rohit Ashiwal
---
Documentation/git-cherry-pick.txt | 4 +-
Documentation/git-revert.txt | 4 +-
Documentation/sequencer.txt | 4 ++
builtin/revert.c |
Tied all loose ends. Add an advice config variable to guard advise() call
in 2/6.
Rohit Ashiwal (6):
advice: add sequencerInUse config variable
sequencer: add advice for revert
sequencer: rename reset_for_rollback to reset_merge
sequencer: use argv_array in reset_merge
cherry-pick
Avoid using magic numbers for array size and index under `reset_merge`
function. Use `argv_array` instead. This will make code shorter and
easier to extend.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a
to display
selectively.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 35 +--
1 file changed, 29 insertions(+), 6 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index f88a97fb10..0ef2622a69 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -2650,15 +2650,38
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 Ashiwal
---
builtin/commit.c| 13
evert: introduce --abort to cancel a failed
cherry-pick", 2011-11-23). Change the name to reset_merge to make
it more intuitive.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 0ef2622a69..cb856bc
Hi Everyone!
Last week was not so productive so, this post is a bit shorter.
Thanks
Rohit
[1]: https://rashiwal.me/2019/unproductive-week/
the process of teaching revert and cherry-pick "how to skip commits".
Signed-off-by: Rohit Ashiwal
---
Documentation/git-cherry-pick.txt | 4 +-
Documentation/git-revert.txt | 4 +-
Documentation/sequencer.txt | 4 ++
builtin/revert.c |
I've covered the advice message behind `advice_resolve_conflict` variable and
changed the order of error and advice to match that of 1/5. I believe that we
don't have any advice variable appropriate for advice in 1/5.
Rohit Ashiwal (5):
sequencer: add advice for revert
sequenc
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 Ashiwal
---
builtin/commit.c| 13
to display
selectively.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 34 --
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index f88a97fb10..c644368b54 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -2650,15 +2650,37
evert: introduce --abort to cancel a failed
cherry-pick", 2011-11-23). Change the name to reset_merge to make
it more intuitive.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index c644368b54..12f2605
Avoid using magic numbers for array size and index under `reset_merge`
function. Use `argv_array` instead. This will make code shorter and
easier to extend.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a
Hi Phillip
On 2019-06-20 11:42 UTC Phillip Wood wrote:
>
> 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 c
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 unrelated &&
> > + git commit -m "untrack unrelated" &&
> > + test_m
Hi Junio
On Wed, 19 Jun 2019 20:40:50 -0700 Junio C Hamano wrote:
>
> Two comments.
>
> The places touched by patch 1/5 emitted the error followed by an
> advice message; this new one breaks the pattern by giving the "hint:"
> first and then error. Be consistent by swapping these two (and
> retu
the process of teaching revert and cherry-pick "how to skip commits".
Signed-off-by: Rohit Ashiwal
---
Documentation/git-cherry-pick.txt | 4 +-
Documentation/git-revert.txt | 4 +-
Documentation/sequencer.txt | 4 ++
builtin/revert.c |
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 Ashiwal
---
builtin/commit.c| 13
Avoid using magic numbers for array size and index under `reset_merge`
function. Use `argv_array` instead. This will make code shorter and
easier to extend.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a
to display
selectively.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 34 --
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index f88a97fb10..c644368b54 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -2650,15 +2650,37
evert: introduce --abort to cancel a failed
cherry-pick", 2011-11-23). Change the name to reset_merge to make
it more intuitive.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index c644368b54..12f2605
- Removed _() from BUG() messages
- Rearrange comments under `sequencer_skip`. I have not changed switch-case to
if-else since the former looked better to me
Thanks
Rohit Ashiwal (5):
sequencer: add advice for revert
sequencer: rename reset_for_rollback to reset_merge
sequencer: use
evert: introduce --abort to cancel a failed
cherry-pick", 2011-11-23). Change the name to reset_merge to make
it more intuitive.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index d80e1c3fbb..
1 - 100 of 187 matches
Mail list logo
