On 19/01/17 12:02 PM, Jeff King wrote:
It's much trickier to find from the git topology whether a particular
history contains rebased versions of commits. You can look at the
--cherry options to "git log", which use patch-ids to try to equate
commits. Something like:
git for-each-ref --format
I have a couple questions around grepping among open pull requests.
First, "git for-each-ref --no-merged": When I run the following,
it lists refs/pull/1112/head, even though #1112 was merged in commit
ced4da1. I guess this is because the tip of refs/pull/1112/head is
107fc59, not ced4da1?
Th
You might need the following, to still build with LibreSSL.
That was my experience anyway, when I recently prepared similar fixes
for OpenSSL 1.1 and Apache Traffic Server.
#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
On 12/01/17 03:42 AM, eroen wrote:
Library
You might need the following, to still build with LibreSSL.
That was my experience anyway, when I recently prepared similar fixes
for OpenSSL 1.1 and Apache Traffic Server.
#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
On 12/01/17 03:42 AM, eroen wrote:
Library
On 08/12/16 03:53 PM, Junio C Hamano wrote:
Jack Bates writes:
@@ -3364,6 +3365,7 @@ void diff_setup(struct diff_options *options)
options->file = stdout;
+ options->abbrev = DEFAULT_ABBREV;
This is a new change relative to your earlier one.
I looked at all the call
On 06/12/16 09:56 AM, Jack Bates wrote:
There are two different places where the --no-abbrev option is parsed,
and two different places where SHA-1s are abbreviated. We normally parse
--no-abbrev with setup_revisions(), but in the no-index case, "git diff"
calls diff_opt_parse() dir
. The
other two are when one of the files you're comparing is outside of the
repository you're in, and the --no-index option.
Signed-off-by: Jack Bates
---
diff.c | 6 +-
t/t4013-diff-various.sh | 7
. The
other two are when one of the files you're comparing is outside of the
repository you're in, and the --no-index option.
Signed-off-by: Jack Bates
---
diff.c | 6 +-
t/t4013-diff-various.sh | 7
. The
other two are when one of the files you're comparing is outside of the
repository you're in, and the --no-index option.
Signed-off-by: Jack Bates
---
diff.c | 6 +-
t/t4013-diff-various.sh | 7
On 05/12/16 12:26 AM, Jeff King wrote:
On Sun, Dec 04, 2016 at 11:19:46PM -0800, Junio C Hamano wrote:
- if (no_index)
+ if (no_index) {
/* If this is a no-index diff, just run it and exit there. */
+ startup_info->have_repository = 0;
di
The three cases where "git diff" operates outside of a repository are 1)
when we run it outside of a repository, 2) when one of the files we're
comparing is outside of the repository we're in, and 3) the --no-index
option. Commit 4f03666 ("diff: handle sha1 abbreviations outside of
repository", 201
epath returned an empty string.
Signed-off-by: Jack Bates
---
diff.c | 6 +-
t/t4013-diff-various.sh | 7 +++
t/t4013/diff.diff_--no-index_--raw_--abbrev=4_dir2_dir | 3 +++
t/t4013/diff.diff_--no-index_
The "git diff --no-index" codepath
doesn't handle the --no-abbrev option.
Signed-off-by: Jack Bates
---
diff.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/diff.c b/diff.c
index ec87283..0447eff 100644
--- a/diff.c
+++ b/diff.c
@@ -3106,7 +3106,8 @@ st
13 matches
Mail list logo
