(suggested)
behavior.
Michael J Gruber (4):
gpg-interface: provide clear helper for struct signature_check
gpg-interface: provide access to the payload
verify-commit: scriptable commit signature verification
t7510: test verify-commit
Documentation/git-verify-commit.txt | 28
, and callers may wish to act on or display the commit
object sans the signature.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
commit.c| 1 +
gpg-interface.c | 2 ++
gpg-interface.h | 1 +
3 files changed, 4 insertions(+)
diff --git a/commit.c b/commit.c
index fb7897c..acb74b5
otherwise, has the gpg output
on stderr and (optionally) the commit object on stdout, sans the
signature, just like verify-tag does.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/git-verify-commit.txt | 28 +++
Makefile| 1
The struct has been growing members whose malloced memory needs to be
freed. Do this with one helper function so that no malloced memory shall
be left unfreed.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/merge.c | 5 +
gpg-interface.c | 12
gpg
On 27. Juni 2014 21:32:30 MESZ, Junio C Hamano gits...@pobox.com wrote:
Michael J Gruber g...@drmicha.warpmail.net writes:
sed -e s/seventh/7th forged/ raw forged1
git hash-object -w -t commit forged1 forged1.commit
+! git verify-commit $(cat forged1.commit)
test_must_fail
The struct has been growing members whose malloced memory needs to be
freed. Do this with one helper function so that no malloced memory shall
be left unfreed.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/merge.c | 5 +
gpg-interface.c | 12
gpg
to be changed (in order to treat similar cases
similarly),
the latter would need a deprecation for git-verify-tag.
- I haven't looked yet at what happened over the weekend.
Michael J Gruber (5):
gpg-interface: provide clear helper for struct signature_check
gpg-interface: provide access to the payload
, and callers may wish to act on or display the commit
object sans the signature.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
commit.c| 1 +
gpg-interface.c | 2 ++
gpg-interface.h | 1 +
3 files changed, 4 insertions(+)
diff --git a/commit.c b/commit.c
index 881be3b..d0ad7f0
.
Additionally, test the actual output of git verify-commit and git
show --show-signature and compare to git cat-file.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7510-signed-commit.sh | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/t/t7510
t7510 uses for loops in a subshell, which need to make sure that the test
returns with the appropriate error code from within the loop.
Restructure the loops as the usual chains with a single point of
exit 1 at the end of the loop to make this clearer.
Signed-off-by: Michael J Gruber g
otherwise, has the gpg output
on stderr and (optionally) the commit object on stdout, sans the
signature, just like verify-tag does.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/git-verify-commit.txt | 28 +++
Makefile| 1
Junio C Hamano venit, vidit, dixit 13.06.2014 19:06:
Jeff King p...@peff.net writes:
I realize this isn't really your itch to scratch. It's just that when I
see a description like verify a commit, I wonder what exactly verify
means.
I think that is an important point. If a tool only
Michael Haggerty venit, vidit, dixit 13.06.2014 00:12:
I've been thinking a lot about merge bases lately and think I have
discovered something interesting.
tl;dr:
When two branches have multiple merge bases,
git merge-base $master $branch
picks one merge base more or less
Jeff King venit, vidit, dixit 13.06.2014 09:55:
On Fri, Jun 06, 2014 at 04:15:27PM +0200, Michael J Gruber wrote:
diff --git a/builtin/merge.c b/builtin/merge.c
[...]
+free(signature_check.payload);
free(signature_check.gpg_output
Jeff King venit, vidit, dixit 13.06.2014 10:02:
On Fri, Jun 06, 2014 at 04:15:28PM +0200, Michael J Gruber wrote:
Commit signatures can be verified using git show -s --show-signature
or the %G? pretty format and parsing the output, which is well suited
for user inspection
.
Additionally, test the actual output of git verify-commit and git
show --show-signature and compare to git cat-file.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7510-signed-commit.sh | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/t/t7510
4a868fd (pretty: parse the gpg status lines rather than the output, 2013-02-14)
made the gpg status lines available to callers and made sure they freed
the used space, but missed one spot.
Free the status line buffer also in the remaining spot.
Signed-off-by: Michael J Gruber g
Patch1: unchanged
Patch2: unchanged
Patch3: as fixed in Junio's tree already (===)
Patch4: minor test fix for t7510
Patch5: tests for the verify-commit
Patch6: make all struct signature_check users employ the same clear helper
Michael J Gruber (6):
pretty: free the gpg status buf
gpg
The struct has been growing members whose malloced memory needs to be
freed. Do this with one helper function so that no malloced memory shall
be left unfreed.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/merge.c | 6 +-
builtin/verify-commit.c | 5
, and callers may wish to act on or display the commit
object sans the signature.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/merge.c | 1 +
commit.c| 1 +
gpg-interface.h | 1 +
pretty.c| 1 +
4 files changed, 4 insertions(+)
diff --git a/builtin/merge.c b
otherwise, has the gpg output
on stderr and (optionally) the commit object on stdout, sans the
signature, just like verify-tag does.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/git-verify-commit.txt | 28 +++
Makefile| 1
When t7510 was introduced, the author made sure that a for loop in
a subshell would return with the appropriate error code.
Make sure this is true also the for the first line in each loop, which
was missed.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7510-signed-commit.sh
Jeff King venit, vidit, dixit 13.06.2014 13:19:
On Fri, Jun 13, 2014 at 12:42:45PM +0200, Michael J Gruber wrote:
+
+free(signature_check.gpg_output);
+free(signature_check.gpg_status);
+free(signature_check.signer);
+free(signature_check.key);
+return
Jeff King venit, vidit, dixit 13.06.2014 13:51:
On Fri, Jun 13, 2014 at 12:42:47PM +0200, Michael J Gruber wrote:
test_expect_success GPG 'detect fudged signature' '
git cat-file commit master raw
sed -e s/seventh/7th forged/ raw forged1
git hash-object -w -t commit
Jeff King venit, vidit, dixit 13.06.2014 13:46:
On Fri, Jun 13, 2014 at 12:42:46PM +0200, Michael J Gruber wrote:
When t7510 was introduced, the author made sure that a for loop in
a subshell would return with the appropriate error code.
Make sure this is true also the for the first line
Jeff King venit, vidit, dixit 13.06.2014 13:50:
On Fri, Jun 13, 2014 at 01:45:58PM +0200, Michael J Gruber wrote:
I sneekily fix this in 6/6... I thought 3/6 is on next already, too late
for a real v2. Otherwise I would put 6/6 before everything else.
Ah, yeah, I assumed we were still re
Michael J Gruber venit, vidit, dixit 13.06.2014 14:04:
Jeff King venit, vidit, dixit 13.06.2014 13:46:
On Fri, Jun 13, 2014 at 12:42:46PM +0200, Michael J Gruber wrote:
When t7510 was introduced, the author made sure that a for loop in
a subshell would return with the appropriate error code
Michael J Gruber venit, vidit, dixit 13.06.2014 14:22:
Michael J Gruber venit, vidit, dixit 13.06.2014 14:04:
Jeff King venit, vidit, dixit 13.06.2014 13:46:
On Fri, Jun 13, 2014 at 12:42:46PM +0200, Michael J Gruber wrote:
When t7510 was introduced, the author made sure that a for loop
Johannes Sixt venit, vidit, dixit 13.06.2014 14:54:
Am 6/13/2014 14:33, schrieb Michael J Gruber:
with this loop, sorry:
for X in true false; do
for Y in false true; do
($X $Y || exit 1)
done
echo $X/last inner $Y: $?
done
gives
true/last inner true: 0
Johannes Sixt venit, vidit, dixit 13.06.2014 15:21:
Am 6/13/2014 15:06, schrieb Michael J Gruber:
Johannes Sixt venit, vidit, dixit 13.06.2014 14:54:
Am 6/13/2014 14:33, schrieb Michael J Gruber:
with this loop, sorry:
for X in true false; do
for Y in false true; do
($X
On 6. Juni 2014 16:15:28 MESZ, Michael J Gruber g...@drmicha.warpmail.net
wrote:
Commit signatures can be verified using git show -s --show-signature
or the %G? pretty format and parsing the output, which is well suited
for user inspection, but not for scripting.
Provide a command verify
4a868fd (pretty: parse the gpg status lines rather than the output, 2013-02-14)
made the gpg status lines available to callers and made sure they freed
the used space, but missed one spot.
Free the status line buffer also in the remaining spot.
Signed-off-by: Michael J Gruber g
agree
upon.
Michael J Gruber (3):
pretty: free the gpg status buf
gpg-interface: provide access to the payload
verify-commit: scriptable commit signature verification
Documentation/git-verify-commit.txt | 28 +++
Makefile| 1 +
builtin.h
otherwise, has the gpg output
on stderr and (optionally) the commit object on stdout, sans the
signature, just like verify-tag does.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/git-verify-commit.txt | 28 +++
Makefile| 1
, and callers may wish to act on or display the commit
object sans the signature.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/merge.c | 1 +
commit.c| 1 +
gpg-interface.h | 1 +
pretty.c| 1 +
4 files changed, 4 insertions(+)
diff --git a/builtin/merge.c b
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Just a few things I spotted while trying to keep myself informed :)
Documentation/RelNotes/1.9.txt | 36 ++--
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/Documentation/RelNotes/1.9
Jonathan Nieder venit, vidit, dixit 03.12.2013 00:37:
When the built-in git tar-tree command (a thin wrapper around git
archive) was removed in 925ceccf (tar-tree: remove deprecated
command, 2013-11-10), the build continued to install a non-functioning
git-tar-tree command in gitexecdir by
Jim Garrison venit, vidit, dixit 05.11.2013 18:16:
I'm doing a one-time migration of an svn project. For historical reasons our
repo layout is weird:
trunk/reporting/reporting_app
tags/something_else
tags/reporting_app-2.3.45
tags/reporting_app-2.4.46
Junio C Hamano venit, vidit, dixit 22.05.2013 18:36:
Michael J Gruber g...@drmicha.warpmail.net writes:
* mg/more-textconv (2013-05-10) 7 commits
- grep: honor --textconv for the case rev:path
- grep: allow to use textconv filters
- t7008: demonstrate behavior of grep with textconv
Junio C Hamano venit, vidit, dixit 23.05.2013 16:40:
Michael J Gruber g...@drmicha.warpmail.net writes:
Didn't you have concerns about storing the context in the object struct?
I can't quite judge how much of an issue this can be for fsck and such.
I don't want to increase the memory
Junio C Hamano venit, vidit, dixit 21.05.2013 02:15:
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 final version of 1.8.3 is expected to be tagged late this week.
While applying a
BTW, I love our rev-list machinery:
log --graph --abbrev-commit --pretty=oneline --decorate --cherry-mark
--left-right mjg/grep-textconv...origin/next
701cdb7 Merge branch 'mg/more-textconv' into next
|\
| = afa15f3 (gitster/mg/more-textconv) grep: honor --textconv for the
case rev:path
| =
Felipe Contreras venit, vidit, dixit 16.05.2013 09:48:
Showing the tracking information for all the branches takes significant
amount of time. The user might not want that. The --no-show-tracking
option allows that.
I really like the idea of allowing that - not just because I've
suggested so
Felipe Contreras venit, vidit, dixit 16.05.2013 10:09:
On Thu, May 16, 2013 at 3:00 AM, Michael J Gruber
g...@drmicha.warpmail.net wrote:
Felipe Contreras venit, vidit, dixit 16.05.2013 09:48:
Showing the tracking information for all the branches takes significant
amount of time. The user
Duy Nguyen venit, vidit, dixit 16.05.2013 10:23:
On Thu, May 16, 2013 at 3:00 PM, Michael J Gruber
g...@drmicha.warpmail.net wrote:
I feel, though, that we're really exploding our option and config realm.
For git branch in list mode, we are already able to stack -v, i.e.
-v and -vv do
Kevin Bracey venit, vidit, dixit 13.05.2013 16:26:
On 13/05/2013 01:22, Junio C Hamano wrote:
Kevin Bracey ke...@bracey.fi writes:
git log --ancestry-path --left-right E...F --not $(git merge-base
--all E F)
which looks like we're having to repeat ourselves because it's not
paying
Jeff King venit, vidit, dixit 13.05.2013 13:55:
On Sun, May 12, 2013 at 10:01:38PM -0700, Junio C Hamano wrote:
Michael J Gruber g...@drmicha.warpmail.net writes:
Adding to that:
Somehow I still feel I should introduce a new attribute show (or a
better name) similar to diff so that you
Adding to that:
Somehow I still feel I should introduce a new attribute show (or a
better name) similar to diff so that you can specifiy a diff driver to
use for showing a blob (or grepping it), which may or may not be the
same you use for diff. This would be a much more fine-grained and
Junio C Hamano venit, vidit, dixit 11.05.2013 19:36:
Michael J Gruber g...@drmicha.warpmail.net writes:
+ if (!DIFF_OPT_TOUCHED(rev-diffopt, ALLOW_TEXTCONV) ||
+ !DIFF_OPT_TST(rev-diffopt, ALLOW_TEXTCONV))
+ return stream_blob_to_fd(1, sha1, NULL, 0);
It is surprising
Junio C Hamano venit, vidit, dixit 10.05.2013 19:02:
Michael J Gruber g...@drmicha.warpmail.net writes:
Currently, diff and cat-file for blobs honor --textconv options
(with the former defaulting to --textconv and the latter to
--no-textconv) whereas show does not honor this option, even
(1):
grep: allow to use textconv filters
Junio C Hamano (1):
diff_opt: track whether flags have been set explicitly
Michael J Gruber (5):
t4030: demonstrate behavior of show with textconv
show: honor --textconv for blobs
cat-file: do not die on --textconv without textconv filters
t7008
git show commit honors the --textconv option while git show blob
does not. Demonstrate this in the test.
Since the current behavior is supposed to stay as is, we expect the
default for git show blob to remain --no-textconv.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t4030
inspect touched_flags and
update opt-flags appropriately, before the remainder of the
diffcore machinery is set up, taking the opt-flags value into
account.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/technical/api-diff.txt | 10 +-
builtin/log.c
and --no-textconv when given.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/log.c| 25 ++---
t/t4030-diff-textconv.sh | 6 +++---
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index f19d779..dd3f108 100644
Currently, git grep does not honor any textconv filters, with nor
without --textconv. Demonstrate this in the tests.
The default is expected to remain unchanged.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7008-grep-binary.sh | 31 +++
1 file
When a command is supposed to use textconv filters (by default or with
--textconv) and none are configured then the blob is output without
conversion; the only exception to this rule is cat-file --textconv.
Make it behave like the rest of textconv aware commands.
Signed-off-by: Michael J Gruber
use any configured
textconv filters for grepping and output purposes. It is off by default.
Signed-off-by: Jeff King p...@peff.net
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/git-grep.txt | 9 +++-
builtin/grep.c | 2 +
grep.c | 100
Make grep honor the --textconv option also for the object case, i.e.
when used with an argument rev:path.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/grep.c | 11 ++-
object.c | 26 --
object.h | 2
Matthieu Moy venit, vidit, dixit 26.04.2013 15:23:
Michael J Gruber g...@drmicha.warpmail.net writes:
BTW, textconv does not have to be slow - just use textconv-cache.
Right, thanks for reminding me about this, I had forgotten its existance ;-).
I'm still looking for a way to at least
Matthieu Moy venit, vidit, dixit 25.04.2013 10:22:
Ramkumar Ramachandra artag...@gmail.com writes:
Hi,
So, I have three serious itches that would be nice to address:
1. git reset --hard HEAD~1/ git show HEAD~1 is a very common idiom
that's unnecessarily cumbersome to type out. We can
-z makes clean output only the names of paths which are or would be
deleted, and separates them with \0.
Use as xargs -0 -a (git clean -nz [-d]) rm -ri, e.g., as a quick
git clean -i.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Here's an alternative approach to that problem
Junio C Hamano venit, vidit, dixit 25.04.2013 19:12:
Junio C Hamano gits...@pobox.com writes:
Michael J Gruber g...@drmicha.warpmail.net writes:
fc407f9 (Add new simplified git-remote-testgit, 2012-11-28) introduced a
test which was meant to skip the test unless the test shell is bash
Junio C Hamano venit, vidit, dixit 24.04.2013 20:55:
Matthieu Moy matthieu@grenoble-inp.fr writes:
Grepping through the binary, on the other hand, can very well make
sense, like:
$ git grep foo
file.txt: some instance of foo
binary file bar.bin matches
BTW, textconv does not have to
test whether the test shell is bash.
An even better alternative would be to make the test POSIX compliant, of
course.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t5801-remote-helpers.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5801-remote
Johannes Sixt venit, vidit, dixit 25.04.2013 12:59:
Am 4/25/2013 12:09, schrieb Michael J Gruber:
fc407f9 (Add new simplified git-remote-testgit, 2012-11-28) introduced a
test which was meant to skip the test unless the test shell is bash.
Unfortunately, it tests for the availability of bash
Sebastian Götte venit, vidit, dixit 24.04.2013 10:53:
On 04/23/2013 09:56 PM, Joel Jacobson wrote:
But stepping back a bit, I have a suspicion that your upstream
project _only_ cares about what you feed them (either by pushing
your work yourself to them, or telling them to pull from your
Junio C Hamano venit, vidit, dixit 23.04.2013 17:20:
Michael J Gruber g...@drmicha.warpmail.net writes:
Currently, git grep does not honor textconv settings by default.
Make it honor them by default just like git log --grep does.
git log --grep looks for strings in the log message which
Junio C Hamano venit, vidit, dixit 23.04.2013 17:16:
Michael J Gruber g...@drmicha.warpmail.net writes:
Currently, git grep does not honor any textconv filters. Demonstrate
this in the tests.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7008-grep-binary.sh | 23
Junio C Hamano venit, vidit, dixit 23.04.2013 17:14:
Michael J Gruber g...@drmicha.warpmail.net writes:
Subject: Re: [PATCHv2 2/7] show: obey --textconv for blobs
s/obey/honor/;
I missed that one, thanks.
Currently, diff and cat-file for blobs honor --textconv options
(with the former
Matthieu Moy venit, vidit, dixit 22.04.2013 17:54:
Jeremy Rosen jeremy.ro...@openwide.fr writes:
some features detect if they are piping to a terminal... couldn't we do
something like that ?
That's OK for convenience features like colors or so, but that would be
really, really unexpected
Joel Jacobson venit, vidit, dixit 23.04.2013 02:00:
On Tue, Apr 23, 2013 at 12:43 AM, Junio C Hamano gits...@pobox.com wrote:
No docs? No tests?
Maybe simply adding this text to git-commit.txt,
The default can be changed by the 'commit.gpg-sign' configuration
variable (see
Here's a reroll, with the following changes:
* Use honor for obey.
* Fixed the issue with --textconv and non-blobs.
* Restructured tests as per Jeff's preference.
* Added 7/ which flips the default for git grep to textconv.
Jeff King (1):
grep: allow to use textconv filters
Michael J
git show commit honors the textconv setting while git show blob
does not. Demonstrate this in the test.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t4030-diff-textconv.sh | 12
1 file changed, 12 insertions(+)
diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff
and --no-textconv when given.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/log.c| 24 +---
t/t4030-diff-textconv.sh | 8 +++-
2 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index 5f3ed77..fe0275e
Currently, git grep does not honor any textconv filters. Demonstrate
this in the tests.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7008-grep-binary.sh | 23 +++
1 file changed, 23 insertions(+)
diff --git a/t/t7008-grep-binary.sh b/t/t7008-grep
When a command is supposed to use textconv filters (by default or with
--textconv) and none are configured then the blob is output without
conversion; the only exception to this rule is cat-file --textconv.
Make it behave like the rest of textconv aware commands.
Signed-off-by: Michael J Gruber
Make grep honor the --textconv option also for the object case, i.e.
when used with an argument rev:path.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/grep.c | 11 ++-
object.c | 26 --
object.h | 2
Currently, git grep does not honor textconv settings by default.
Make it honor them by default just like git log --grep does.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/git-grep.txt | 2 +-
grep.c | 2 ++
t/t7008-grep-binary.sh | 4 ++--
3
for grepping and output purposes. It is off by default.
Signed-off-by: Jeff King p...@peff.net
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/git-grep.txt | 9 +++-
builtin/grep.c | 2 +
grep.c | 100
Jeff King venit, vidit, dixit 21.04.2013 05:37:
On Sat, Apr 20, 2013 at 03:38:53PM +0200, Michael J Gruber wrote:
Wait, this does the opposite of the last patch. If we do want to do
this, shouldn't the last one have been an expect_failure?
The last patch just documents the status quo, which
Jeff King venit, vidit, dixit 20.04.2013 06:17:
On Fri, Apr 19, 2013 at 06:44:46PM +0200, Michael J Gruber wrote:
-die(git cat-file --textconv: unable to run textconv on
%s,
-obj_name);
-break;
+if (textconv_object
Jeff King venit, vidit, dixit 20.04.2013 06:04:
On Fri, Apr 19, 2013 at 06:44:44PM +0200, Michael J Gruber wrote:
git show commit obeys the textconc setting while git show blob
does not. Demonstrate this in the test.
s/textconc/textconv
Thanks, plus s/obey/honor/
diff --git a/t/t4030
Jeff King venit, vidit, dixit 20.04.2013 06:24:
On Fri, Apr 19, 2013 at 06:44:49PM +0200, Michael J Gruber wrote:
@@ -820,12 +820,13 @@ int cmd_grep(int argc, const char **argv, const char
*prefix)
for (i = 0; i argc; i++) {
const char *arg = argv[i
Jeff King venit, vidit, dixit 20.04.2013 06:06:
On Fri, Apr 19, 2013 at 06:44:45PM +0200, Michael J Gruber wrote:
Currently, diff and cat-file for blobs obey --textconv options
(with the former defaulting to --textconv and the latter to
--no-textconv) whereas show does not obey this option
Junio C Hamano venit, vidit, dixit 19.04.2013 20:24:
Michael J Gruber g...@drmicha.warpmail.net writes:
This series teaches show and grep to obey textconv: show by
default (like diff), grep only on request (--textconv). We might
switch the default for the latter also, of course. I'd
since.
Jeff King (1):
grep: allow to use textconv filters
Michael J Gruber (5):
t4030: demonstrate behavior of show with textconv
show: obey --textconv for blobs
cat-file: do not die on --textconv without textconv filters
t7008: demonstrate behavior of grep with textconv
grep: obey
git show commit obeys the textconc setting while git show blob
does not. Demonstrate this in the test.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t4030-diff-textconv.sh | 12
1 file changed, 12 insertions(+)
diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff
and --no-textconv when given.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/log.c| 24 +---
t/t4030-diff-textconv.sh | 8 +++-
2 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index 5f3ed77..fe0275e 100644
When a command is supposed to use textconv filters (by default or with
--textconv) and none are configured then the blob is output without
conversion; the only exception to this rule is cat-file --textconv.
Make it behave like the rest of textconv aware commands.
Signed-off-by: Michael J Gruber
Currently, git grep does not invoke any textconv filters. Demonstrate
this in the tests.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
t/t7008-grep-binary.sh | 19 +++
1 file changed, 19 insertions(+)
diff --git a/t/t7008-grep-binary.sh b/t/t7008-grep-binary.sh
for grepping and output purposes. It is off by default.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/grep.c | 2 +
grep.c | 100 ++---
grep.h | 1 +
t/t7008-grep-binary.sh | 18
Phil Hord venit, vidit, dixit 13.03.2013 05:21:
On Tue, Mar 12, 2013 at 11:33 PM, Junio C Hamano gits...@pobox.com wrote:
Phil Hord ho...@cisco.com writes:
git tag --force is used to replace an existing tag with
a new reference. Git helpfully tells the user the old
ref when this happens.
Dmitry Ilin venit, vidit, dixit 11.03.2013 12:30:
I tried this command and I got following result:
trace: built-in: git 'show' 'a1bffde'
trace: run_command: 'openssl enc -d -base64 -aes-256-ecb -k
'\''abcde'\'' 2 /dev/null || cat'
trace: exec: 'sh' '-c' 'openssl enc -d -base64 -aes-256-ecb
Jeff King venit, vidit, dixit 05.03.2013 18:38:
On Tue, Mar 05, 2013 at 02:44:41PM +, Ævar Arnfjörð Bjarmason wrote:
Change the semantics of git alias --help to show the help for the
command alias is aliased to, instead of just saying:
`git alias' is aliased to `whatever'
E.g. if
Preben Liland Madsen venit, vidit, dixit 26.02.2013 20:53:
Hello,
I'm trying to investigate some what changes have been done between two
versions of a software with the name IP.Board.
This proves more troublesome than I thought, since their release builder
appearantly updates the
Johannes Sixt venit, vidit, dixit 27.02.2013 07:39:
Am 2/26/2013 23:38, schrieb Tim Chase:
Various programs that I use ([Open|Libre]Office, Vym, etc) use a
zipped/.tgz'ed file format, usually containing multiple
(usually) plain-text files within.
I'm trying to figure out a way for git to
During my day-to-day UGFWIINIT I noticed that we don't do textconv
iteratively. E.g.: I have a file
SuperSecretButDumbFormat.pdf.gpg
and textconv filters with attributes set for *.gpg and *.pdf (using
gpg resp. pdftotext). For Git, the file has only the gpg
attribute, of course. In this case, I
Junio C Hamano venit, vidit, dixit 20.02.2013 00:47:
Scott Chacon scha...@gmail.com writes:
Junio, are you interested in attending?
I am interested in meeting our European contributors, but Berlin is
kind of very far, so give me a few days to think about it.
Thanks.
Maybe, we can -
Ralf Thielow venit, vidit, dixit 18.02.2013 19:22:
Translate 35 new messages came from git.pot update
in 9caaf23 (l10n: Update git.pot (35 new, 14 removed
messages)).
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com
---
po/de.po | 140
Michael J Gruber venit, vidit, dixit 19.02.2013 16:20:
Scott Chacon venit, vidit, dixit 18.02.2013 22:29:
Right now we have:
Dev day: 50
User day: 295
Hack day: 200
I'm not sure what the actual turnout will be, but it looks like it's
going to be pretty massive. I wanted to go through
501 - 600 of 782 matches
Mail list logo
