Am 03.04.2016 um 01:16 schrieb santi...@nyu.edu:
From: Santiago Torres
The verify_signed_buffer comand might cause a SIGPIPE signal when the
gpg child process terminates early (due to a bad keyid, for example) and
git tries to write to it afterwards. Previously, ignoring SIGPIPE was
done on the
Am 03.04.2016 um 08:24 schrieb Mehul Jain:
On Sun, Apr 3, 2016 at 12:20 AM, Johannes Sixt wrote:
Am 02.04.2016 um 19:58 schrieb Mehul Jain:
+for i in --autostash --no-autostash
+do
+ test_expect_success "pull $i (without --rebase) is illegal" '
+ test_must_fail git pull $i
On Sun, Apr 3, 2016 at 12:20 AM, Johannes Sixt wrote:
> Am 02.04.2016 um 19:58 schrieb Mehul Jain:
>> +for i in --autostash --no-autostash
>> +do
>> + test_expect_success "pull $i (without --rebase) is illegal" '
>> + test_must_fail git pull $i . copy 2>err &&
>> +
Imagine a merge where one side changes the content of a path and the
other changes the mode. Here's a minimal reproduction:
git init repo && cd repo &&
echo base >file &&
git add file &&
git commit -m base &&
echo changed >file &&
git commit -am content &&
git checkout -b side HEA
On Sat, Apr 02, 2016 at 07:16:15PM -0400, santi...@nyu.edu wrote:
> diff --git a/builtin/tag.c b/builtin/tag.c
> index 1705c94..3dffdff 100644
> --- a/builtin/tag.c
> +++ b/builtin/tag.c
> @@ -65,9 +65,10 @@ static int list_tags(struct ref_filter *filter, struct
> ref_sorting *sorting, con
> }
>
On Sat, Apr 02, 2016 at 07:16:14PM -0400, santi...@nyu.edu wrote:
> From: Santiago Torres
>
> The PGP verification routine for tags could be accessed by other
> commands that require it. We do this by moving it to the common tag.c
> code. We rename the verify_tag() function to pgp_verify_tag() t
On Sat, Apr 02, 2016 at 07:16:13PM -0400, santi...@nyu.edu wrote:
> The verify-tag command supports mutliple tag names as an argument.
s/mutliple/multiple/
> +test_expect_success GPG 'verify multiple tags' '
> + git verify-tag -v --raw fourth-signed sixth-signed seventh-signed
> 2>actual 1>
On Sat, Apr 02, 2016 at 07:16:12PM -0400, santi...@nyu.edu wrote:
> From: Santiago Torres
>
> The verify_signed_buffer comand might cause a SIGPIPE signal when the
> gpg child process terminates early (due to a bad keyid, for example) and
> git tries to write to it afterwards. Previously, ignori
On Sun, Apr 03, 2016 at 02:54:22PM +1200, Phil Sainty wrote:
> Given the following symbolic reference:
>
> $ git symbolic-ref refs/heads/m refs/heads/master
>
>
> Correct in 2.6.6:
>
> $ PATH=~/git/git-2.6.6:$PATH git branch
> m -> master
> * master
>
>
> Wrong in 2.7.0:
>
> $ PATH=~/git/
It is likely that I'll cut 2.8.1 with only the attached patch
Message-ID: <1459494651-32618-1-git-send-email-matthieu@imag.fr>
aka $gmane/290510
and I'll explicitly mark that this maintenance release is ignorable
by people other than those who build their own RPM packages from my
tree
Given the following symbolic reference:
$ git symbolic-ref refs/heads/m refs/heads/master
Correct in 2.6.6:
$ PATH=~/git/git-2.6.6:$PATH git branch
m -> master
* master
Wrong in 2.7.0:
$ PATH=~/git/git-2.7.0:$PATH git branch
m -> m
* master
Still wrong in current version 2.8.0:
$ PAT
Hi,
On Sat, Apr 2, 2016 at 5:25 PM, Benjamin Sandeen
wrote:
> Today, I managed to create a duplicate branch in a git repository. While
> this may not be a bug per se, I do think that it is confusing and some way
> of preventing such issues in the future may be helpful.
>
> I first cloned the rep
On Sat, Apr 2, 2016 at 8:25 PM, Benjamin Sandeen
wrote:
> Today, I managed to create a duplicate branch in a git repository. While
> this may not be a bug per se, I do think that it is confusing and some way
> of preventing such issues in the future may be helpful.
This can be confusing. I'll h
Signed-off-by: Ramsay Jones
---
Hi Xiaolong,
When you next re-roll your 'xy/format-patch-base' branch could you
please squash this (or something like it) into the relevant patch.
(commit 50ff6afd, "format-patch: add '--base' option to record base
tree info", 31-03-2016).
The pu branch, for me,
Today, I managed to create a duplicate branch in a git repository. While
this may not be a bug per se, I do think that it is confusing and some way
of preventing such issues in the future may be helpful.
I first cloned the repository:
$ git clone https://github.com/CodeForChicago/superclass.git
Add commit.verbose configuration variable as a convenience for those
who always prefer --verbose.
Helped-by: Junio C Hamano
Helped-by: Eric Sunshine
Signed-off-by: Pranit Bauva
---
The previous version of the patch are:
- [v11] $gmane/288820
- [v10] $gmane/288820
- [v9] $gmane/288820
- [v8
Signed-off-by: Pranit Bauva
---
Changes wrt previous version (v11):
- This patch is a split up of patch 1/4 v11 as requested by Junio.
- This patch uses the backslash with EOF as suggested by Junio
for 2 tests namely "detect possible typos"
---
t/t0040-parse-options.sh | 72
Current implementation of parse-options.c treats OPT__QUIET() as integer
and not boolean and thus it is more appropriate to print it as integer
to avoid confusion.
Signed-off-by: Pranit Bauva
---
t/t0040-parse-options.sh | 26 +-
test-parse-options.c | 2 +-
2 files
The reason to make it respect "unspecified" values is to give the
ability to differentiate whether `--option` or `--no-option` was
specified at all. "unspecified" values should be in the form of negative
values. If initial value is set to negative and `--option` specified
then it will reflect the n
Make the fake "editor" store output of grep in a file so that we can
see how many diffs were contained in the message and use them in
individual tests where ever it is required. Also use write_script()
to create the fake "editor".
A subsequent commit will introduce scenarios where it is important
From: Santiago Torres
The verify-tag command supports mutliple tag names as an argument.
However, no previous tests try to verify multiple tags at once. This
test runs the verify-tag command against three trusted tags (created
previously), and ensures that:
1) Three tags are verified app
From: Santiago Torres
Instead of running the verify-tag plumbing command, we use the
pgp_verify_tag(). This avoids the usage of an extra fork call. To do
this, we extend the number of parameters that tag.c takes, and
verify-tag passes. Redundant calls done in the pgp_verify_tag function
are remov
From: Santiago Torres
The PGP verification routine for tags could be accessed by other
commands that require it. We do this by moving it to the common tag.c
code. We rename the verify_tag() function to pgp_verify_tag() to avoid
conflicts with the mktag.c function.
Signed-off-by: Santiago Torres
From: Santiago Torres
The verify_signed_buffer comand might cause a SIGPIPE signal when the
gpg child process terminates early (due to a bad keyid, for example) and
git tries to write to it afterwards. Previously, ignoring SIGPIPE was
done on the builtin/gpg-verify.c command to avoid this issue.
This is a follow up of [1] and [2]:
v3 (this):
Thanks Eric, Jeff, for the feedback.
* I separated the patch in multiple sub-patches.
* I compared the behavior of previous git tag -v and git verify-tag
invocations to make sure the behavior is the same
* I dropped the multi-line comment, as
On Fri, Apr 01, 2016 at 11:10:56AM -0700, Junio C Hamano wrote:
> Jacob Nisnevich writes:
>
> > OK I add the quotes and modified the comment. I also changed $folder to
> > $sub_directory. I think that makes a little bit more sense and sounds a lot
> > better.
> >
> > Jacob Nisnevich (2):
> > m
Am 29.03.2016 um 22:05 schrieb Junio C Hamano:
> Johannes Sixt writes:
>
>> This part of your 45bf3297 (t1300: fix the new --show-origin tests on
>> Windows)
>>
>> @@ -1205,6 +1205,9 @@ test_expect_success POSIXPERM,PERL 'preserves existing
>> per
>>"die q(badrename) if ((stat(q(.git
Am 30.03.2016 um 07:52 schrieb Johannes Sixt:
Am 29.03.2016 um 21:18 schrieb Johannes Sixt:
It does pass. The reason is that pwd -W generates forward slashes.
It just occurred to me that we might be observing a difference in
behavior of pwd -W between the modern MSYS2 bash and the old MSYS1 ba
Am 02.04.2016 um 19:58 schrieb Mehul Jain:
These two tests are almost similar and thus can be folded in a for-loop.
Helped-by: Eric Sunshine
Signed-off-by: Mehul Jain
---
t/t5520-pull.sh | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/t/t5520-pull.sh b/t
Three tests contains repetitive lines of code.
Factor out common code into test_pull_autostash_fail() and then call it in
these tests.
Helped-by: Eric Sunshine
Signed-off-by: Mehul Jain
---
t/t5520-pull.sh | 26 +++---
1 file changed, 11 insertions(+), 15 deletions(-)
diff
"--[no-]autostash" option for git-pull is only valid in rebase mode(
i.e. either --rebase should be used or pull.rebase=true). Existing
tests already check the cases when --rebase is used but fails to check
for pull.rebase=true case.
Add two new tests to check that --[no-]autostash option works wi
These two tests are almost similar and thus can be folded in a for-loop.
Helped-by: Eric Sunshine
Signed-off-by: Mehul Jain
---
t/t5520-pull.sh | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index fb9f845..e12af96 100755
--
Four tests contains repetitive lines of code.
Factor out common code into test_pull_autostash() and then call it in
these tests.
Helped-by: Eric Sunshine
Signed-off-by: Mehul Jain
---
t/t5520-pull.sh | 44 +++-
1 file changed, 15 insertions(+), 29 deleti
Checking stderr output using test_i18ncmp may lead to test failure as
some shells write trace output to stderr when run under 'set -x'.
Use test_i18ngrep instead of test_i18ncmp.
Signed-off-by: Mehul Jain
---
t/t5520-pull.sh | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff
Test title says that tests are done with rebase.autostash unset,
but does not take any action to make sure that it is indeed unset.
This may lead to test failure if future changes somehow pollutes
the configuration globally.
Ensure consistent test conditions by explicitly unsetting
rebase.autostas
Signed-off-by: Mehul Jain
---
t/t5520-pull.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 745e59e..5be39df 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -267,7 +267,7 @@ test_expect_success 'pull --rebase --autostash &
r
The following series is applicable on mj/pull-rebase-autostash.
Thanks Eric and Junio for there comments on previous version[1]
Changes made vs v1:
* [Patch v1 4/5] is broken into three patches to increase
readability of the patches.
* [Patch 4/5] Factor
Gioele Barabucci writes:
> it seems to me that merge drivers are not called while merging commits
> that touch locally modified (but uncommited) files. Is this correct?
Yes. "git merge" first notices this situation and stops before it
has to decide which merge driver to use.
When you try to me
Pranit Bauva wrote:
On Sat, Apr 2, 2016 at 9:18 PM, マッチョコ太郎 wrote:
hi
I downloaded tarball (tar.gz) from git web site and tried to make rpm file.
But, when I run command "$rpmbuild -tb --clean git-2.8.0.tar.gz",
error message is displayed and rpm file creation stopped.
The error message is l
The README file moved to README.md in ad21f5 (README: use markdown
syntax, 2016-02-25).
Reported-by: マッチョコ太郎
Signed-off-by: Todd Zullinger
---
Hi,
マッチョコ太郎 wrote:
hi
I downloaded tarball (tar.gz) from git web site and tried to make rpm file.
But, when I run command "$rpmbuild -tb --clean gi
On Sat, Apr 2, 2016 at 9:18 PM, マッチョコ太郎 wrote:
> hi
> I downloaded tarball (tar.gz) from git web site and tried to make rpm file.
> But, when I run command "$rpmbuild -tb --clean git-2.8.0.tar.gz",
> error message is displayed and rpm file creation stopped.
> The error message is looks like this:
hi
I downloaded tarball (tar.gz) from git web site and tried to make rpm file.
But, when I run command "$rpmbuild -tb --clean git-2.8.0.tar.gz",
error message is displayed and rpm file creation stopped.
The error message is looks like this:
cp -pr README
~/rpmbuild/BUILDROOT/git-2.8.0-1.el7.centos
Hello,
it seems to me that merge drivers are not called while merging commits
that touch locally modified (but uncommited) files. Is this correct?
I made a (simple) merge driver for files in the `pw` format. [1] This
driver works correctly when a file is modified by multiple commits.
However, if
43 matches
Mail list logo
