On Thu, Aug 16, 2018 at 08:31:17PM +0200, Nguyễn Thái Ngọc Duy wrote:
> I just realized how often I type "git ci --amend". Looking back at my
> ~/.bash_history (only 10k lines) this is the second most often git
> command I type which may justify a short option for it (assuming that
> other people
On Sat, Jul 28, 2018 at 07:11:05AM +0200, Duy Nguyen wrote:
> static int checkout(int submodule_progress)
> {
> struct object_id oid;
> @@ -761,6 +785,11 @@ static int checkout(int submodule_progress)
> if (write_locked_index(_index, _file, COMMIT_LOCK))
> die(_("unable
On Sat, Jul 14, 2018 at 10:44:36PM +0100, Thomas Gummerer wrote:
> 'git rerere' is considered a plumbing command and as such its output
s/plumbing/porcelain/?
Regards
Simon
--
+ privacy is necessary
+ using gnupg http://gnupg.org
+ public key id: 0x92FEFDB7E44C32F9
On Fri, Jul 13, 2018 at 04:55:57PM +, g...@jeffhostetler.com wrote:
> diff --git a/Documentation/technical/structured-logging.txt
> b/Documentation/technical/structured-logging.txt
> new file mode 100644
> index 000..794c614
> --- /dev/null
> +++
On Thu, Jun 14, 2018 at 10:25:03PM -0400, Eric Sunshine wrote:
> The Makefile tweak NO_ICONV is meant to allow Git to be built without
> iconv in case iconv is not installed or is otherwise dysfunctional.
> However, NO_ICONV's disabling of iconv is incomplete and can incorrectly
> allow "-liconv"
On Thu, May 24, 2018 at 04:11:39PM -0400, Robert P. J. Day wrote:
> diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
> index 37b96c545..f98b7c6ed 100644
> --- a/Documentation/git-cvsserver.txt
> +++ b/Documentation/git-cvsserver.txt
> @@ -22,7 +22,7 @@ cvspserver
On Thu, May 17, 2018 at 12:46:51PM -0700, Stefan Beller wrote:
> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
> index bb9f1b7cd82..7b2527b9a19 100644
> --- a/Documentation/diff-options.txt
> +++ b/Documentation/diff-options.txt
> @@ -292,6 +292,19 @@ dimmed_zebra::
On Mon, Apr 23, 2018 at 11:39:33PM +, brian m. carlson wrote:
> [snip]
>
> diff --git a/upload-pack.c b/upload-pack.c
> index 4a82602be5..0858527c5b 100644
> --- a/upload-pack.c
> +++ b/upload-pack.c
> @@ -450,7 +450,7 @@ static int get_common_commits(void)
>
On Thu, Apr 19, 2018 at 02:10:40PM +0900, Junio C Hamano wrote:
> diff --git a/parse-options-cb.c b/parse-options-cb.c
> index c6679cb2cd..872627eafe 100644
> --- a/parse-options-cb.c
> +++ b/parse-options-cb.c
> @@ -38,7 +38,11 @@ int parse_opt_approxidate_cb(const struct option *opt,
> const
On Thu, Apr 19, 2018 at 01:26:18PM +0200, SZEDER Gábor wrote:
> On Thu, Apr 19, 2018 at 12:37 PM, Simon Ruderich wrote:
>> This doesn't occur on a non-parallel build.
>
> It does occur in non-parallel builds, too.
>
> See:
>
>
> https://p
Hello,
When running make -j$(nproc) with the current pu f9f8c1f765
(Merge branch 'hn/bisect-first-parent' into pu) I see the
following error:
GIT_VERSION = 2.17.0.732.gf9f8c1f765
* new build flags
* new prefix flags
GEN common-cmds.h
* new link flags
CC ident.o
CC hex.o
On Thu, Apr 19, 2018 at 10:52:47AM +0900, Junio C Hamano wrote:
> It turns out that prune silently goes away given a bad expiry
>
> $ git prune --expire=nyah ; echo $?
> 129
I noticed that git log --since/--after/--before/--until have a
similar behavior and ignore date parsing errors in
On Fri, Jan 26, 2018 at 01:37:00PM +0100, SZEDER Gábor wrote:
> [snip]
>
> diff --git a/t/t5812-proto-disable-http.sh b/t/t5812-proto-disable-http.sh
> index d911afd24..226a4920c 100755
> --- a/t/t5812-proto-disable-http.sh
> +++ b/t/t5812-proto-disable-http.sh
> @@ -21,8 +21,7 @@
On Mon, Jan 22, 2018 at 07:54:01PM -0500, Jeff King wrote:
> But anyway, that was a bit of a tangent. Certainly the smaller change is
> just standardizing on sizeof(*foo), which I think most people agree on
> at this point. It might be worth putting in CodingGuidelines.
Personally I prefer
On Mon, Jan 22, 2018 at 01:35:25PM +0100, Lars Schneider wrote:
>>> + enc->name = xstrdup_toupper(value); /* aways use upper case names! */
>>
>> "aways" -> "always" and I think the comment should say why
>> uppercase is important.
>
> Would that be better?
>
> /* Aways use upper case
On Sat, Jan 20, 2018 at 04:24:17PM +0100, lars.schnei...@autodesk.com wrote:
> +static struct encoding *git_path_check_encoding(struct attr_check_item
> *check)
> +{
> + const char *value = check->value;
> + struct encoding *enc;
> +
> + if (ATTR_TRUE(value) || ATTR_FALSE(value) ||
On Sat, Jan 13, 2018 at 08:22:11PM +0700, Nguyễn Thái Ngọc Duy wrote:
> [snip]
>
> For mode changes, executable bit is denoted as "(+x)" or "(-x)" when
> it's added or removed respectively. The same for when a regular file is
> replaced with a symlink "(+l)" or the other way "(-l)". This also
>
Remove any doubt that certificates might not be verified by
default.
Signed-off-by: Simon Ruderich <si...@ruderich.org>
---
Documentation/config.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3a1
On Wed, Nov 22, 2017 at 01:36:30PM +, Ævar Arnfjörð Bjarmason wrote:
> + *
> + * This is because if the pattern contains the
> + * (*NO_JIT) verb (see pcre2syntax(3))
> + * pcre2_jit_compile() will exit early with 0. If we
> + *
On Mon, Nov 06, 2017 at 05:13:15PM +0100, Simon Ruderich wrote:
> On Sat, Nov 04, 2017 at 10:07:00PM -0400, Jeff King wrote:
>> Yes, I think what you've written here (and below) is quite close to the
>> error_context patches I linked elsewhere in the thread. In other
>> words
On Sat, Nov 04, 2017 at 10:07:00PM -0400, Jeff King wrote:
> Yes, I think what you've written here (and below) is quite close to the
> error_context patches I linked elsewhere in the thread. In other
> words, I think it's a sane approach.
In contrast to error_context I'd like to keep all exiting
On Fri, Nov 03, 2017 at 03:13:10PM -0400, Jeff King wrote:
> I think we've been gravitating towards error strbufs, which would make
> it something like:
I like this approach to store the error in a separate variable
and let the caller handle it. This provides proper error messages
and is cleaner
On Wed, Nov 01, 2017 at 06:16:18PM -0400, Jeff King wrote:
> On Wed, Nov 01, 2017 at 10:46:14PM +0100, Johannes Schindelin wrote:
>> I spent substantial time on making the sequencer code libified (it was far
>> from it). That die() call may look okay now, but it is not at all okay if
>> we want to
On Thu, Nov 02, 2017 at 02:16:52PM +0900, Junio C Hamano wrote:
> Junio C Hamano writes:
>> This patch is incomplete without adjusting a handful of tests to
>> expect the updated messages, no?
>
> I'll squash these in while queuing, but there might be more that I
> didn't notice.
Sorry, didn't
Not checking close(2) can hide errors as not all errors are reported
during the write(2).
Signed-off-by: Simon Ruderich <si...@ruderich.org>
---
On Wed, Nov 01, 2017 at 02:00:11PM +0100, René Scharfe wrote:
> Most calls are not checked, but that doesn't necessarily mean they need
> t
All other error messages in the file use quotes around the file name.
This change removes two translations as "could not write to '%s'" and
"could not close '%s'" are already translated and these two are the only
occurrences without quotes.
Signed-off-by: Simon Ruderich
On Tue, Oct 31, 2017 at 10:54:21AM +0100, René Scharfe wrote:
> +static int rewrite_file(const char *path, const char *buf, size_t len)
> +{
> + int rc = 0;
> + int fd = open(path, O_WRONLY);
> + if (fd < 0)
> + return error_errno(_("could not open '%s' for writing"),
On Wed, Oct 25, 2017 at 03:46:18PM -0700, Stefan Beller wrote:
> On Mon, Oct 23, 2017 at 7:52 PM, Stefan Beller wrote[1]:
>> On Mon, Oct 23, 2017 at 6:54 PM, Junio C Hamano wrote:
>>>
>>> * As moved-lines display is mostly a presentation thing, I wonder
>>>if it makes sense to always match
On Fri, Oct 20, 2017 at 06:46:08PM -0400, Jeff King wrote:
>> I agree. Maybe just stick with the original patch?
>
> OK. Why don't we live with that for now, then. The only advantage of the
> "999" trickery is that it's less likely to come up again. If it doesn't,
> then we're happy. If it does,
On Thu, Oct 19, 2017 at 04:29:26PM -0400, Jeff King wrote:
> [snip]
>
> --- a/t/t4015-diff-whitespace.sh
> +++ b/t/t4015-diff-whitespace.sh
> @@ -1463,6 +1463,73 @@ test_expect_success 'move detection ignoring
> whitespace changes' '
> test_cmp expected actual
> '
>
> +test_expect_failure
On Tue, Oct 10, 2017 at 05:25:43AM -0400, Jeff King wrote:
> On Tue, Oct 10, 2017 at 11:23:19AM +0200, Simon Ruderich wrote:
>> On Tue, Oct 10, 2017 at 09:00:09AM +0900, Junio C Hamano wrote:
>>>> --- a/entry.c
>>>> +++ b/entry.c
>>>> @@ -283,6 +283,7
On Tue, Oct 10, 2017 at 09:00:09AM +0900, Junio C Hamano wrote:
>> --- a/entry.c
>> +++ b/entry.c
>> @@ -283,6 +283,7 @@ static int write_entry(struct cache_entry *ce,
>> if (dco && dco->state != CE_NO_DELAY) {
>> /* Do not send the blob in case of
On Tue, Oct 03, 2017 at 01:15:00PM -0700, Brandon Williams wrote:
> [snip]
>
> +protocol.version::
> + Experimental. If set, clients will attempt to communicate with a
> + server using the specified protocol version. If unset, no
> + attempt will be made by the client to communicate
On Sat, Sep 16, 2017 at 05:17:35PM +0530, Kaartic Sivaraam wrote:
>> References to other man pages generally use round brackets, for
>> example git-merge(1).
>
> I didn't know they had different meanings for different brackets in man
> pages. [snip]
Man pages in general use only round brackets to
On Sat, Sep 16, 2017 at 10:30:43AM +0530, Kaartic Sivaraam wrote:
> I was reading the 'git revert' documentation and found the following
> line in it,
>
> -m parent-number
> --mainline parent-number
>
> ...
>
> See the revert-a-faulty-merge How-To[1] for more details.
On Wed, Aug 30, 2017 at 06:59:22PM +, Jeff Hostetler wrote:
> [snip]
> +/*
> + * Re-enable item couting when adding/removing items.
> + * If counting is currently disabled, it will force count them.
The code always recounts them. Either the comment or the
code should be adjusted.
> + * This
Hello,
The following session reproduces the issue with Git 2.14.1:
$ git init test
$ cd test
$ echo x >file
$ git add file
$ git commit -m commit
$ printf 'a\nb\nx\nc\n' >file
$ git add -p
diff --git a/file b/file
index 587be6b..74a69a0 100644
--- a/file
On Fri, Aug 11, 2017 at 10:52:51AM +0200, René Scharfe wrote:
> Am 11.08.2017 um 09:50 schrieb Simon Ruderich:
>> On Thu, Aug 10, 2017 at 10:56:40PM +0200, René Scharfe wrote:
>>> getdelim(3) returns -1 at the end of the file and if it encounters an
>>> error, but se
On Thu, Aug 10, 2017 at 10:56:40PM +0200, René Scharfe wrote:
> getdelim(3) returns -1 at the end of the file and if it encounters an
> error, but sets errno only in the latter case. Set errno to zero before
> calling it to avoid misdiagnosing an out-of-memory condition due to a
> left-over value
On Fri, Jun 30, 2017 at 09:04:50AM -0700, Stefan Beller wrote:
> [snip]
>
> However
>
> context
> + moved line, block A or B
> + moved line, block A or B
> context
>
> is omitted, because the number of lines
> here is fewer than 3 ignoring the block
> type.
>
> Maybe
>
> If there are
On Thu, Jun 29, 2017 at 05:07:10PM -0700, Stefan Beller wrote:
> + Small blocks of 3 moved lines or fewer are skipped.
If I read the commit messages correctly, this "skipping" process
applies to the move detection in general for those smaller blocks
and therefore doesn't mean a malicious move
On Thu, Jun 22, 2017 at 01:55:27PM +, Patrick Lehmann wrote:
> The description on https://github.com/git/git doesn't reflect that policy.
>
> a)
> It explains that discussions take place in the mentioned mailing list.
> b)
> It describes how to subscribe.
However it doesn't say that you have
On Thu, Jun 22, 2017 at 01:35:33PM +, Patrick Lehmann wrote:
> But how can he write to the mailing list without a subscription?
> Is this a security bug or is he already subscribed?
Everybody can send to this mailing list. This is by design so
contributors/bug reporters can send mails without
Hello,
I'm using Git 2.13.1 (from the Debian sid repository) and noticed
the following issue when upgrading.
$ git diff --compaction-heuristic
error: invalid option: --compaction-heuristic
$ git diff --cached --compaction-heuristic
usage: git diff [] [ []] [--] [...]
I know
On Thu, Jun 22, 2017 at 11:50:01AM +0200, Jessie Hernandez wrote:
> subscribe git
You need to write to majord...@vger.kernel.org (with subscribe
git in the body) to subscribe.
Regards
Simon
--
+ privacy is necessary
+ using gnupg http://gnupg.org
+ public key id: 0x92FEFDB7E44C32F9
On Tue, Jun 20, 2017 at 08:49:59PM +0200, Ævar Arnfjörð Bjarmason wrote:
> If I understand you correctly this on top:
>
> diff --git a/usage.c b/usage.c
> index 1c198d4882..f6d5af2bb4 100644
> --- a/usage.c
> +++ b/usage.c
> @@ -46,7 +46,19 @@ static int
On Wed, May 17, 2017 at 06:45:31PM -0700, Manish Goregaokar wrote:
> Hm, my invocation of git-send-email keeps getting the threading wrong.
> Is there a recommended set of arguments to the command?
The threading looks fine here (for both cases where you mentioned
it being wrong). Why do you think
On Sat, May 13, 2017 at 11:45:32PM +, Ævar Arnfjörð Bjarmason wrote:
> [snip]
>
> +#ifdef PCRE_CONFIG_JIT
> + if (p->pcre1_jit_on)
> + ret = pcre_jit_exec(p->pcre1_regexp, p->pcre1_extra_info, line,
> + eol - line, 0, flags, ovector,
> +
On Sun, Apr 30, 2017 at 09:11:49PM +0200, Ralf Thielow wrote:
> #: config.c:1952
> #, c-format
> msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
> -msgstr ""
> +msgstr "Unbekannter Wert '%s' in core.untrackedCache; benutze Stardardwert
> 'keep'"
Listing the specific hooks might feel verbose but without it the
reader is left to wonder which hooks are triggered during the
push. Something which is not immediately obvious when only trying
to find out where the hook is executed.
Signed-off-by: Simon Ruderich <si...@ruderich.
Hello,
The following snippet reproduces the issue for me (note the
remote: line in its output):
git --version
rm -rf a b
git init a
cd a
echo first >data
git add data
git commit -m initial
cat >>.git/hooks/post-receive <>data
git add data
git commit -m
Hello,
I like the documentation update and test.
On Sat, Apr 08, 2017 at 11:41:00AM +, Ævar Arnfjörð Bjarmason wrote:
> [snip]
>
> ++
> +Now when the background process runs `git fetch origin` the references
> +on `origin-push` won't be updated, and thus commands like:
> ++
> + git push
On Tue, Jan 03, 2017 at 07:50:40PM -0500, Richard Hansen wrote:
> [snip]
> @@ -145,8 +148,13 @@ test_expect_success 'mergetool in subdir' '
> '
>
> test_expect_success 'mergetool on file in parent dir' '
> + git reset --hard &&
> + git checkout -b test$test_count branch1 &&
> + git
On Mon, Oct 31, 2016 at 02:49:42PM -0700, Junio C Hamano wrote:
> [snip]
Hello,
I noticed a few minor typos in the changelog.
> * The default abbreviation length, which has historically been 7, now
>scales as the repository grows, using the approximate number of
>objects in the
On Wed, Oct 26, 2016 at 10:52:23AM +0200, Johannes Schindelin wrote:
> diff --git a/attr.c b/attr.c
> index d5a6aa9..6933504 100644
> --- a/attr.c
> +++ b/attr.c
> @@ -50,7 +50,16 @@ static struct git_attr *(git_attr_hash[HASHSIZE]);
> #ifndef NO_PTHREADS
>
> static pthread_mutex_t attr_mutex;
>
Hello,
I'm seeing the following crash with Git 2.9.3 on Debian sid
(amd64):
$ git init foo
$ cd foo
$ touch x
$ git add x
$ git commit -m test
$ touch x.conf
$ git blame x.conf
segmentation fault
I've tested it on Debian stable's 2.1.4 which works fine:
$
On Tue, Apr 01, 2014 at 10:18:55AM -0400, Phillip Susi wrote:
I have seen some discussion about various changes to the format of the
index and pack files over time, but can't find anything about it in
the man pages. Are the different formats documented anywhere, and how
to tell which format
On Fri, Mar 21, 2014 at 05:13:24PM +0100, Matthias Beyer wrote:
Unfortunetely, we wrote our `make clean` task recursively. I think you
can imagine what went wrong: The clean-task corrupted the repository,
as it removed .idx files from within .git/.
I lost work because of this ugly name
On Fri, Mar 21, 2014 at 05:46:51PM +0100, Matthias Beyer wrote:
Hi Simon,
I think so. I executed:
git fsck # reports N missing blobs, commits, trees and dangling stuff
git index-pack ...
git fsck # reports only dangling commits and blobs
I don't know if this means that the
On Mon, Mar 10, 2014 at 01:22:15PM -0400, Jeff King wrote:
+test_expect_success 'git clean -d respects pathspecs' '
+ mkdir foo
+ mkdir foobar
+ git clean -df foobar
+ test_path_is_dir foo
+ test_path_is_missing foobar
+'
+
test_done
I think we should also test
Most distributions don't require Term::ReadKey as dependency, leaving
the user to wonder why the setting doesn't work.
Signed-off-by: Simon Ruderich si...@ruderich.org
---
On Mon, Mar 03, 2014 at 10:58:58AM -0800, Junio C Hamano wrote:
Thanks, but is it true that interactive.singlekey requries
Suggested-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Simon Ruderich si...@ruderich.org
---
git-add--interactive.perl | 3 +++
1 file changed, 3 insertions(+)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 24bb1ab..d3bca12 100755
--- a/git-add--interactive.perl
Most distributions don't require Term::Readkey as dependency,
leaving the user to wonder why the setting doesn't work.
Signed-off-by: Simon Ruderich si...@ruderich.org
---
Documentation/config.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/config.txt b
On Mon, Feb 24, 2014 at 05:21:40PM +0100, Matthieu Moy wrote:
One easy thing to do OTOH would be to show a hint at the end of git
stash pop's output, like
I think that's a good idea. It makes it obvious that Git has kept
the stash and that the user should drop it when he's done - if he
wants
Hello,
I just compiled Git v1.8.4.2 on Debian Wheezy amd64 and test
t5570 fails (with GIT_TEST_GIT_DAEMON=1):
--- expect 2013-10-28 23:27:26.792409631 +
+++ output 2013-10-28 23:27:26.788409614 +
@@ -1 +1,2 @@
+Cloning into 'nowhere'...
fatal: remote error:
On Fri, Aug 30, 2013 at 11:13:19AM -0700, Junio C Hamano wrote:
I think in this function the filehandle is called $fd, not $fh. Has
any of you really tested this???
I did, but I applied the change by hand without applying the
patch directly and didn't notice the difference. Sorry for that.
On Thu, Aug 29, 2013 at 04:26:29PM +0200, Ævar Arnfjörð Bjarmason wrote:
I haven't gotten an env where I can test gitweb running, but that
looks like it should work to me.
I've tested the patch and it works fine.
Tested-by: Simon Ruderich si...@ruderich.org
Regards
Simon
--
+ privacy
--
Subject: [PATCH] Documentation/diff-options.txt: -p doesn't display merge
changes
Signed-off-by: Simon Ruderich si...@ruderich.org
---
Documentation/diff-options.txt | 4
1 file changed, 4 insertions(+)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index
On Thu, Apr 11, 2013 at 06:55:03PM +0300, Barbu Paul - Gheorghe wrote:
Should I create a new patch removing them all?
Sounds like a good idea to me. And update the commit message with
Junio's suggestions.
Regards
Simon
--
+ privacy is necessary
+ using gnupg http://gnupg.org
+ public key id:
Signed-off-by: Simon Ruderich si...@ruderich.org
---
On Tue, Apr 02, 2013 at 11:39:51PM +0100, Philip Oakley wrote:
--- a/help.c
+++ b/help.c
@@ -240,6 +241,23 @@ void list_common_cmds_help(void)
}
}
+void list_common_guides_help(void)
+{
+ int i, longest = 0;
+
+ for (i
On Wed, Apr 10, 2013 at 11:44:03AM -0700, Junio C Hamano wrote:
The reason why we can run with sslverify=true against gmail is
because we know imap.gmail.com gives a validly signed certificate
that leads all the way to a root CA the user's OpenSSL installation
is likely to trust (if your
On Sun, Apr 07, 2013 at 03:32:00PM -0700, Jonathan Nieder wrote:
I'm not sure if it's better to use test_when_finished with rm or
just rm -rf tmp at the end of the test in case someone wants
to look at the output.
test_when_finished is better here, since it means later tests can
run and
Signed-off-by: Simon Ruderich si...@ruderich.org
---
On Tue, Apr 09, 2013 at 12:16:56PM -0700, Junio C Hamano wrote:
Sign-off?
Sorry, forgot it.
Perhaps adding ... to keep the state for inspection by the tester
to diagnose the bug or something is in order?
Good idea.
Revised patch
On Sun, Apr 07, 2013 at 12:46:23PM -0500, Felipe Contreras wrote:
[snip]
+test_expect_success 'cover letter auto' '
+ mkdir -p tmp
+ test_when_finished rm -rf tmp;
+ git config --unset format.coverletter
+
+ git config format.coverletter auto
test_config
-inp.fr
Signed-off-by: Simon Ruderich si...@ruderich.org
---
On Fri, Apr 05, 2013 at 09:40:21AM +0200, Matthieu Moy wrote:
While we're there, we could test -G --no-textconv too.
Hello Matthieu,
Good idea, I've added it.
Regards
Simon
diffcore-pickaxe.c | 12
t/t4209-log-pickaxe.sh
On Thu, Apr 04, 2013 at 01:48:52PM -0700, Junio C Hamano wrote:
If I am reading the code correctly, it is has_changes(), which is
used for log -S (not log -G that uses diff_grep()), that does
the unnecessary get_textconv() unconditionally. The way diff_grep()
divides the work to make
git log -S doesn't respect --no-textconv:
$ echo '*.txt diff=wrong' .gitattributes
$ git -c diff.wrong.textconv='xxx' log --no-textconv -Sfoo
error: cannot run xxx: No such file or directory
fatal: unable to read files to diff
Signed-off-by: Simon Ruderich si...@ruderich.org
Signed-off-by: Simon Ruderich si...@ruderich.org
---
diffcore-pickaxe.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index f814a52..c378ea0 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -75,10 +75,10
the textconv argument, therefore pass a pointer instead of
a pointer to a pointer.
Signed-off-by: Simon Ruderich si...@ruderich.org
---
Hello,
I've reordered the patches as requested and included Jeff's
cleanup patch.
Regards
Simon
diffcore-pickaxe.c | 23 ++-
1 file changed, 14
From: Jeff King p...@peff.net
fill_one is _almost_ identical to just calling fill_textconv; the
exception is that for the !DIFF_FILE_VALID case, fill_textconv gives us
an empty buffer rather than a NULL one.
Signed-off-by: Simon Ruderich si...@ruderich.org
---
On Thu, Apr 04, 2013 at 01:49:42PM
-inp.fr
Signed-off-by: Simon Ruderich si...@ruderich.org
---
diffcore-pickaxe.c | 12
t/t4209-log-pickaxe.sh | 14 ++
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 3124f49..26ddf00 100644
--- a/diffcore
From: Paul Campbell pcampb...@kemitix.net
Use of -a and -o in the [ command can have confusing semantics.
Use a separate test invocation for each single test, combining them with
and ||.
Signed-off-by: Paul Campbell pcampb...@kemitix.net
Signed-off-by: Simon Ruderich si...@ruderich.org
---
Hello,
This patch fixes a minor issue with git-am. When the
applypatch-hook modifies the commit message, git-am displays the
original message. This patch updates the message to use the
modified version.
Regards
Simon
git-am.sh | 8
1 file changed, 8 insertions(+)
diff --git
applypatch-hook can modify the commit message. Display the updated
commit message instead of the original one.
Signed-off-by: Simon Ruderich si...@ruderich.org
---
On Thu, Mar 21, 2013 at 12:36:00AM +0100, Matthieu Moy wrote:
Please, read SubmittingPatches in the Documentation directory
84 matches
Mail list logo
