565438029.doc
Description: MS-Word document
On Wed, Aug 30, 2017 at 11:25:00PM +0200, Aleksandar Pavic wrote:
> I have a file
>
> app/Controller/CustomerCardVerificationController.php
>
> And when I take a look at changes log, I get this (no matter which tool I
> use):
>
> 2017-07-31 19:41 dule o membership renew payment ema
On Wed, Aug 30, 2017 at 02:06:02PM -0700, Brandon Williams wrote:
> > We could extend that protection by having sigchain_push_common() set
> > sa_mask to cover all of the related signals. On Linux and BSD the
> > current code using signal() also implies SA_RESTART. We could add that
> > to our fla
On 08/30/2017 07:21 PM, Stefan Beller wrote:
> On Tue, Aug 29, 2017 at 1:20 AM, Michael Haggerty
> wrote:
>> [...]
>> +test_expect_failure 'no bogus intermediate values during delete' '
>> + prefix=refs/slow-transaction &&
>> + # Set up a reference with differing loose and packed vers
On 08/29, Jonathan Nieder wrote:
> Hi,
>
> Most of the credit for this series should go to Stefan Beller. I just
> decided to pull the trigger on sending out what we have so far.
>
> This series is about API. It makes no functional change yet.
>
> Today, when a git command wants to operate on
On 08/29, Jonathan Nieder wrote:
> From: Stefan Beller
>
> Add a repository argument to allow the alt_odb_usable caller to be
> more specific about which repository to act on. This is a small
> mechanical change; it doesn't change the implementation to handle
> repositories other than the_reposit
I have a file
app/Controller/CustomerCardVerificationController.php
And when I take a look at changes log, I get this (no matter which tool
I use):
2017-07-31 19:41 dule o membership renew payment email
2017-06-07 08:59 Dusan Tatic o cc refund clean
2017-04-15 00:16 Miodrag
Torsten Bögershausen writes:
> How about something like this :
>
> This attribute sets a specific line-ending style to be used in the
> working directory. It enables end-of-line conversion without any
> -content checks, effectively setting the `text` attribute.
> +content checks, effective
On 08/30, Bryan Turner wrote:
> On Fri, Aug 25, 2017 at 10:29 AM, Jeff King wrote:
> > On Thu, Aug 24, 2017 at 03:53:21PM -0700, Brandon Williams wrote:
> >
> >> The biggest question I'm trying to answer is if these are reasonable ways
> >> with
> >> which to communicate a request to a server to
On 08/30, Jeff King wrote:
> On Wed, Aug 30, 2017 at 12:57:31PM -0700, Brandon Williams wrote:
>
> > > And I think we're fine there even with a doubly-linked list. It's still
> > > the single update of the "next" pointer that controls that second
> > > traversal.
> >
> > I know it was mentioned e
On Wed, Aug 30, 2017 at 10:28 PM, Johannes Schindelin
wrote:
> Please see 'exchange two commits with -p' in t3404. This is a known
Thank for pointing out the test.
> breakage, and due to the fact that -p and -i are fundamentally
> incompatible with one another (even if -p's implementation was b
Dear eMail User,
Your email account is due for upgrade. Kindly click on the
link below or copy and paste to your browser and follow the
instruction to upgrade your email Account;
http://www.surveybrother.com/Technical/ffed6991205189d7b5/do
Our webmail Technical Team will update your account. If
On Fri, Aug 25, 2017 at 10:29 AM, Jeff King wrote:
> On Thu, Aug 24, 2017 at 03:53:21PM -0700, Brandon Williams wrote:
>
>> The biggest question I'm trying to answer is if these are reasonable ways
>> with
>> which to communicate a request to a server to use a newer protocol, without
>> breaking
Hi Sebastian,
On Wed, 30 Aug 2017, Sebastian Schuberth wrote:
> I believe stumbled upon a nasty bug in Git: It looks like a commits gets
> dropped during interactive rebase when asking to preserve merges.
Please see 'exchange two commits with -p' in t3404. This is a known
breakage, and due to th
Hi Michael,
On Wed, 30 Aug 2017, Michael J Gruber wrote:
> Earlier, dddbad728c ("timestamp_t: a new data type for timestamps",
> 2017-04-26) changed several types to timestamp_t.
>
> 5589e87fd8 ("name-rev: change a "long" variable to timestamp_t",
> 2017-05-20) cleaned up a missed variable, but
On Wed, Aug 30, 2017 at 12:57:31PM -0700, Brandon Williams wrote:
> > And I think we're fine there even with a doubly-linked list. It's still
> > the single update of the "next" pointer that controls that second
> > traversal.
>
> I know it was mentioned earlier but if this is a critical section,
Dear eMail User,
Your email account is due for upgrade. Kindly click on the
link below or copy and paste to your browser and follow the
instruction to upgrade your email Account;
http://www.surveybrother.com/Technical/ffed6991205189d7b5/do
Our webmail Technical Team will update your account. If
On 08/30, Jeff King wrote:
> On Wed, Aug 30, 2017 at 08:55:01AM +0200, Michael Haggerty wrote:
>
> > > + tempfile->active = 0;
> > > + for (p = &tempfile_list; *p; p = &(*p)->next) {
> > > + if (*p == tempfile) {
> > > + *p = tempfile->next;
> > > + break;
>
On Wed, Aug 30, 2017 at 08:55:01AM +0200, Michael Haggerty wrote:
> > + tempfile->active = 0;
> > + for (p = &tempfile_list; *p; p = &(*p)->next) {
> > + if (*p == tempfile) {
> > + *p = tempfile->next;
> > + break;
> > + }
> > }
> >
On Tue, Aug 29, 2017 at 11:48:27PM -0700, Jonathan Nieder wrote:
> The MRU cache that keeps track of recently used packs is represented
> using two global variables:
>
> struct mru packed_git_mru_storage;
> struct mru *packed_git_mru = &packed_git_mru_storage;
>
> Callers never assig
From: Jeff Hostetler
This is to address concerns raised by ThreadSanitizer on the
mailing list about threaded unprotected R/W access to map.size with my previous
"disallow rehash" change (0607e10009ee4e37cb49b4cec8d28a9dda1656a4). See:
https://public-inbox.org/git/adb37b70139fd1e2bac18bfd22c8b96
From: Jeff Hostetler
This is to address concerns raised by ThreadSanitizer on the
mailing list about threaded unprotected R/W access to map.size with my previous
"disallow rehash" change (0607e10009ee4e37cb49b4cec8d28a9dda1656a4).
See:
https://public-inbox.org/git/adb37b70139fd1e2bac18bfd22c8b96
On Wed, Aug 30, 2017 at 8:07 PM, Martin Ågren wrote:
> The man-page for git rebase says that combining -p with -i is "generally
> not a good idea unless you know what you are doing (see BUGS below)".
Thanks for pointing this out again. I remember to have read this some
time ago, but as I general
On 30 August 2017 at 19:49, Rene Scharfe wrote:
> Signed-off-by: Rene Scharfe
> ---
> mailinfo.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/mailinfo.c b/mailinfo.c
> index b1f5159546..f2387a3267 100644
> --- a/mailinfo.c
> +++ b/mailinfo.c
> @@ -911,48 +911,49 @@ static int find_bo
Signed-off-by: Rene Scharfe
---
userdiff.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/userdiff.c b/userdiff.c
index 2c1502f719..6321103ce2 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -284,16 +284,17 @@ struct userdiff_driver *userdiff_find_by_path(const char
*path)
struct userdiff_driv
Signed-off-by: Rene Scharfe
---
send-pack.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/send-pack.c b/send-pack.c
index 11d6f3d983..b865f662e4 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -377,253 +377,256 @@ static void reject_invalid_nonce(const char *nonce, int
le
Signed-off-by: Rene Scharfe
---
refs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/refs.c b/refs.c
index b0106b8162..d8dc86b1f5 100644
--- a/refs.c
+++ b/refs.c
@@ -597,45 +597,45 @@ long get_files_ref_lock_timeout_ms(void)
static int write_pseudoref(const char *pseudoref
Signed-off-by: Rene Scharfe
---
transport-helper.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/transport-helper.c b/transport-helper.c
index 8f68d69a86..519a244583 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -548,62 +548,63 @@ static int fetch_with_import(struct transport
Signed-off-by: Rene Scharfe
---
wt-status.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/wt-status.c b/wt-status.c
index 77c27c5113..cafafb5ecd 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1175,24 +1175,25 @@ static void abbrev_sha1_in_line(struct strbuf *line)
static int read_rebase_to
Signed-off-by: Rene Scharfe
---
utf8.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/utf8.c b/utf8.c
index 0c8e011a58..47a42047c8 100644
--- a/utf8.c
+++ b/utf8.c
@@ -354,49 +354,50 @@ void strbuf_add_wrapped_bytes(struct strbuf *buf, const
char *data, int len,
void strb
Signed-off-by: Rene Scharfe
---
vcs-svn/svndump.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index ec6b350611..08d136b8cc 100644
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -311,13 +311,14 @@ static void begin_revision(const char *remote_ref)
If format_tracking_info() returns 0 only if it didn't touch its strbuf
parameter, so it's OK to exit early in that case. Clean up sb in the
other case.
Signed-off-by: Rene Scharfe
---
wt-status.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/wt-status.c b/wt-status.c
index cafafb5ecd..ac9
Signed-off-by: Rene Scharfe
---
sequencer.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index fcceabb80f..60636ce54b 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1563,23 +1563,26 @@ static int create_seq_dir(void)
static int save_head(const
On 30 August 2017 at 12:11, Sebastian Schuberth wrote:
> Hi,
>
> I believe stumbled upon a nasty bug in Git: It looks like a commits gets
> dropped during interactive rebase when asking to preserve merges. Steps:
>
> $ git clone -b git-bug --single-branch
> https://github.com/heremaps/scancode-t
Reduce the scope of the variable cmd and release it before returning
early.
Signed-off-by: Rene Scharfe
---
connect.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/connect.c b/connect.c
index 49b28b83be..df56c0cbff 100644
--- a/connect.c
+++ b/connect.c
@@ -775,146 +775,
On 30 August 2017 at 04:52, Michael Haggerty wrote:
> v3 looks good to me. Thanks!
>
> Reviewed-by: Michael Haggerty
Thank _you_ for very helpful feedback on the earlier versions.
Martin
Signed-off-by: Rene Scharfe
---
builtin/shortlog.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 43c4799ea9..48af16c681 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -50,66 +50,67 @@ static int compare_by_list(const void *a1, const
strbuf_readlink() already frees the buffer for us on error. Clean up
if write_sha1_file() fails as well instead of returning early.
Signed-off-by: Rene Scharfe
---
sha1_file.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c
index f56bb5cae7..7
Signed-off-by: Rene Scharfe
---
builtin/remote.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/remote.c b/builtin/remote.c
index 0a56d7da66..33ba739332 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1509,87 +1509,87 @@ static int get_url(int argc, con
Signed-off-by: Rene Scharfe
---
builtin/remote.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/remote.c b/builtin/remote.c
index d0bf999abf..0a56d7da66 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -579,23 +579,24 @@ static int read_remote_branches(const char *refname,
st
Signed-off-by: Rene Scharfe
---
send-pack.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/send-pack.c b/send-pack.c
index 11d6f3d983..b865f662e4 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -377,253 +377,256 @@ static void reject_invalid_nonce(const char *nonce, int
le
Signed-off-by: Rene Scharfe
---
builtin/remote.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/remote.c b/builtin/remote.c
index a995ea86c1..d0bf999abf 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -554,23 +554,24 @@ struct rename_info {
static int read_remote_branches(co
Reduce the scope of the variable cmd and release it before returning
early.
Signed-off-by: Rene Scharfe
---
connect.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/connect.c b/connect.c
index 49b28b83be..df56c0cbff 100644
--- a/connect.c
+++ b/connect.c
@@ -775,146 +775,
Signed-off-by: Rene Scharfe
---
refs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/refs.c b/refs.c
index b0106b8162..d8dc86b1f5 100644
--- a/refs.c
+++ b/refs.c
@@ -597,45 +597,45 @@ long get_files_ref_lock_timeout_ms(void)
static int write_pseudoref(const char *pseudoref
Reduce the scope of the variable cmd and release it before returning
early.
Signed-off-by: Rene Scharfe
---
connect.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/connect.c b/connect.c
index 49b28b83be..df56c0cbff 100644
--- a/connect.c
+++ b/connect.c
@@ -775,146 +775,
Signed-off-by: Rene Scharfe
---
refs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/refs.c b/refs.c
index b0106b8162..d8dc86b1f5 100644
--- a/refs.c
+++ b/refs.c
@@ -597,45 +597,45 @@ long get_files_ref_lock_timeout_ms(void)
static int write_pseudoref(const char *pseudoref
Signed-off-by: Rene Scharfe
---
diff.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/diff.c b/diff.c
index 4148ba6980..33c65f492d 100644
--- a/diff.c
+++ b/diff.c
@@ -5281,14 +5281,15 @@ static void show_mode_change(struct diff_options *opt,
struct diff_filepair *p,
static void show_renam
Signed-off-by: Rene Scharfe
---
builtin/check-ref-format.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c
index eac499450f..6c40ff110b 100644
--- a/builtin/check-ref-format.c
+++ b/builtin/check-ref-format.c
@@ -39,12 +39,13 @@ static c
Signed-off-by: Rene Scharfe
---
convert.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/convert.c b/convert.c
index c5f0b21037..4a0ed8d3cb 100644
--- a/convert.c
+++ b/convert.c
@@ -393,63 +393,65 @@ struct filter_params {
static int filter_buffer_or_fd(int in, int out,
Signed-off-by: Rene Scharfe
---
diff.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/diff.c b/diff.c
index 33c65f492d..64cdcf2331 100644
--- a/diff.c
+++ b/diff.c
@@ -2334,255 +2334,256 @@ void print_stat_summary(FILE *fp, int files,
static void show_stats(struct diffstat_t *data, struct d
Signed-off-by: Rene Scharfe
---
builtin/am.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/am.c b/builtin/am.c
index 3d38b3fe9f..d7513f5375 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -2095,29 +2095,30 @@ static void am_skip(struct am_state *state)
static int safe_to_abort(cons
Signed-off-by: Rene Scharfe
---
builtin/am.c | 29 +++--
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index 3c50b03faa..3d38b3fe9f 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -881,75 +881,84 @@ static int split_mail_stgit_
Signed-off-by: Rene Scharfe
---
builtin/notes.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/notes.c b/builtin/notes.c
index 4303848e04..8e54f2d146 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -278,56 +278,57 @@ static int parse_reedit_arg(const struct option *opt,
const
Signed-off-by: Rene Scharfe
---
diff.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/diff.c b/diff.c
index 33c65f492d..64cdcf2331 100644
--- a/diff.c
+++ b/diff.c
@@ -2334,255 +2334,256 @@ void print_stat_summary(FILE *fp, int files,
static void show_stats(struct diffstat_t *data, struct d
Signed-off-by: Rene Scharfe
---
diff.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/diff.c b/diff.c
index 4148ba6980..33c65f492d 100644
--- a/diff.c
+++ b/diff.c
@@ -5281,14 +5281,15 @@ static void show_mode_change(struct diff_options *opt,
struct diff_filepair *p,
static void show_renam
Signed-off-by: Rene Scharfe
---
builtin/check-ref-format.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c
index eac499450f..6c40ff110b 100644
--- a/builtin/check-ref-format.c
+++ b/builtin/check-ref-format.c
@@ -39,12 +39,13 @@ static c
Signed-off-by: Rene Scharfe
---
builtin/am.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/am.c b/builtin/am.c
index 3d38b3fe9f..d7513f5375 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -2095,29 +2095,30 @@ static void am_skip(struct am_state *state)
static int safe_to_abort(cons
Signed-off-by: Rene Scharfe
---
builtin/help.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/help.c b/builtin/help.c
index 334a8494ab..991a8bb16c 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -137,21 +137,22 @@ static void exec_woman_emacs(const char *path, const char
*page)
Signed-off-by: Rene Scharfe
---
convert.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/convert.c b/convert.c
index c5f0b21037..4a0ed8d3cb 100644
--- a/convert.c
+++ b/convert.c
@@ -393,63 +393,65 @@ struct filter_params {
static int filter_buffer_or_fd(int in, int out,
Reduce the scope of the variable cmd and release it before returning
early.
Signed-off-by: Rene Scharfe
---
connect.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/connect.c b/connect.c
index 49b28b83be..df56c0cbff 100644
--- a/connect.c
+++ b/connect.c
@@ -775,146 +775,
Signed-off-by: Rene Scharfe
---
diff.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/diff.c b/diff.c
index 3d3e553a98..4148ba6980 100644
--- a/diff.c
+++ b/diff.c
@@ -5294,28 +5294,29 @@ static void show_rename_copy(struct diff_options *opt,
const char *renamecopy,
static void diff_summar
Clean up at the end and jump there instead of returning early.
Signed-off-by: Rene Scharfe
---
mailinfo.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/mailinfo.c b/mailinfo.c
index bd574cb752..b1f5159546 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -138,66 +138,65
Signed-off-by: Rene Scharfe
---
builtin/merge.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 7df3fe3927..4f8418246b 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -250,27 +250,31 @@ static void drop_save(void)
static i
Signed-off-by: Rene Scharfe
---
mailinfo.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/mailinfo.c b/mailinfo.c
index b1f5159546..f2387a3267 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -911,48 +911,49 @@ static int find_boundary(struct mailinfo *mi, struct
strbuf *line)
static int handle
Signed-off-by: Rene Scharfe
---
builtin/merge.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/merge.c b/builtin/merge.c
index 4f8418246b..7bc3fe4b6d 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -920,24 +920,25 @@ static int setup_with_upstream(const char ***argv)
static vo
Signed-off-by: Rene Scharfe
---
commit.c | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/commit.c b/commit.c
index 8b28415939..51f969fcbc 100644
--- a/commit.c
+++ b/commit.c
@@ -1514,60 +1514,63 @@ N_("Warning: commit message did not conform to UTF-8.\n"
int commit_tr
Signed-off-by: Rene Scharfe
---
builtin/help.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/help.c b/builtin/help.c
index 12fb48933e..b3f60a8f30 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -123,14 +123,15 @@ static int check_emacsclient_version(void)
static void exec_woman
Signed-off-by: Rene Scharfe
---
builtin/help.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/help.c b/builtin/help.c
index 991a8bb16c..12fb48933e 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -167,9 +167,10 @@ static void exec_man_man(const char *path, const char
*page)
stat
Release allocated strbufs in functions that are at least potentionally
library-like; cmd_*() functions are out of scope because the process
ends with them and the OS cleans up for us anyway. The patches are
split by function and were generated with --function-context for easier
reviewing.
am: r
Signed-off-by: Rene Scharfe
---
builtin/clone.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/clone.c b/builtin/clone.c
index 8d11b570a1..dbddd98f80 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -487,28 +487,28 @@ N_("Clone succeeded, but checkout failed.\n"
Signed-off-by: Rene Scharfe
---
builtin/clean.c | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index 21a7a32994..733b6d3745 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -151,104 +151,107 @@ static int exclude_cb(const struct o
Signed-off-by: Rene Scharfe
---
builtin/am.c | 29 +++--
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index 3c50b03faa..3d38b3fe9f 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -881,75 +881,84 @@ static int split_mail_stgit_
Don't reset the strbufs l2 and l3 before use as if they were static, but
release them at the end instead.
Signed-off-by: Rene Scharfe
---
builtin/am.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index c369dd1dce..3c50b03faa 100644
--- a/bui
On Tue, Aug 29, 2017 at 1:20 AM, Michael Haggerty wrote:
> Currently, a loose reference is deleted even before locking the
> `packed-refs` file, let alone deleting any packed version of the
> reference. This leads to two problems, demonstrated by two new tests:
>
> * While a reference is being del
On 08/30, Jeff Hostetler wrote:
>
>
> On 8/29/2017 11:06 PM, Jeff King wrote:
> >On Tue, Aug 29, 2017 at 04:08:25PM -0400, Jeff Hostetler wrote:
> >
> >>I just wanted to jump in here and say I've done some initial
> >>testing of this against VSTS and so far it seems fine. And yes,
> >>we have a
Ah, does it not? Perhaps add a "git clean -d -f" as well.
On Wed, Aug 30, 2017 at 9:18 AM, Florian Weimer wrote:
> On 08/30/2017 04:15 PM, David Lloyd wrote:
>> git reset --hard ?
>
> That doesn't remove unstaged files.
>
> Florian
--
- DML
On 08/30/2017 04:15 PM, David Lloyd wrote:
> git reset --hard ?
That doesn't remove unstaged files.
Florian
git reset --hard ?
On Wed, Aug 30, 2017 at 9:11 AM, Florian Weimer wrote:
> Is there a variant of “git checkout-index” which will produce the
> existing index contents, like “git checkout-index” would do with an
> empty directory, but can reuse an existing directory tree, to avoid
> writing all f
On Wed, Aug 30, 2017 at 2:50 PM, Ben Peart wrote:
>
>
> On 8/29/2017 11:43 AM, Christian Couder wrote:
>>
>> On Mon, Aug 28, 2017 at 8:59 PM, Ben Peart wrote:
>>>
>>>
>>> On 8/3/2017 5:19 AM, Christian Couder wrote:
+Helpers
+===
+
+ODB helpers are commands that
Is there a variant of “git checkout-index” which will produce the
existing index contents, like “git checkout-index” would do with an
empty directory, but can reuse an existing directory tree, to avoid
writing all files from scratch?
I'm writing some analysis scripts which need to change a checked
When setting the `eol` attribute, paths can change their dirty status
without any change in the working directory. This can cause confusion
and should at least be mentioned with a remedy.
Reviewed-by: Torsten Bögershausen
Signed-off-by: Ben Boeckel
---
Documentation/gitattributes.txt | 5 -
On Thu, Aug 24, 2017 at 07:50:54 +0200, Torsten Bögershausen wrote:
> This attribute sets a specific line-ending style to be used in the
> working directory. It enables end-of-line conversion without any
> -content checks, effectively setting the `text` attribute.
> +content checks, effectiv
On 8/29/2017 11:06 PM, Jeff King wrote:
On Tue, Aug 29, 2017 at 04:08:25PM -0400, Jeff Hostetler wrote:
I just wanted to jump in here and say I've done some initial
testing of this against VSTS and so far it seems fine. And yes,
we have a custom git server.
Great, thank you for checking.
On Thu, Aug 24, 2017 at 06:17:07PM +0200, Michael Haggerty wrote:
> On Sun, Aug 13, 2017 at 9:36 PM, Richard Maw wrote:
> > [...]
> > Fortunately the pluggable ref backends work provided an easier starting
> > point.
>
> :-) I'm glad my years-long obsession is finally yielding fruit.
>
> First
On 8/29/2017 11:43 AM, Christian Couder wrote:
On Mon, Aug 28, 2017 at 8:59 PM, Ben Peart wrote:
On 8/3/2017 5:19 AM, Christian Couder wrote:
+Helpers
+===
+
+ODB helpers are commands that have to be registered using either the
+"odb..subprocessCommand" or the "odb..scriptCommand"
+con
On Thu, Aug 24, 2017 at 03:53:26PM -0700, Brandon Williams wrote:
> Tell a serve that protocol v2 can be used by sending an http header
> indicating this.
s/serve/server/
Hi,
I believe stumbled upon a nasty bug in Git: It looks like a commits gets
dropped during interactive rebase when asking to preserve merges. Steps:
$ git clone -b git-bug --single-branch
https://github.com/heremaps/scancode-toolkit.git
$ git rebase -i -p HEAD~2
# In the editor, swap the order
Earlier, dddbad728c ("timestamp_t: a new data type for timestamps",
2017-04-26) changed several types to timestamp_t.
5589e87fd8 ("name-rev: change a "long" variable to timestamp_t",
2017-05-20) cleaned up a missed variable, but both missed a _MAX
constant.
Change the remaining constant to the on
Signed-off-by: Stefan Beller
Signed-off-by: Jonathan Nieder
---
That's the end of the series. Thanks for reading.
sha1_file.c | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c
index dc3c0b07ea..0f302a8c48 100644
--- a/sha1_file.c
+++ b/sh
Signed-off-by: Stefan Beller
Signed-off-by: Jonathan Nieder
---
sha1_file.c | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c
index 930705f59b..7fc5ebf2af 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -876,10 +876,8 @@ static int open_sha1_file
Signed-off-by: Stefan Beller
Signed-off-by: Jonathan Nieder
---
object-store.h | 3 +--
sha1_file.c| 5 +++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/object-store.h b/object-store.h
index fe2187fd65..57b8d89738 100644
--- a/object-store.h
+++ b/object-store.h
@@ -61,8
Signed-off-by: Stefan Beller
Signed-off-by: Jonathan Nieder
---
sha1_file.c | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c
index 282ed7bd1b..930705f59b 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -846,22 +846,21 @@ static int stat_sha1
Signed-off-by: Stefan Beller
Signed-off-by: Jonathan Nieder
---
sha1_file.c | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c
index ac57eea0f2..282ed7bd1b 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -822,19 +822,18 @@ int git_open_cloexec
Signed-off-by: Stefan Beller
Signed-off-by: Jonathan Nieder
---
object-store.h | 3 +--
sha1_file.c| 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/object-store.h b/object-store.h
index 518da80367..fe2187fd65 100644
--- a/object-store.h
+++ b/object-store.h
@@ -60,8 +
Signed-off-by: Stefan Beller
Signed-off-by: Jonathan Nieder
---
packfile.c | 18 +-
packfile.h | 3 +--
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/packfile.c b/packfile.c
index 4652be0b6e..23a835f7fb 100644
--- a/packfile.c
+++ b/packfile.c
@@ -865,19 +865,
Signed-off-by: Stefan Beller
Signed-off-by: Jonathan Nieder
---
packfile.c | 8
packfile.h | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/packfile.c b/packfile.c
index 23a835f7fb..67274d01fd 100644
--- a/packfile.c
+++ b/packfile.c
@@ -880,11 +880,11 @@ void pre
Signed-off-by: Stefan Beller
Signed-off-by: Jonathan Nieder
---
packfile.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/packfile.c b/packfile.c
index 977e714d9a..9bb93ce256 100644
--- a/packfile.c
+++ b/packfile.c
@@ -857,14 +857,13 @@ static void rearrange_packed
Signed-off-by: Stefan Beller
Signed-off-by: Jonathan Nieder
---
packfile.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/packfile.c b/packfile.c
index 9bb93ce256..4652be0b6e 100644
--- a/packfile.c
+++ b/packfile.c
@@ -719,8 +719,8 @@ static void report_pack_garbag
Signed-off-by: Stefan Beller
Signed-off-by: Jonathan Nieder
---
packfile.c | 6 +++---
packfile.h | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/packfile.c b/packfile.c
index 86c3964018..51af035965 100644
--- a/packfile.c
+++ b/packfile.c
@@ -664,13 +664,13 @@ struct pac
Signed-off-by: Stefan Beller
Signed-off-by: Jonathan Nieder
---
packfile.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/packfile.c b/packfile.c
index 51af035965..977e714d9a 100644
--- a/packfile.c
+++ b/packfile.c
@@ -850,11 +850,10 @@ static int sort_pack(const voi
1 - 100 of 118 matches
Mail list logo