Hi Peff,
On 2015-06-08 18:56, Jeff King wrote:
On Mon, Jun 08, 2015 at 06:00:09PM +0200, Johannes Schindelin wrote:
I like the idea, but I am a bit uncertain whether it would constitute
too backwards-incompatible a change to make this an error. I think
it could be argued both ways
Hi,
On 2015-06-08 23:00, Michael Rappazzo wrote:
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index dc3133f..b92375e 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -977,7 +977,9 @@ else
revisions=$onto...$orig_head
Hi Luis,
On 2015-06-08 20:34, Luis R. Rodriguez wrote:
Based on a cursory review of the git code I get the impression that
GNU diff and git 'diff' do not share any code for the possible diff
algorithms.
Indeed, Git's diff machinery is based[*1*] ofn libxdiff[*2*], not on GNU diff.
I'm in
Hi Michael,
On 2015-06-08 08:40, Michael Haggerty wrote:
Previously, if a reflog entry's old or new SHA-1 was not resolvable to
an object, that SHA-1 was silently ignored. Instead, report such cases
as errors.
I like the idea, but I am a bit uncertain whether it would constitute too
Hi Michael,
On 2015-06-08 08:40, Michael Haggerty wrote:
New function, extracted from fsck_handle_reflog_ent(). The extra
is_null_sha1() test for the new reference is currently unnecessary, as
reflogs are deleted when the reference itself is deleted. But it
doesn't hurt, either.
This patch
Hi Michael,
On 2015-06-08 17:09, Michael Haggerty wrote:
On 06/08/2015 04:27 PM, Johannes Schindelin wrote:
On 2015-06-08 08:40, Michael Haggerty wrote:
Previously, if a reflog entry's old or new SHA-1 was not resolvable
to an object, that SHA-1 was silently ignored. Instead, report
Hi,
On 2015-06-09 16:06, Sitaram Chamarty wrote:
On 06/09/2015 05:42 PM, Duy Nguyen wrote:
From a thread on Hacker News. It seems that if a user does not have
access to the remote's reflog and accidentally forces a push to a ref,
how does he recover it? In order to force push again to revert
Hi Gabriel,
On 2015-06-10 16:51, Gabriel wrote:
Where it says:
Su rama está delante de origin/master para 6 commits.
it should say:
Su rama está delante de origin/master por 6 commits.
Notice para -- por.
Good catch.
You could earn eternal fame by cloning Git itself (e.g. via `git
Hi,
On 2015-06-09 14:10, QbProg wrote:
I reproduce it using the windows command prompt (cmd.exe) using any
repository. I tryed with bash and it works correctly.
Please note that you removed enough context that the mail does not make sense
anymore if read individually.
At this point it might
Hi,
On 2015-06-09 10:43, Qb wrote:
I'm trying the release candidate on Win 8.1. Everything's working now, but
when I clone a repository
git clone http://./name.git CustomFolder
it creates CustomFolder with the checkout files, but the .git folder is
created inside
Hi Junio,
On 2015-06-17 19:33, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
+test_expect_failure 'rebase --continue removes CHERRY_PICK_HEAD' '
+git checkout -b commit-to-skip
+for double in X 3 1
+do
+seq 5 | sed s/$double// seq
Hi Micha,
On 2015-06-18 14:26, Michael J Gruber wrote:
Johannes Schindelin venit, vidit, dixit 16.06.2015 11:43:
To list all the merge commits in the current branch, I would use the
command-line:
```bash
git rev-list --author=My Colleague --parents HEAD |
sed -n 's/ .* .*//p'
```
(i.e
in such a
situation.
However, as pointed out by Gábor Szeder, this leaves a CHERRY_PICK_HEAD
behind, making the Git prompt believe that a cherry pick is still going
on. This commit adds a test case demonstrating this bug.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
t/t3404
with and without setting the
fake editor)
Interdiff below the diffstat.
Johannes Schindelin (2):
t3404: demonstrate CHERRY_PICK_HEAD bug
rebase -i: do not leave a CHERRY_PICK_HEAD file behind
git-rebase--interactive.sh| 6 +-
t/t3404-rebase-interactive.sh | 21 +
2
--interactive.sh is called.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
git-rebase--interactive.sh| 6 +-
t/t3404-rebase-interactive.sh | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index dc3133f
Hi Junio,
On 2015-06-19 21:26, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
+static inline int substrcmp(const char *string, int len, const char *match)
+{
+int match_len = strlen(match);
+if (match_len != len)
+return -1;
+return
' SHA-1 to a (preferably sorted) file
when the objects are legitimate, i.e. when it is determined that those
problematic objects should be allowed to enter the server.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
Documentation/config.txt| 8 +++
builtin/receive-pack.c
=warn, but that could hide
missing tree objects in the same commit because we cannot continue
verifying any commit object after encountering a missing committer line,
while we can continue in the case of multiple author lines.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c
to live with them
(e.g. a duplicate 'author' line in an early commit object).
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
Documentation/config.txt | 8
builtin/fsck.c | 13 +
2 files changed, 21 insertions(+)
diff --git a/Documentation/config.txt b
This option avoids unpacking each and all blob objects, and just
verifies the connectivity. In particular with large repositories, this
speeds up the operation, at the expense of missing corrupt blobs,
ignoring unreachable objects and other fsck issues, if any.
Signed-off-by: Johannes Schindelin
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
t/t5504-fetch-receive-strict.sh | 21 +
1 file changed, 21 insertions(+)
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh
index 69ee13c..36024fc 100755
--- a/t/t5504-fetch-receive
lines are mixed up, we punt after encountering
an incorrect line. Therefore, demoting certain warnings to errors can
hide other problems. Example: demoting the missingauthor error to
a warning would hide a problematic committer line.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
When fsck_ident() identifies a problem with the ident, it should still
advance the pointer to the next line so that fsck can continue in the
case of a mere warning.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c | 49 +++--
1
object. For example, if the 'type' line is not
encountered in the correct position, the 'tag' line – if there is any –
would not be handled at all.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fsck.c
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
Documentation/config.txt | 14 ++
1 file changed, 14 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3e37b93..4e5fbea 100644
--- a/Documentation/config.txt
+++ b/Documentation
Some kinds of errors are intrinsically unrecoverable (e.g. errors while
uncompressing objects). It does not make sense to allow demoting them to
mere warnings.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c | 13 +++--
t/t5504-fetch
Some legacy code has objects with non-fatal fsck issues; To enable the
user to ignore those issues, let's print out the ID (e.g. when
encountering missingEmail, the user might want to call `git config
--add receive.fsck.missingEmail=warn`).
Signed-off-by: Johannes Schindelin johannes.schinde
receive.fsckObjects = true, for
example – we strictly separate the fsck.msg-id from the
receive.fsck.msg-id settings.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
Documentation/config.txt | 11 +++
builtin/fsck.c | 12
t/t1450-fsck.sh | 11
types to FSCK_ERROR by default in
those cases.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c | 88 ++
fsck.h | 9 +--
2 files changed, 85 insertions(+), 12 deletions(-)
diff --git a/fsck.c b/fsck.c
index
in append_msg_id() because that
function wants to append camelCased message IDs.
Interdiff below diffstat.
Johannes Schindelin (19):
fsck: Introduce fsck options
fsck: Introduce identifiers for fsck messages
fsck: Provide a function to parse fsck message IDs
fsck: Offer a function to demote fsck
values.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c | 36 ++--
1 file changed, 34 insertions(+), 2 deletions(-)
diff --git a/fsck.c b/fsck.c
index ab24618..1a3f7ce 100644
--- a/fsck.c
+++ b/fsck.c
@@ -63,15 +63,47 @@ enum fsck_msg_id
-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
builtin/index-pack.c | 4
builtin/receive-pack.c | 17 +++--
builtin/unpack-objects.c | 5 +
fsck.c | 8
fsck.h | 1 +
5 files changed, 33 insertions(+), 2 deletions
Just like the diff machinery, we are about to introduce more settings,
therefore it makes sense to carry them around as a (pointer to a) struct
containing all of them.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
builtin/fsck.c | 20 +--
builtin/index-pack.c
message types (i.e. error or warning?). Besides, we want to introduce a
parser in the next commit that maps the string representation to the
enum value, hence we use the slightly ugly preprocessor construct that
is extensible for use with said parser.
Signed-off-by: Johannes Schindelin
and works correctly. And while at it, it makes sure
that multiple options work, too (they are passed to unpack-objects or
index-pack as a comma-separated list via the --strict=... command-line
option).
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c
with the error: prefix, as it used to be
the case before this commit).
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c| 24 +---
t/t5302-pack-index.sh | 2 +-
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/fsck.c b/fsck.c
Hi Junio,
On 2015-06-22 20:04, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
+git --git-dir=dst/.git branch -D bogus
+git --git-dir=dst/.git config --add \
+receive.fsck.missingEmail ignore
+git --git-dir=dst/.git config --add
Hi Junio,
On 2015-06-22 20:02, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
Changes since v6:
- camelCased message IDs
- multiple author checking now as suggested by Junio
- renamed `--quick` to `--connectivity-only`, better commit message
Hi Junio,
On 2015-06-23 00:49, Junio C Hamano wrote:
* js/rebase-i-clean-up-upon-continue-to-skip (2015-06-18) 3 commits
- rebase -i: do not leave a CHERRY_PICK_HEAD file behind
- SQUASH: test_must_fail is a shell function
- t3404: demonstrate CHERRY_PICK_HEAD bug
Abandoning an
Hi Junio,
On 2015-06-19 21:28, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
Some legacy code has objects with non-fatal fsck issues; To enable the
user to ignore those issues, let's print out the ID (e.g. when
encountering missingemail, the user might want
Hi Junio,
On 2015-06-19 22:18, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
When fsck_tag() identifies a problem with the commit, it should try
to make it possible to continue checking the commit object, in case the
user wants to demote the detected errors
Hi Junio,
On 2015-06-19 22:22, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
#define FSCK_FATAL -1
+#define FSCK_INFO -2
#define FOREACH_MSG_ID(FUNC) \
/* fatal errors */ \
@@ -50,15 +51,16 @@
FUNC(ZERO_PADDED_DATE, ERROR) \
/* warnings
Hi Junio,
On 2015-06-19 22:16, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
err = fsck_ident(buffer, commit-object, options);
if (err)
return err;
+while (skip_prefix(buffer, author , buffer)) {
+err = report(options
Hi Junio,
On 2015-06-19 22:21, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
Some kinds of errors are intrinsically unrecoverable (e.g. errors while
uncompressing objects). It does not make sense to allow demoting them to
mere warnings.
Signed-off
Hi Paul,
On 2015-06-19 18:15, Paul Tan wrote:
On Fri, Jun 19, 2015 at 11:09 PM, Junio C Hamano gits...@pobox.com wrote:
The primary thing I care about is to discourage callers of the API element
am_state from touching these fields with strbuf functions. If it is char *
then
the would
Hi Junio,
On 2015-06-19 22:12, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
Note that some problems are too problematic to simply ignore. For
example, when the header lines are mixed up, we punt after encountering
an incorrect line. Therefore, demoting
Hi Junio,
On 2015-06-19 21:13, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
+#define MSG_ID(id, msg_type) { STR(id), FSCK_##msg_type },
static struct {
+const char *id_string;
int msg_type;
} msg_id_info[FSCK_MSG_MAX + 1] = {
FOREACH_MSG_ID
Hi Randall,
On 2015-06-21 07:09, Randall S. Becker wrote:
On June 21, 2015 12:56 AM, Michael Haggerty wrote:
As for thinking of a shorter name for the option: assuming the blob integrity
checks can be turned on and off independently as described above, then I
think
it is reasonable to
Hi Michael,
On 2015-06-21 06:55, Michael Haggerty wrote:
On 06/19/2015 10:53 PM, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
Can you think of a name for the option that is as short as `--quick`
but means the same as `--connectivity-only`?
No I can't. I
Dear Git contributors users,
in this time and age, it appears to be a good idea for Open Source Software
projects to have a document describing their code of conduct. Git for Windows
is no exception, so I opened a ticket:
https://github.com/git-for-windows/git/issues/200
In my opinion it
Hi Junio,
On 2015-06-19 21:26, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
+static inline int substrcmp(const char *string, int len, const char *match)
+{
+int match_len = strlen(match);
+if (match_len != len)
+return -1;
+return
Hi Richard,
On 2015-06-20 21:40, Richard Weinberger wrote:
Yesterday our git server faced a power cut and a git repository broke.
The server is running a ext4 filesystem on top of Linux 3.16 (stable
from openSUSE) and git 2.1.4.
We had a backup, so no data was lost but I really would like to
Hi Junio,
On 2015-06-19 22:39, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
+if (strcmp(var, receive.fsck.skiplist) == 0) {
+const char *path = is_absolute_path(value) ?
+value : git_path(%s, value);
This either absolute
Hi Junio,
On 2015-06-19 21:03, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 48fa472..87ae9ba 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -75,6 +75,7 @@ static int nr_threads
Hi Junio,
On 2015-06-21 19:15, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
But now that I'm writing this, a silly question occurs to me: Do we need
an overall option like this at all? If I demote all blob-integrity
checks to ignore via the mechanism that you have
Hi all,
I just uploaded the 3rd release candidate for the upcoming Git for Windows 2.x
release. Please find the download link here:
https://git-for-windows.github.io/#download
Lots of changes since the first release candidate (v2.4.2, I was too swamped to
announce the second release candidate
Hi Jon,
On 2015-06-20 16:59, Jon wrote:
On Saturday, June 20, 2015 at 10:16:09 AM UTC-4, Johannes Schindelin wrote:
I just uploaded the 3rd release candidate for the upcoming Git for Windows
2.x release. Please find the download link here:
https://git-for-windows.github.io/#download
Lots
Hi Junio,
On 2015-06-22 06:21, Junio C Hamano wrote:
On Fri, Jun 19, 2015 at 6:35 AM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
@@ -227,6 +277,10 @@ static int report(struct fsck_options *options, struct
object *object,
if (msg_type == FSCK_IGNORE
Hi,
On 2015-06-25 03:01, Stefan Beller wrote:
* pt/pull-builtin (2015-06-18) 19 commits
- pull: remove redirection to git-pull.sh
- pull --rebase: error on no merge candidate cases
- pull --rebase: exit early when the working directory is dirty
- pull: configure --rebase via
Hi Junio Wolfgang,
On 2015-06-25 22:24, Junio C Hamano wrote:
Wolfgang Denk w...@denx.de writes:
In message xmqqegkzzoaz@gitster.dls.corp.google.com you wrote:
Question is: how can we fix that?
It could be that 4d0d8975 is buggy and barking at a non breakage.
Well, I would like to
Hi Junio,
On 2015-06-25 15:14, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
- I *think* that the current `recreate_opt()` is fine, but if it
is used more, we will have to quote the arguments to guard against
spaces and quotes and whatnot
I admit
Hi Junio,
On 2015-06-26 00:29, Junio C Hamano wrote:
Junio C Hamano gits...@pobox.com writes:
Johannes Schindelin johannes.schinde...@gmx.de writes:
...
If the buffer does *not* contain an empty line, the fsck code runs the
danger of looking beyond the allocated memory because it uses
Hi Junio,
On 2015-06-23 22:46, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
On 2015-06-23 00:49, Junio C Hamano wrote:
* js/rebase-i-clean-up-upon-continue-to-skip (2015-06-18) 3 commits
- rebase -i: do not leave a CHERRY_PICK_HEAD file behind
- SQUASH
Hi Paul,
On 2015-06-18 13:25, Paul Tan wrote:
diff --git a/builtin/am.c b/builtin/am.c
index dbc8836..af68c51 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -6,6 +6,158 @@
#include cache.h
#include builtin.h
#include exec_cmd.h
+#include parse-options.h
+#include dir.h
+
+struct
Hi Paul,
On 2015-06-18 13:25, Paul Tan wrote:
diff --git a/builtin/am.c b/builtin/am.c
index e9a3687..7b97ea8 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -121,6 +121,96 @@ static void am_destroy(const struct am_state *state)
strbuf_release(sb);
}
+/*
+ * Returns 1 if the
Hi Paul,
On 2015-06-18 13:25, Paul Tan wrote:
diff --git a/git-compat-util.h b/git-compat-util.h
index 0cc7ae8..bc77d77 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -719,6 +719,7 @@ extern void *xrealloc(void *ptr, size_t size);
extern void *xcalloc(size_t nmemb, size_t
Hi Paul,
On 2015-06-18 13:25, Paul Tan wrote:
diff --git a/builtin/am.c b/builtin/am.c
index 7b97ea8..d6434e4 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -94,6 +126,105 @@ static int read_state_file(struct strbuf *sb,
const char *file, size_t hint, int
}
/**
+ * Reads a
Hi Junio,
On 2015-06-18 18:00, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
+ git diff seq-onto
I am puzzled with this diff; what is this about? Is it a remnant
from an earlier debugging session, or is it making sure seq-onto is
a valid tree-ish
would also skip legitimate patches if there were merge conflicts, while
the former would not allow that.
Changes since v2:
- the test uses `--exit-code` to verify that the result of the rebase is
correct
Interdiff below the diffstat.
Johannes Schindelin (2):
t3404: demonstrate
in such a
situation.
However, as pointed out by Gábor Szeder, this leaves a CHERRY_PICK_HEAD
behind, making the Git prompt believe that a cherry pick is still going
on. This commit adds a test case demonstrating this bug.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
t/t3404
--interactive.sh is called.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
git-rebase--interactive.sh| 6 +-
t/t3404-rebase-interactive.sh | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index dc3133f
Hi Gary,
On 2015-06-11 21:21, Gary England wrote:
Using git version 1.9.2-preview20140411, in Git Bash for Windows,
performing a git pull --rebase, received an unhandled exception.
Please note that the newest 1.9.x release is 1.9.5. Could you re-test with that
version, please? Or maybe you
=warn, but that could hide
missing tree objects in the same commit because we cannot continue
verifying any commit object after encountering a missing committer line,
while we can continue in the case of multiple author lines.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c
and works correctly. And while at it, it makes sure
that multiple options work, too (they are passed to unpack-objects or
index-pack as a comma-separated list via the --strict=... command-line
option).
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c
object. For example, if the 'type' line is not
encountered in the correct position, the 'tag' line – if there is any –
would not be handled at all.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fsck.c
values.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c | 30 --
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/fsck.c b/fsck.c
index ab24618..da5717c 100644
--- a/fsck.c
+++ b/fsck.c
@@ -63,15 +63,41 @@ enum fsck_msg_id
types to FSCK_ERROR by default in
those cases.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c | 82 +++---
fsck.h | 10 ++--
2 files changed, 87 insertions(+), 5 deletions(-)
diff --git a/fsck.c b/fsck.c
index
This option avoids unpacking each and all objects, and just verifies the
connectivity. In particular with large repositories, this speeds up the
operation, at the expense of missing corrupt blobs and ignoring
unreachable objects, if any.
Signed-off-by: Johannes Schindelin johannes.schinde
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
Documentation/config.txt | 14 ++
1 file changed, 14 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3e37b93..306ab7a 100644
--- a/Documentation/config.txt
+++ b/Documentation
to live with them
(e.g. a duplicate 'author' line in an early commit object).
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
Documentation/config.txt | 7 +++
builtin/fsck.c | 10 ++
2 files changed, 17 insertions(+)
diff --git a/Documentation/config.txt b
' SHA-1 to a (preferably sorted) file
when the objects are legitimate, i.e. when it is determined that those
problematic objects should be allowed to enter the server.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
Documentation/config.txt| 7 ++
builtin/receive-pack.c
Hi Rusi,
Cc:ing the main Git list, as some of this has been discussed at the GitMerge in
Paris, and some participants of that discussion might want to join this thread.
On 2015-06-19 14:55, Rusi Mody wrote:
Trying to setup git.
Majority folks are MS VS users but also some *nixers.
My
Hi Gary,
On 2015-06-19 16:09, Gary England wrote:
Will do. It's unlikely that I'll be able to reproduce the error. But,
in the event that it happens again, I'll let you know.
For the record, the problem usually lies with a certain implementation detail
on 32-bit only (if you know the
have been renamed to INVALID_* names
Interdiff below the diffstat.
Johannes Schindelin (19):
fsck: Introduce fsck options
fsck: Introduce identifiers for fsck messages
fsck: Provide a function to parse fsck message IDs
fsck: Offer a function to demote fsck errors to warnings
fsck (receive
message types (i.e. error or warning?). Besides, we want to introduce a
parser in the next commit that maps the string representation to the
enum value, hence we use the slightly ugly preprocessor construct that
is extensible for use with said parser.
Signed-off-by: Johannes Schindelin
-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
builtin/index-pack.c | 4
builtin/receive-pack.c | 17 +++--
builtin/unpack-objects.c | 5 +
fsck.c | 8
fsck.h | 1 +
5 files changed, 33 insertions(+), 2 deletions
Some legacy code has objects with non-fatal fsck issues; To enable the
user to ignore those issues, let's print out the ID (e.g. when
encountering missingemail, the user might want to call `git config
--add receive.fsck.missingemail=warn`).
Signed-off-by: Johannes Schindelin johannes.schinde
When fsck_ident() identifies a problem with the ident, it should still
advance the pointer to the next line so that fsck can continue in the
case of a mere warning.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c | 49 +++--
1
lines are mixed up, we punt after encountering
an incorrect line. Therefore, demoting certain warnings to errors can
hide other problems. Example: demoting the missingauthor error to
a warning would hide a problematic committer line.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
t/t5504-fetch-receive-strict.sh | 21 +
1 file changed, 21 insertions(+)
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh
index 69ee13c..3f7e96a 100755
--- a/t/t5504-fetch-receive
Some kinds of errors are intrinsically unrecoverable (e.g. errors while
uncompressing objects). It does not make sense to allow demoting them to
mere warnings.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c | 14 --
t/t5504-fetch
with the error: prefix, as it used to be
the case before this commit).
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c| 24 +---
t/t5302-pack-index.sh | 2 +-
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/fsck.c b/fsck.c
receive.fsckObjects = true, for
example – we strictly separate the fsck.msg-id from the
receive.fsck.msg-id settings.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
Documentation/config.txt | 11 +++
builtin/fsck.c | 12
t/t1450-fsck.sh | 11
-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
builtin/index-pack.c | 4
builtin/receive-pack.c | 17 +++--
builtin/unpack-objects.c | 5 +
fsck.c | 8
fsck.h | 1 +
5 files changed, 33 insertions(+), 2 deletions
When fsck_ident() identifies a problem with the ident, it should still
advance the pointer to the next line so that fsck can continue in the
case of a mere warning.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c | 49 +++--
1
types to FSCK_ERROR by default in
those cases.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c | 82 +++---
fsck.h | 10 ++--
2 files changed, 87 insertions(+), 5 deletions(-)
diff --git a/fsck.c b/fsck.c
index
Some legacy code has objects with non-fatal fsck issues; To enable the
user to ignore those issues, let's print out the ID (e.g. when
encountering missingemail, the user might want to call `git config
--add receive.fsck.missingemail=warn`).
Signed-off-by: Johannes Schindelin johannes.schinde
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
Documentation/config.txt | 14 ++
1 file changed, 14 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3e37b93..306ab7a 100644
--- a/Documentation/config.txt
+++ b/Documentation
with the error: prefix, as it used to be
the case before this commit).
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
fsck.c| 24 +---
t/t5302-pack-index.sh | 2 +-
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/fsck.c b/fsck.c
to live with them
(e.g. a duplicate 'author' line in an early commit object).
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
Documentation/config.txt | 7 +++
builtin/fsck.c | 10 ++
2 files changed, 17 insertions(+)
diff --git a/Documentation/config.txt b
501 - 600 of 5954 matches
Mail list logo
