I am attempting to repair a git repo which has an illegal byte
sequence but am not sure how to proceed. Steps to reproduce: `git
clone https://github.com/christopherpow/nes-test-roms.git` results in:
```
Cloning into 'nes-test-roms'...
remote: Counting objects: 1049, done.
remote: Total 1049
On 2/2/2018 6:30 PM, Junio C Hamano wrote:
Jonathan Tan writes:
After reviewing Derrick's Serialized Git Commit Graph patches [1], I
noticed that "[PATCH v2 11/14] commit: integrate commit graph with
commit parsing" contains (in bsearch_graph) a repeat of some
On 2/2/2018 5:48 PM, Junio C Hamano wrote:
Stefan Beller writes:
It is true for git-submodule and a few others (the minority of commands IIRC)
git-tag for example takes subcommands such as --list or --verify.
On Fri, Feb 2, 2018 at 4:06 PM, Stefan Beller wrote:
> On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote:
>> + ret = malloc(sizeof(struct diff_queue_struct));
>
> Please use xmalloc() and while at it, please use "*ret" as the argument
> to sizeof.
On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote:
> This populates a list of directory renames for us. The list of
> directory renames is not yet used, but will be in subsequent commits.
>
> Signed-off-by: Elijah Newren
> ---
> merge-recursive.c | 155
>
On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote:
> In anticipation of more involved cleanup to come, make a helper function
> for doing the cleanup at the end of handle_renames. Rename the already
> existing cleanup_rename[s]() to final_cleanup_rename[s](), name the new
>
On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote:
> This just adds dir_rename_entry and the associated functions; code using
> these will be added in subsequent commits.
>
> Signed-off-by: Elijah Newren
> ---
> merge-recursive.c | 35
On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote:
> @@ -1354,10 +1345,43 @@ static struct string_list *get_renames(struct
> merge_options *o,
> diffcore_std();
> if (opts.needed_rename_limit > o->needed_rename_limit)
> o->needed_rename_limit
On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote:
> Previously, if !o->detect_rename then get_renames() would return an
> empty string_list, and then process_renames() would have nothing to
> iterate over. It seems more straightforward to simply avoid calling
> either
On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote:
> get_renames() has always zero'ed out diff_queued_diff.nr while only
> manually free'ing diff_filepairs that did not correspond to renames.
> Further, it allocated struct renames that were tucked away in the
> return
Stephen R Guglielmo writes:
> On Tue, Jan 30, 2018 at 6:37 PM, Avery Pennarun wrote:
>>
>> Sorry I can't help more.
>>
>> Good luck,
>>
>> Avery
>
> Thanks all for the discussion/replies.
>
> We use subtrees extensively in our environment right now.
On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote:
> The amount of logic in merge_trees() relative to renames was just a few
> lines, but split it out into new handle_renames() and cleanup_renames()
> functions to prepare for additional logic to be added to each. No code or
Jonathan Tan writes:
> After reviewing Derrick's Serialized Git Commit Graph patches [1], I
> noticed that "[PATCH v2 11/14] commit: integrate commit graph with
> commit parsing" contains (in bsearch_graph) a repeat of some packfile
> functionality. Here is a pack that
Genki Sky writes:
> --> Motivation
>
> commit 4bee95847 ("cherry-pick: add --allow-empty-message option", 2012-08-02)
> started doing this work, but it was never completed. For more discussion
> on why this approach was chosen, see the thread beginning here:
>
>
On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote:
> I want to re-use some other functions in the file without moving those
> other functions or dealing with a handful of annoying split function
> declarations and definitions.
git log --grep "I want" --format="%ad %an
Hi Keith,
On Fri, 2 Feb 2018, Keith Goldfarb wrote:
> > On Feb 2, 2018, at 1:18 PM, Johannes Schindelin
> > wrote:
> >
> > You cannot assume that the inode numbers are identical between file
> > systems/operating systems. That's simply not going to work.
>
> Yes,
Hello ,
I am looking for a reliable supplier /manufacturer of products for sell in
Europe.
I came across your listing and wanted to get some information regarding minimum
Order Quantities, FOB pricing and also the possibility of packaging including
payments terms.
So could you please get
Stefan Beller writes:
> It is true for git-submodule and a few others (the minority of commands IIRC)
> git-tag for example takes subcommands such as --list or --verify.
> https://public-inbox.org/git/xmqqiomodkt9@gitster.dls.corp.google.com/
Thanks. It refers to an
On 01/31, Derrick Stolee wrote:
> On 1/25/2018 6:58 PM, Brandon Williams wrote:
> > Introduce protocol_v2, a new value for 'enum protocol_version'.
> > Subsequent patches will fill in the implementation of protocol_v2.
> >
> > Signed-off-by: Brandon Williams
> > ---
> >
> On Feb 2, 2018, at 1:18 PM, Johannes Schindelin
> wrote:
>
> You cannot assume that the inode numbers are identical between file
> systems/operating systems. That's simply not going to work.
Yes, I agree with you, I cannot assume this, so I checked. In my case,
Subsequent patches will introduce file formats that make use of a fanout
array and a sorted table containing hashes, just like packfiles.
Refactor the hash search in packfile.c into its own function, so that
those patches can make use of it as well.
Signed-off-by: Jonathan Tan
In commit 628522ec1439 ("sha1-lookup: more memory efficient search in
sorted list of SHA-1", 2008-04-09), a different algorithm for searching
a sorted list was introduced, together with a set of log statements
guarded by GIT_DEBUG_LOOKUP that are invoked both when using that
algorithm and when
After reviewing Derrick's Serialized Git Commit Graph patches [1], I
noticed that "[PATCH v2 11/14] commit: integrate commit graph with
commit parsing" contains (in bsearch_graph) a repeat of some packfile
functionality. Here is a pack that refactors that functionality out.
Derrick, consider
On 01/26, Stefan Beller wrote:
> On Thu, Jan 25, 2018 at 3:58 PM, Brandon Williams wrote:
>
> > +ls-refs takes in the following parameters wrapped in packet-lines:
> > +
> > +symrefs
> > + In addition to the object pointed by it, show the underlying ref
> > +
Hi all, in particular packagers,
On Fri, 2 Feb 2018, Johannes Schindelin wrote:
> It is my pleasure to announce that Git for Windows 2.16.1(2) is
> available from:
>
> https://git-for-windows.github.io/
Typically, every Git for Windows version is accompanied with updates to
the Pacman
Attention; Beneficiary,
This is to official inform you that we have been having meetings for the past
three (3) weeks which ended two days ago with MR. JIM YONG KIM the Former world
bank president and other seven continent presidents on the congress we treated
on solution to scam victim
Dear Git users,
It is my pleasure to announce that Git for Windows 2.16.1(2) is available from:
https://git-for-windows.github.io/
The main purpose of this out-of-band release is to update the BusyBox, cURL,
Perl and Heimdal components to newer versions.
Changes since Git for Windows
Hi Keith,
On Fri, 2 Feb 2018, Keith Goldfarb wrote:
> > The purpose of these values is to allow to notice a change on the file
> > system without going through the actual file data. Duplicating
> > st_mtime would be pointless.
>
> Well, I agree with the first statement. I disagree with the 2nd.
Hi,
On Fri, 2 Feb 2018, Genki Sky wrote:
> --> Motivation
I won't comment on the motivation (leaving that up to the Git maintainer),
but on the patch.
The patch on the shell scripts and the C code looks straight-forward
enough, if a little repetitive (but that is hardly your fault).
> diff
Thomas Gummerer writes:
> In addition to the easier to follow code, this makes the output more
> consistent with other commands that print the title of the commit, such
> as 'git commit --oneline' or 'git checkout', which both use
> 'pp_commit_easy()' with the
Nguyễn Thái Ngọc Duy writes:
> Changes since v2 [1]:
>
> - goes back to my original version (yay!) where the extra info
> is appended after the path name. More is described in 2/2
> - --compact-summary is now renamed --stat-with-summary and implies
> --stat
> - 1/2 is
"brian m. carlson" writes:
> This series includes various changes to adopt the use of the_hash_algo
> for abstracting hash algorithms away.
>
> Changes from v1:
> * Fix comments referring to SHA-1.
> * Switch hash function wrappers to take git_hash_ctx *.
> * Use a
"brian m. carlson" writes:
> +#ifndef platform_SHA_CTX
> +/*
> + * platform's underlying implementation of SHA-1; could be OpenSSL,
> + * blk_SHA, Apple CommonCrypto, etc... Note that including
> + * SHA1_HEADER may have already defined platform_SHA_CTX for our
> +
On Fri, Feb 02 2018, Junio C. Hamano jotted:
> Ævar Arnfjörð Bjarmason writes:
>
>> On Thu, Feb 01 2018, Junio C. Hamano jotted:
>>
>>> * nd/fix-untracked-cache-invalidation (2018-01-24) 5 commits
>>> - dir.c: stop ignoring opendir() error in open_cached_dir()
>>> -
Torsten Bögershausen writes:
> There are 2 opposite opionions/user expectations here:
>
> a) They are binary in the working tree, so git should leave the line endings
>as is. (Unless specified otherwise in the .attributes file)
> ...
> b) They are text files in the index. Git
On Fri, Feb 2, 2018 at 11:48 AM, Nicolas Morey-Chaisemartin
wrote:
> What message do you suggest ? As I said in a previous mail, a
> simple "Editor failure, cancelling {commit, tag}" should be enough
> as launch_editor already outputs error messages describing what
>
Duy Nguyen writes:
> On Thu, Feb 1, 2018 at 6:18 AM, Junio C Hamano wrote:
> ...
>> Hmph, how is this new file conceptually different from existing ones
>> like CHERRY_PICK_HEAD?
>
> Conceptually the same, except that CHERRY_PICK_HEAD can't be reused
>
Attention Beneficiary;
Your consignment box unlocking code is BGF25T660AJM,Call or text him on +1(231)
237-2231
I wish to inform you that the diplomatic agent conveying the consignment box
valued the sum of $15.8 Million United States Dollars misplaced your delivery
address and he is
Duy Nguyen writes:
> Subject: [PATCH] Preserve errno in case case before calling sth_errno()
>
> All these locations do something like this
>
> sth_errno(..., somefunc(...));
>
> where somefunc() can potentially change errno, which will be read by
> sth_errno(). Call
Am 02.02.2018 um 15:34 schrieb SZEDER Gábor:
> On Thu, Feb 1, 2018 at 7:56 PM, René Scharfe wrote:
>> 353d84c537 (coccicheck: make transformation for strbuf_addf(sb, "...")
>> more precise) added a check to avoid transforming calls with format
>> strings which contain percent signs,
> The purpose of these values is to allow to notice a change on the file system
> without going through the actual file data. Duplicating st_mtime would be
> pointless.
Well, I agree with the first statement. I disagree with the 2nd. It’s not
pointless to fix a problem, and in theory the
Nguyễn Thái Ngọc Duy writes:
> v3 fixes tests in 2/2 that I overlooked (but Jeff didn't). Interdiff:
> ...
> Nguyễn Thái Ngọc Duy (2):
> format-patch: keep cover-letter diffstat wrapped in 72 columns
> format-patch: reduce patch diffstat width to 72
Thanks, will replace.
On Thu, Feb 1, 2018 at 3:33 PM, Jonathan Tan wrote:
> On Tue, 30 Jan 2018 16:39:34 -0500
> Derrick Stolee wrote:
>
>> diff --git a/Documentation/git-commit-graph.txt
>> b/Documentation/git-commit-graph.txt
>> index c8ea548dfb..3f3790d9a8 100644
>> ---
On Thu, Feb 1, 2018 at 6:13 PM, Timothee Cour wrote:
> this PR from october 2017 was discussing a patch that'd introduce
> `--color-moved-[no-]ignore-space-change`
> https://public-inbox.org/git/20171025224620.27657-3-sbel...@google.com/
>
> however not sure what
Ævar Arnfjörð Bjarmason writes:
> On Thu, Feb 01 2018, Junio C. Hamano jotted:
>
>> * ab/wildmatch-tests (2018-01-30) 10 commits
> The 2018-01-30 series is the update mentioned in
> 87vaga9mgf@evledraar.gmail.com. You probably noticed this / just
> didn't adjust the note
Ævar Arnfjörð Bjarmason writes:
> On Thu, Feb 01 2018, Junio C. Hamano jotted:
>
>> * nd/fix-untracked-cache-invalidation (2018-01-24) 5 commits
>> - dir.c: stop ignoring opendir() error in open_cached_dir()
>> - update-index doc: note a fixed bug in the untracked cache
>> -
Am 02.02.2018 um 00:10 schrieb Keith Goldfarb:
Dear git,
While tracking down a problem with a filesystem shared by Windows and Ubuntu, I
came across the following code in compat/mingw.c (ming_fstat(), also in
do_lstat()):
if (GetFileInformationByHandle(fh, )) {
Le 02/02/2018 à 10:57, Eric Sunshine a écrit :
> On Fri, Feb 2, 2018 at 2:15 AM, Nicolas Morey-Chaisemartin
> wrote:
>> Le 02/02/2018 à 02:29, Eric Sunshine a écrit :
>>> On Thu, Feb 1, 2018 at 12:21 PM, Nicolas Morey-Chaisemartin
>>>
> The commit graph feature is controlled by the new core.commitgraph config
> setting. This defaults to 0, so the feature is opt-in.
>
> The intention of core.commitgraph is that a user can always stop checking
> for or parsing commit graph files if core.commitgraph=0.
>
> Signed-off-by: Derrick
> Teach Git to write a commit graph file by checking all packed objects
> to see if they are commits, then store the file in the given pack
> directory.
I'm afraid that scanning all packed objects is a bit of a roundabout
way to approach this.
In my git repo, with 9 pack files at the moment,
> Teach git-commit-graph to delete the graph previously referenced by
> 'graph_head'
> when writing a new graph file and updating 'graph_head'. This prevents
> data creep by storing a list of useless graphs. Be careful to not delete
> the graph if the file did not change.
We have to be careful
On Thu, Feb 1, 2018 at 7:56 PM, René Scharfe wrote:
> 353d84c537 (coccicheck: make transformation for strbuf_addf(sb, "...")
> more precise) added a check to avoid transforming calls with format
> strings which contain percent signs, as that would change the result.
> It uses
On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy wrote:
> [...]
> - $GIT_WORK_TREE _can_ be missing if the worktree is locked. In that
> case we must not delete $GIT_DIR because the real $GIT_WORK_TREE may
> be in a usb stick somewhere. This is already handled because
On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy wrote:
> This command allows to delete a worktree. Like 'move' you cannot
> remove the main worktree, or one with submodules inside [1].
> [...]
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> diff --git
On Fri, Feb 2, 2018 at 4:15 AM, Eric Sunshine wrote:
> On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy
> wrote:
>> +static int move_worktree(int ac, const char **av, const char *prefix)
>> +{
>> + [...]
>> + worktrees =
On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy wrote:
> Submodules contains .git files with relative paths. After a worktree
> move, these files need to be updated or they may point to nowhere.
>
> This is a bandage patch to make sure "worktree move" don't break
>
On Fri, Feb 2, 2018 at 2:15 AM, Nicolas Morey-Chaisemartin
wrote:
> Le 02/02/2018 à 02:29, Eric Sunshine a écrit :
>> On Thu, Feb 1, 2018 at 12:21 PM, Nicolas Morey-Chaisemartin
>> wrote:
>>> - I'll post another series to fix the
On Fri, Feb 2, 2018 at 4:46 PM, Eric Sunshine wrote:
> On Fri, Feb 2, 2018 at 4:25 AM, Duy Nguyen wrote:
>> On Wed, Jan 31, 2018 at 02:59:32PM -0800, Junio C Hamano wrote:
>>> Eric Sunshine writes:
>>> > On Wed, Jan 31, 2018
On 01/02/18 00:14, Hareesh Rajan wrote:
Hi,
I use git remote helper to export/import repository content. Git
internally uses fast-export command and it seems like the options to
detect move and copy (-M/-C) are not being used.
Logging this issue requesting a fix to the remote helper to generate
On Fri, Feb 2, 2018 at 4:25 AM, Duy Nguyen wrote:
> On Wed, Jan 31, 2018 at 02:59:32PM -0800, Junio C Hamano wrote:
>> Eric Sunshine writes:
>> > On Wed, Jan 31, 2018 at 4:30 AM, Nguyễn Thái Ngọc Duy
>> > wrote:
>> >> + len =
On Fri, Feb 2, 2018 at 3:23 PM, Eric Sunshine wrote:
> On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy
> wrote:
>> diff --git a/worktree.c b/worktree.c
>> @@ -326,6 +326,24 @@ int validate_worktree(const struct worktree *wt, struct
>> strbuf
On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy wrote:
> Similar to "mv a b/", which is actually "mv a b/a", we extract basename
> of source worktree and create a directory of the same name at
> destination if dst path is a directory.
>
> Signed-off-by: Nguyễn Thái Ngọc
Le 02/02/2018 à 02:29, Eric Sunshine a écrit :
> On Thu, Feb 1, 2018 at 12:21 PM, Nicolas Morey-Chaisemartin
> wrote:
>> Add a --edit option whichs allows modifying the messages provided by -m or
>> -F,
>> the same way git commit --edit does.
>>
>> Signed-off-by:
On Wed, Jan 31, 2018 at 02:59:32PM -0800, Junio C Hamano wrote:
> Eric Sunshine writes:
>
> > On Wed, Jan 31, 2018 at 4:30 AM, Nguyễn Thái Ngọc Duy
> > wrote:
> >> Pointing the user to $GIT_DIR/rebase-apply may encourage them to mess
> >> around in
On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy wrote:
> This command allows to relocate linked worktrees. Main worktree cannot
> (yet) be moved.
> [...]
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> diff --git a/Documentation/git-worktree.txt
On Wed, Jan 24, 2018 at 4:53 AM, Nguyễn Thái Ngọc Duy wrote:
> diff --git a/worktree.c b/worktree.c
> @@ -326,6 +326,24 @@ int validate_worktree(const struct worktree *wt, struct
> strbuf *errmsg)
> +void update_worktree_location(struct worktree *wt, const char *path_)
> +{
>
66 matches
Mail list logo