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 Ashiwal wrote:
> >
> > [...]
> > @@ -2784,6 +2784,29 @@ int sequencer_rollback(struct repository *r, struct
> > replay
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 int create_seq_dir(void)
> > {
> > if (file_exists(git_path_seq_dir())) {
> > error(_("a cherry-pick or rever
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 Ashiwal wrote:
> > [...]
> > @@ -2655,6 +2655,7 @@ static int create_seq_dir(void)
> > if (file_exists(git_path_seq_di
In order to make this test work with multiple hash algorithms, compute
the object ID used in this test instead of hard-coding it.
Signed-off-by: brian m. carlson
---
t/t2203-add-intent.sh | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/t2203-add-intent.sh b/t/t2203-ad
This test uses several index hashes, which necessarily depend on the
version of the index and the hash algorithm in use. Use test_oid_cache
to provide values for these for both SHA-1 and SHA-256. Also, compute
an object ID and use $EMPTY_BLOB to make the remainder of the tests
independent of the
Replace several hard-coded full and partial object IDs with variables or
computed values. Create junk data to stuff inside an invalid tree that
can be either 20 or 32 bytes long. Compute a binary all-zeros object ID
instead of hard-coding a 20-byte length.
Additionally, compute various object ID
There are several places in our testsuite where we want to insert a
slash after an object ID to make it into a path we can reference under
.git/objects, and we have various ways of doing so. Add a helper to
provide a standard way of doing this that works for all size hashes.
Signed-off-by: brian
Instead of parsing object IDs using fixed-length shell patterns, use cut
to extract the first two characters of an object ID in addition to the
test helper for object paths. Update another test to look up an
appropriate object ID fragment from the all-zeros object ID instead of
hardcoding the valu
One assertion of this test checks for a shrinking cache tree. The
initial index contains a cache tree with two directory names but no
object ID, and the second index contains a cache tree with an object ID
but no directory name.
With SHA-1, the second index is smaller than the first, because the
This test uses a stub of a very large (64 GB) object to test our
generation of tar archives. In doing so, it uses the object ID of the
object so it can insert it into the database properly. Look up these
values using test_oid. Restructure the test slightly to use
test_oid_in_path.
Since we care
Update this test to use test_oid_cache to specify the object IDs for
both SHA-1 and SHA-256. Since this test now works with both algorithms,
remove the SHA1 prerequisite.
Signed-off-by: brian m. carlson
---
t/t1007-hash-object.sh | 58 +++---
1 file changed,
Several parts of this test generate files that have specific hard-coded
object IDs in them. We don't really care about what the object ID in
question is, so we turn them all to zeros.
However, because some of these values are fixed and some are generated,
they can be of different lengths, which c
This is an additional series of fixes for tests to make them work with
SHA-256.
Mostly, this series introduces a helper function and fixes tests. There
is one test (t1410) which adds an SHA1 prerequisite. I wasn't able to
get the math to work out when trying to compute the proper values for
SHA-25
Compute several object ID values instead of hard-coding them, and use
test_oid_to_path to cleanly produce a path for an object.
Note that the bisect code which is tested here remains sensitive to the
hash algorithm in use because it uses the object ID to disambiguate
between two equidistant commit
On Sun, Jun 9, 2019 at 11:21 PM SZEDER Gábor wrote:
>
> On Sun, Jun 09, 2019 at 10:24:55PM +0200, Christian Couder wrote:
> > On Sun, Jun 9, 2019 at 11:23 AM SZEDER Gábor wrote:
> > >
> > > New Perl dependencies always make Dscho sad... :)
> >
> > Yeah, I was not sure how to do it properly in she
On Sun, Jun 09, 2019 at 10:24:55PM +0200, Christian Couder wrote:
> On Sun, Jun 9, 2019 at 11:23 AM SZEDER Gábor wrote:
> >
> > On Sun, Jun 09, 2019 at 06:49:06AM +0200, Christian Couder wrote:
> > > +
> > > +test_oidmap() {
> > > + echo "$1" | test-tool oidmap $3 > actual &&
> > > + echo
On Sun, Jun 9, 2019 at 11:23 AM SZEDER Gábor wrote:
>
> On Sun, Jun 09, 2019 at 06:49:06AM +0200, Christian Couder wrote:
> > +
> > +test_oidmap() {
> > + echo "$1" | test-tool oidmap $3 > actual &&
> > + echo "$2" > expect &&
>
> Style nit: space between redirection op and filename.
Than
On 2019-06-08 at 14:43:43, Johannes Schindelin via GitGitGadget wrote:
> diff --git a/t/t0001-init.sh b/t/t0001-init.sh
> index 42a263cada..f54a69e2d9 100755
> --- a/t/t0001-init.sh
> +++ b/t/t0001-init.sh
> @@ -307,10 +307,20 @@ test_expect_success 'init prefers command line to
> GIT_DIR' '
>
On 06/09, Rohit Ashiwal wrote:
> > > PR: https://github.com/r1walz/git/pull/1
> > > Reviewed-by: Elijah Newren
> > > Reviewed-by: Thomas Gummerer
> >
> > Note that the 'Reviewed-by' footer is something that is "given" by the
> > reviewers, and should only be added after they have explicitly given
Hi Dscho,
On Sat, 8 Jun 2019 at 16:45, Johannes Schindelin via GitGitGadget
wrote:
>
> From: Johannes Schindelin
>
> On a case-insensitive filesystem, such as HFS+ or NTFS, it is possible
> that the idea Bash has of the current directory differs in case from
> what Git thinks it is. That's total
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
--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
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,
sorry for top-posting, but I just noticed the "firstlyxy" typo in the
subject ;-)
Ciao,
Dscho
On Sun, 9 Jun 2019, Johannes Schindelin wrote:
> Hi Matthew,
>
> On Thu, 6 Jun 2019, Matthew DeVore wrote:
>
> > Before this patch, "git branch" would put "(HEAD detached...)" and "(no
> > branch,
Hi,
I took on the task of creating a project for the translation of man-pages at
https://github.com/jnavila/git-manpages-l10n
Up to now, the translations have started for 3 languages:
* German (2 pages)
* Brazilian Portuguese (6 pages)
* French (11pages)
In order to provide feedback to transla
&body=https://www.porntrex.com/video/330589/award-season-tori-black
gabriel...@gmail.com
gabriel...@gmail.com
On Fri, Jun 07, 2019 at 03:59:00PM -0700, Emily Shaffer wrote:
> Teach show_object_with_name() to avoid writing a space before a name
> which is empty. Also teach tests for rev-list --objects --filter to not
> require a space between the object ID and name.
> [...]
> ---
> I don't see any reason _
On Tue, Jun 04, 2019 at 04:49:51PM -0700, Matthew DeVore wrote:
> I tried to do it anyway :) I think this makes the strbuf API a bit easier to
> reason about, and strbuf.h is a bit more self-documenting. WDYT?
>
> [...]
>
> +typedef int (*char_predicate)(char ch);
> +
> +int is_rfc3986_unreserved(
Hey Thomas
On Sun, Jun 9, 2019 at 2:32 PM Thomas Gummerer wrote:
>
> Thanks! I found a few minor nits that I missed in my off-list review
> on the PR. We should give others some time to comment now before you
> re-send it with the nits fixed (if you agree with them).
Yes, I'll wait for some mo
On Sun, Jun 09, 2019 at 06:49:06AM +0200, Christian Couder wrote:
> From: Christian Couder
>
> Add actual tests for operations using `struct oidmap` from oidmap.{c,h}.
>
> Signed-off-by: Christian Couder
> ---
> t/t0016-oidmap.sh | 100 ++
> 1 file c
On 06/09, Rohit Ashiwal wrote:
> git am or rebase advice user to use git am --skip or git rebase --skip
> to skip the commit that has become empty or has risen conflicts. OTOH,
> cherry-pick advice user to use git reset HEAD which on the user’s part
> is annoying and sometimes confusing. This patch
> Subject: [GSoC][PATCH 3/3] cherry-pick/revert: update hints
"update hints" is very generic when read in 'git log --oneline', and
doesn't give the reader much useful information. Maybe something like
cherry-pick/revert: advice using --skip
In the previous commit we introduced a
On 06/09, 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 to use `git reset` (or in
> case of a patch which had conflicts, `git reset --merge`
Hi Matthew,
On Thu, 6 Jun 2019, Matthew DeVore wrote:
> Before this patch, "git branch" would put "(HEAD detached...)" and "(no
> branch, rebasing...)" lines before all the other branches *in most
> cases* and only because of the fact that "(" is a low codepoint. This
> would not hold in the Chin
35 matches
Mail list logo
