On Sat, Apr 26, 2014 at 10:00:53PM +0200, Christian Couder wrote:
This patch series comes from what Peff sent in the following thread:
http://thread.gmane.org/gmane.comp.version-control.git/243361/focus=243528
Thanks. As I recall, these were in pretty good shape, and I just read
over them
enough to do.
Thanks, I think the result looks good.
Acked-by: Jeff King p...@peff.net
-Peff
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Apr 28, 2014 at 03:35:02PM -0400, Jeff King wrote:
Since such entries are in the minority, and because cache_entry is
already a variable-length struct, I think you could get away with
sticking it after the name field, and then comparing like:
const char *ce_normalized_name(struct
On Mon, Apr 28, 2014 at 10:49:30PM +0200, Torsten Bögershausen wrote:
OK, thanks for the description.
In theory we can make Git composition ignoring by changing
index_file_exists() in name-hash.c.
(Both names must be precomposed first and compared then)
Yeah, we could perhaps get away
On Mon, Apr 28, 2014 at 08:35:52PM +0200, enzodici...@gmail.com wrote:
For example, thinking about it, I've imagined to add this feature to `git
commit`:
git commit --see-also commit1 commit2 ...
Jonathan mentioned already that we typically just do this by hand[1],
though look on the
Signed-off-by: Jeff King p...@peff.net
---
I read through the whole thing and didn't notice any other corrections.
Feel free to just squash this in if you are doing other changes to the
file. :)
Documentation/RelNotes/2.0.0.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
On Tue, Apr 29, 2014 at 10:12:52AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
This patch just adds a test to demonstrate the breakage.
Some possible fixes are:
1. Tell everyone that NFD in the git repo is wrong, and
they should make a new commit to normalize
On Tue, Apr 29, 2014 at 11:49:30AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
I don't think we have a str_utf8_cmp that ignores normalizations (or
maybe strcoll will do this?). But in theory we could use it everywhere
we use strcasecmp for ignore_case. And then we would
On Tue, Apr 29, 2014 at 11:08:29PM -0500, Felipe Contreras wrote:
If we use a different conflict style `git rerere forget` is not able to
find the matching conflict SHA-1 because the diff generated is actually
different from what `git merge` generated.
Can you show an example or test case?
I
On Wed, Apr 30, 2014 at 05:58:06PM +0900, Brian Gesiak wrote:
strbuf_trim strips whitespace from the end, then the beginning of a
strbuf. Those operations are duplicated in strbuf_rtrim and
strbuf_ltrim.
Replace strbuf_trim implementation with calls to strbuf_rtrim,
then strbuf_ltrim.
On Thu, May 01, 2014 at 10:51:19AM -0700, Junio C Hamano wrote:
If you want to fix something here, do s/judgement/judgment/ instead.
That too.
FWIW, neither is outright wrong; it is an America/British variation, and
apparently dictionaries disagree on which is preferred.
-Peff
--
To
On Wed, Apr 30, 2014 at 02:45:11PM -0700, Junio C Hamano wrote:
See http://thread.gmane.org/gmane.comp.version-control.git/3903/focus=4126
Signed-off-by: Junio C Hamano gits...@pobox.com
Don't you often complain about submitters referencing a discussion
in a commit message without providing
On Wed, Apr 30, 2014 at 02:34:59PM -0700, Junio C Hamano wrote:
Linus Torvalds torva...@linux-foundation.org writes:
I just got a comment saying that
git commit --amend --date=now
doesn't work. I replied that you can use
--date=$(date)
Offhand without double-checking
On Thu, May 01, 2014 at 06:06:39PM -0400, Jeff King wrote:
I think the original rationale was that it's OK for us to allow some
sloppiness when _viewing_ commits, since you will generally notice the
problem. But when making commits, it's better to be careful, since you
may be setting
, this will also allow us easy access to the
timestamp and tz fields in future patches.
Signed-off-by: Jeff King p...@peff.net
---
builtin/commit.c | 33 -
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 9cfef6c
We use this function internally to format Date lines in
commit logs, but other parts of the code will want it, too.
Signed-off-by: Jeff King p...@peff.net
---
cache.h | 7 +++
pretty.c | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/cache.h b/cache.h
index 107ac61
-by: Jeff King p...@peff.net
---
Note the test updates in t3508, as cherry-picks will now print the date.
I think that's probably a good thing, but if we don't like it, we can
tweak author_date_is_interesting() to only check force_date.
I'd also be open to using a different date format than DATE_NORMAL
continues to set the date in -0700, regardless of what the
local timezone is.
Signed-off-by: Jeff King p...@peff.net
---
builtin/commit.c | 27 +--
t/t7501-commit.sh | 12 ++--
2 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/builtin/commit.c b/builtin
On Fri, May 02, 2014 at 11:18:34AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
On Wed, Apr 30, 2014 at 02:45:11PM -0700, Junio C Hamano wrote:
See http://thread.gmane.org/gmane.comp.version-control.git/3903/focus=4126
Signed-off-by: Junio C Hamano gits...@pobox.com
On Fri, May 02, 2014 at 11:31:10AM -0700, Junio C Hamano wrote:
But let's follow this one:
http://www.google.com/trends/explore#q=judgement%20call%2C%20judgment%20callcmpt=q
which seems to say that with 'e' is more common.
Grammar by democracy. ;)
*1* To Americans, the form with 'e' is
On Fri, May 02, 2014 at 02:11:05PM -0500, Felipe Contreras wrote:
Junio C Hamano wrote:
If we step back a bit, because we are forcing him to differentiate
these two pulls in his mental model anyway, perhaps it may help
people (both new and old) if we had a new command to make the
On Fri, May 02, 2014 at 04:55:01PM -0500, Felipe Contreras wrote:
They can do:
% git pull origin master
That shouldn't revese the bases.
Then they have to remember to do that every time, no? That seems a
little error-prone versus setting a config option.
Such users are going to run git
On Sat, May 03, 2014 at 10:49:30PM +1000, James Denholm wrote:
The main issues are that calls are made to git itself in the build
process, and that a subtree-exclusive variable is used for specifying
the exec path. Patches 1/5 through 3/5 resolve these.
The cleanup fixes (4/5 and 5/5) are
On Sat, May 03, 2014 at 10:49:35PM +1000, James Denholm wrote:
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index f3834b5..4f96a24 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -11,8 +11,9 @@ man1dir ?= $(mandir)/man1
-include
On Sun, May 04, 2014 at 07:01:22PM +, brian m. carlson wrote:
On Sun, May 04, 2014 at 01:12:55AM -0500, Felipe Contreras wrote:
This is in gcc 4.9.0:
wt-status.c: In function ‘wt_status_print_unmerged_header’:
wt-status.c:191:2: warning: zero-length gnu_printf format string
inline, which
should accomplish the same thing without the extra warnings
(because gcc will not warn about unused return values unless
warn_unused_result is specified for the particular
function).
Signed-off-by: Jeff King p...@peff.net
---
git-compat-util.h | 20
usage.c
On Mon, May 05, 2014 at 12:45:30AM -0500, Felipe Contreras wrote:
Jeff King wrote:
On Sun, May 04, 2014 at 01:12:53AM -0500, Felipe Contreras wrote:
So it looks like gcc is smarter now, and in trying to fix a few warnings
we generated hundreds more.
This reverts commit
On Mon, May 05, 2014 at 01:14:43AM -0500, Felipe Contreras wrote:
Jeff King wrote:
On Mon, May 05, 2014 at 12:45:30AM -0500, Felipe Contreras wrote:
Jeff King wrote:
On Sun, May 04, 2014 at 01:12:53AM -0500, Felipe Contreras wrote:
So it looks like gcc is smarter now
On Mon, May 05, 2014 at 01:20:09PM +0200, David Kastrup wrote:
Would it make more sense to advise git devs to set this per repo
instead? The majority of (open source) repositories out there are
small if I'm not mistaken. Of those few big repos, we could have a
section listing all the tips
On Mon, May 05, 2014 at 02:30:12AM -0500, Felipe Contreras wrote:
If we have a) code that fixes a couple warnings with -O3 but introduces
hundreds with -O2, vs. b) code that has only a comple warnings with -O3,
I'd go for b) any day.
I agree. But my point was to ask whether we can fix both.
On Sun, May 04, 2014 at 08:13:15AM +0200, Torsten Bögershausen wrote:
1. Tell everyone that NFD in the git repo is wrong, and
they should make a new commit to normalize all their
in-repo files to be precomposed.
This is probably not the right thing to do, because it
this, Junio can just tweak it as he applies, but
I do not know if he is even paying attention to this thread, so you may
want to re-post anyway to get his attention.
Either way, feel free to add my:
Reviewed-by: Jeff King p...@peff.net
-Peff
--
To unsubscribe from this list: send the line unsubscribe
[fixed David's address in cc list]
On Tue, May 06, 2014 at 07:54:30AM +1000, James Denholm wrote:
Given that subtree subtree doesn't really generate a lot of discussion,
would it be advisable to wrap this up (barring further discussion) and send
it off to Junio rather than waiting for further
King p...@peff.net
---
On Mon, May 05, 2014 at 05:29:38PM -0400, Jeff King wrote:
I cannot think of any other way to make the compiler aware of the
constant value, but perhaps somebody else is more clever than I am.
This came to me in a dream, and seems to work.
cache.h | 2 +-
git
commit puts the constant behind an
inline function call, this is enough to prevent the
-Wunused-value warning on both modern gcc and clang. So we
can now re-enable the macro when compiling with clang.
Tested with clang 3.3, 3.4, and 3.5.
Signed-off-by: Jeff King p...@peff.net
---
I still get
On Tue, May 06, 2014 at 08:49:22PM +0200, Matthieu Moy wrote:
Exactly. I personally never use git blame outside git gui blame for
this reason.
I'd recommend tig blame for this, too, which behaves like less -S
with respect to long lines (and also makes it easy to jump to the full
diff, or
On Tue, May 06, 2014 at 12:17:14AM +, Eric Wong wrote:
Users may already store sensitive data such as imap.pass in
.git/config; making the file world-readable when git config
is called to edit means their password would be compromised
on a shared system.
Makes sense, and the patch looks
is limited to the child process,
which avoids any unexpected surprises for code running after
the pager (there isn't any currently, but this is
future-proofing).
Signed-off-by: Jeff King p...@peff.net
---
builtin/grep.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git
On Tue, May 06, 2014 at 03:29:37PM -0700, Junio C Hamano wrote:
We can work around this by encapsulating the constant return
value in a static inline function, as gcc specifically
avoids complaining about unused function returns unless the
function has been specifically marked with the
On Wed, May 07, 2014 at 03:40:28PM +, Jim Garrison wrote:
During my initial self-education I came across the maxim don't pull,
fetch+merge instead and have been doing that. I think I followed
most of the pull is (mostly) evil discussion but one facet still
puzzles me: the idea that pull
On Wed, May 07, 2014 at 04:44:01PM -0700, Jonathan Nieder wrote:
The git-shell(1) manpage says
EXAMPLE
To disable interactive logins, displaying a greeting
instead:
+
$ chsh -s /usr/bin/git-shell
$ mkdir
On Wed, May 07, 2014 at 02:45:01PM -0700, Junio C Hamano wrote:
Fabio D'Alfonso fabio.dalfo...@fabiodalfonso.com writes:
root@HDUBVM01:~/builds/git/t# ./t5539-fetch-http-shallow.sh
ok 1 - setup shallow clone
not ok 2 - clone http repository
[...]
Does not reproduce for me but I am on
On Thu, May 08, 2014 at 02:54:56PM +0800, Jianyu Zhan wrote:
Usually, a trivial change(like coding style fix) may bury a
original change of the code, and thus git blame is of less
help. And to address this situation, I have to do like this:
git blame -s REF^ file-in-question temp
to
On Thu, May 08, 2014 at 01:52:38PM -0700, Junio C Hamano wrote:
( 103)
7bbc458b (Kyle J. McKay 2014-04-22 04:16:22 -0700 104) test_expect_...
( 105) test...
7bbc458b
On Thu, May 08, 2014 at 11:32:01PM +0200, David Kastrup wrote:
Jeff King p...@peff.net writes:
On Thu, May 08, 2014 at 01:52:38PM -0700, Junio C Hamano wrote:
( 103)
7bbc458b (Kyle J. McKay 2014-04-22 04:16:22 -0700 104
On Thu, May 08, 2014 at 07:58:30PM -0500, Felipe Contreras wrote:
No activity since 2012, no tests, no chance of ever graduating.
I don't think no activity is an interesting indicator. This tool _is_
actively maintained, but it has not needed any fixes since 2012. I use
it for every single git
On Thu, May 08, 2014 at 02:56:46PM -0700, Junio C Hamano wrote:
In short:
- I am not considering nor proposing to change the default at all.
- I have two choices, either change the behaviour of -b, or
introducing a new option (the latter includes -b -b); I am
slightly in favor of
On Thu, May 08, 2014 at 07:58:23PM -0500, Felipe Contreras wrote:
There's nothing there.
It's not nothing; we used to carry the tools here, and replaced them
with pointers when the tools themselves went away. That was certainly
useful for a period of time.
However, I would certainly agree that
On Thu, May 08, 2014 at 07:58:18PM -0500, Felipe Contreras wrote:
No activity, no tests.
Like diff-highlight, I don't think no activity is a useful indicator.
I use this daily, and several people have commented off-list to me that
they use it, too.
Like diff-highlight, I'm happy to maintain it
On Fri, May 09, 2014 at 04:20:40AM -0500, Felipe Contreras wrote:
Eric Wong wrote:
Felipe Contreras felipe.contre...@gmail.com wrote:
As a minimal token that anybody might possibly be using it, I would like
to see it work at least once. Since you said you have arch repos, can
you
On Thu, May 08, 2014 at 09:12:36PM -0500, Felipe Contreras wrote:
Jeff King wrote:
On Thu, May 08, 2014 at 07:58:18PM -0500, Felipe Contreras wrote:
No activity, no tests.
Like diff-highlight, I don't think no activity is a useful indicator.
I use this daily, and several people
On Thu, May 08, 2014 at 09:01:32PM -0500, Felipe Contreras wrote:
Are you planning on CC'ing the (inactive) authors/maintainers
so they know that if they care they should host those elsewhere?
They are already Cc'ed.
I don't think you were very thorough on this. Of the three remaining
On Fri, May 09, 2014 at 07:04:05AM +0200, David Kastrup wrote:
Arguably if the user explicitly limited the range, he knows what he's
looking at. Admittedly, I don't know offhand which options _will_
produce boundary commit indications: there may be some without explicit
range limitation, and
On Fri, May 09, 2014 at 04:13:31PM +0800, Adam Lee wrote:
BugLink: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747068
--bcc should have higher priority than sendemail.bcc.
--bcc=address
Specify a Bcc: value for each email. Default is the value of
sendemail.bcc.
The
On Fri, May 09, 2014 at 10:39:32AM +0200, Fabio D'Alfonso wrote:
this test was disabled up to 1.9.2 so it did not fail as it did not run by
default.
Yes, in v1.9.2 we turned on http tests to run by default, but only if we
could succeed in setting up the http server automatically (and if we
On Thu, May 08, 2014 at 08:02:28AM +0200, Fabio D'Alfonso wrote:
this is the error in httpd error.log
[Wed May 07 20:44:10 2014] [alert] getpwuid: couldn't determine user name
from uid 4294967295, you probably need to modify the User directive
[Wed May 07 20:44:10 2014] [notice]
this condition and skip the tests rather
than expecting Apache to do the right thing.
Signed-off-by: Jeff King p...@peff.net
---
t/lib-httpd.sh | 5 +
1 file changed, 5 insertions(+)
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 252cbf1..8b67021 100644
--- a/t/lib-httpd.sh
+++ b/t/lib
mismatch
error to look like
fatal: object 6b00a8c61ed379d5f925a72c1987c9c52129d364: expected type blob,
got tree
Signed-off-by: Jeff King p...@peff.net
---
builtin/index-pack.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/builtin/index-pack.c b/builtin/index
On Sun, May 11, 2014 at 10:22:03AM -0700, Junio C Hamano wrote:
The alternative you mentioned up-thread ... to write out return
error(...) as error(...); return -1. In some ways that is more
readable, though it is more verbose... has one more downside you
did not mention, and the approach to
On Sun, May 11, 2014 at 04:09:56PM +, Ævar Arnfjörð Bjarmason wrote:
Change the display of hunks in hunk splitting mode to preserve the diff
heading, which hasn't been done ever since the hunk splitting was
initially added in v1.4.4.2-270-g835b2ae.
Splitting the first hunk of this patch
On Mon, May 12, 2014 at 11:44:26AM -0700, Jonathan Nieder wrote:
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -331,7 +331,11 @@ extern void warning(const char *err, ...)
__attribute__((format (printf, 1, 2)))
* using the function as usual.
*/
#if defined(__GNUC__) !
On Mon, May 12, 2014 at 09:42:56PM +0200, Ævar Arnfjörð Bjarmason wrote:
Good suggestion, but tricky as you point out. Another thing I've
wanted many times is to make it smart enough that when you edit code
like:
A()
B();
And change it to:
X();
Y();
The change from A-X
On Sat, May 10, 2014 at 09:01:32PM +, brian m. carlson wrote:
What it looks like is happening is that git is offering Negotiate data,
and then your server is responding with a 401 Unauthorized. libgit2
(presumably using WinHTTP) continues in this case, retrying with a
longer set of
On Sat, May 10, 2014 at 10:41:28AM +0200, Chris “Kwpolska” Warrick wrote:
when I’m using the HTTPS protocol to access repositories, a window
from /usr/bin/qt4-ssh-askpass comes up. It asks for my “SSH pass
phrase”, twice. Sadly, it’s wrong. The actual things it wants is the
username in the
On Fri, May 09, 2014 at 06:53:32PM +0200, Michael Haggerty wrote:
On 04/26/2014 01:19 AM, Jeff King wrote:
On Fri, Apr 25, 2014 at 03:50:26PM -0700, Junio C Hamano wrote:
[...]
* fc/publish-vs-upstream (2014-04-21) 8 commits
- sha1_name: add support for @{publish} marks
- sha1_name
On Mon, May 12, 2014 at 02:07:15PM -0700, Junio C Hamano wrote:
And figuring out B here
would be prohibitively difficult, I would think, as it would require
applying the funcname rules internal to git-diff to a hunk that git-diff
itself never actually sees.
You can actually apply a
On Sat, May 10, 2014 at 10:02:59AM -0400, Jeff King wrote:
On Fri, May 09, 2014 at 02:08:27PM -0700, Junio C Hamano wrote:
3. Just disable the http tests when run as root.
I think I'd favor 3. But I'd like to be sure that being root is the
problem.
I agree with both
On Wed, May 14, 2014 at 11:26:54AM -0700, Jonathan Nieder wrote:
git grep has other options that affect interpretation of the pattern
which this patch does not help with:
* -v / --ignore-match: probably should disable this feature of -O.
* -E / --extended-regexp
* -P / --perl-regexp
*
On Wed, May 14, 2014 at 10:11:11AM -0700, Junio C Hamano wrote:
A bit more disturbing is that I did not get the impression that we
know the exact reason why these http tests, especially the getwpuid
call, fail for Fabio when run as root. And if my impression is
correct, then do not run tests
On Wed, May 14, 2014 at 05:44:19PM +0200, Stepan Kasal wrote:
From: Johannes Schindelin johannes.schinde...@gmx.de
Date: Mon, 8 Nov 2010 16:10:43 +0100
Incidentally, this makes grep -I respect the binary attribute (actually,
the -text attribute, but binary implies that).
Since the
On Wed, May 14, 2014 at 10:52:28AM -0700, Junio C Hamano wrote:
I do not think checking 'text' is the right way to do this. The
attribute controls the eof normalization, and people sometimes want
to keep CRLF terminated files in the repository no matter what the
platform is (an example I
On Wed, May 14, 2014 at 02:35:08PM -0500, Felipe Contreras wrote:
Prior to his decision there were no complaints about my manners since
I returned. It was his *TECHNICAL* decision that triggered this.
There have been several complaints about your behavior since you
returned[1,2,3,4], in
that actually set it,
so we cannot accidentally access it uninitialized in future
code.
Signed-off-by: Jeff King p...@peff.net
---
The patch is kind of nasty due to re-indenting. diff -b makes it much
clearer.
diff-lib.c | 34 ++
t/t4039-diff-assume
The memory ownership of the argv array of a struct child_process can
be tricky. The child_process does not own the memory, but it must remain
valid until finish_command runs. That's easy for cases where we call
start_command and finish_command in the same function: you can use a
local array
, which gets cleaned up automatically (both
in finish_command and when start_command fails). Callers
may use it if they choose, but can continue to use the raw
argv if they wish.
Signed-off-by: Jeff King p...@peff.net
---
This is the most RFC part of the series, because I really didn't know
what
, but it may if it encounters an error (e.g., waitpid
failure or signal death). This is unusual, which is why
nobody has noticed. But by using run-command's built-in
argv_array, the memory ownership is handled for us
automatically.
Signed-off-by: Jeff King p...@peff.net
---
column.c | 43
This simplifies the code and avoids a fixed array size that
we might accidentally overflow. It also prevents a leak
after finish_command is run, by using the argv_array that
run-command manages for us.
Signed-off-by: Jeff King p...@peff.net
---
transport-helper.c | 26
of it for us, and we can drop our manual free
entirely.
Note that this actually makes the get_helper leak slightly
worse; now we are leaking both the strings and the array.
But when we adjust it in a future patch, that leak will go
away entirely.
Signed-off-by: Jeff King p...@peff.net
---
connect.c | 28
.
This also prevents a memory leak in the case that
transport_take_over is used, in which case we free the child
in finish_connect, which does not manually free the array.
Signed-off-by: Jeff King p...@peff.net
---
transport-helper.c | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff
This saves a few lines and lets us avoid having to clean up
the memory manually when the command finishes.
Signed-off-by: Jeff King p...@peff.net
---
transport-helper.c | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index
The argv_array_detach function (and associated free() function) was
really only useful for transferring ownership of the memory to a struct
child_process. Now that we have an internal argv_array in that struct,
there are no callers left.
Signed-off-by: Jeff King p...@peff.net
---
This is a bonus
Signed-off-by: Jeff King p...@peff.net
---
sha1_file.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sha1_file.c b/sha1_file.c
index 3e9f55f..34d527f 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1437,19 +1437,23 @@ static int open_sha1_file(const unsigned char *sha1
On Thu, May 15, 2014 at 07:32:14AM +0200, Stepan Kasal wrote:
From: Sverre Rabbelier srabbel...@gmail.com
Date: Sat, 28 Aug 2010 20:49:01 -0500
[PT: ensure we add an additional element to the argv array]
Signed-off-by: Stepan Kasal ka...@ucw.cz
---
Hi,
this patch was present in
On Thu, May 15, 2014 at 10:02:06AM -0700, Junio C Hamano wrote:
$ chmod 0 .git/objects/??/*
$ git rev-list --all
fatal: loose object b2d6fab18b92d49eac46dc3c5a0bcafabda20131 (stored in
.git/objects/b2/d6fab18b92d49eac46dc3c5a0bcafabda20131) is corrupt
H. So we
On Thu, May 15, 2014 at 07:46:49PM +0200, Johannes Schindelin wrote:
We've already found the lines of interest to the user. It would be nice
if we could somehow point the pager at them by number, rather than
repeating the (slightly incompatible) search.
FWIW it is exactly that type of I
On Thu, May 15, 2014 at 07:42:00PM +0200, Johannes Schindelin wrote:
Hrm. Is this patch still necessary? In the time since this patch was
written, we did 0826579 (grep: load file data after checking
binary-ness, 2012-02-02)
I have no time to test this but I trust that you made sure that
On Thu, May 15, 2014 at 06:31:21PM -0700, Jeremiah Mahler wrote:
Added feature that allows a signature file to be used with format-patch.
$ git format-patch --signature-file ~/.signature -1
Now signatures with newlines and other special characters can be
easily included.
I think this
On Fri, May 16, 2014 at 10:19:57AM +0200, Stepan Kasal wrote:
On Thu, May 15, 2014 at 03:22:26PM -0400, Jeff King wrote:
As the person who is proposing the patch for git.git, I would hope
Stepan would follow up on such review and confirm whether or not it is
still needed.
well, I try
On Thu, May 15, 2014 at 03:56:29PM -0700, Junio C Hamano wrote:
Two announcements for their version 0.2 on the list archive are not
quite enough to advertise them to their users.
I do not think this README nor a mention in the release notes will get
their attention either, and many people (and
On Fri, May 16, 2014 at 06:04:57PM +0930, David Newall wrote:
The patch returned by
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=462fb2af9788a82a534f8184abfde31574e1cfa0
is truncated. The page which refers to that patch, at
On Fri, May 16, 2014 at 10:55:54AM +0200, Paolo Ciarrocchi wrote:
On Fri, May 16, 2014 at 10:41 AM, Jeff King p...@peff.net wrote:
But that being said, this is Felipe's code. While we have a legal right
to distribute it in v2.0, if he would really prefer it out for v2.0, I
would respect
On Fri, May 16, 2014 at 04:51:16AM -0400, Jeff King wrote:
On Fri, May 16, 2014 at 06:04:57PM +0930, David Newall wrote:
The patch returned by
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=462fb2af9788a82a534f8184abfde31574e1cfa0
is truncated. The page which
On Fri, May 16, 2014 at 09:52:15AM -0700, Junio C Hamano wrote:
Or am I reacting to a typo and you meant to say I would prefer not
to instrument? Your shipping the warnings to end users who did
not package the software will not help was unclear if you meant the
README that has warning or
On Fri, May 16, 2014 at 11:33:48AM -0700, Jonathan Nieder wrote:
(cc-ing peff, who may remember this STORE_REF_ERROR_DF_CONFLICT case
from long ago)
No, but I have very good tools for searching the list archive. ;)
In s_update_ref there are two calls that when they fail we return an error
On Sat, May 17, 2014 at 12:25:30AM -0500, Felipe Contreras wrote:
I agree with the line of reasoning you laid out in your email,
especially:
What a shock.
Please stop with these unproductive and rude comments.
I hadn't thought of the rename idea, and it would address the concerns I
On Fri, May 16, 2014 at 10:34:10PM +, brian m. carlson wrote:
The tricky part is figuring out when to return HTTP_NOAUTH (do not try
again, we failed) versus HTTP_REAUTH (get credentials and try again)
in handle_curl_result. Right now the decision is based on did we have a
username
On Sat, May 17, 2014 at 08:41:27AM +0200, Christian Couder wrote:
It's a bad idea to create a replace ref for an object
that points to the original object itself.
That's why we have to check if the result from editing
the original object is a different object and error out
if it isn't.
I
On Sat, May 17, 2014 at 08:41:29AM +0200, Christian Couder wrote:
If a replace ref already exists for an object, it is
much better for the user if we error out before we
let the user edit the object, rather than after.
Definitely. Code looks fine to me.
-Peff
--
To unsubscribe from this
On Sat, May 17, 2014 at 08:41:30AM +0200, Christian Couder wrote:
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 29 +
1 file changed, 29 insertions(+)
Yay, tests.
+test_expect_success 'setup a fake editor' '
+ cat
On Sat, May 17, 2014 at 08:41:32AM +0200, Christian Couder wrote:
@@ -63,6 +64,14 @@ OPTIONS
--delete::
Delete existing replace refs for the given objects.
+--edit object::
+ Launch an editor to let the user change the content of
+ object, then create a new object of the
601 - 700 of 13736 matches
Mail list logo
