Re: [PATCH] format-patch: respect --stat when explicitly specified

2018-11-06 Thread Leif Lindholm
On Tue, Nov 06, 2018 at 04:56:11PM +0100, Duy Nguyen wrote: > On Tue, Nov 6, 2018 at 11:48 AM Leif Lindholm > wrote: > > > > Commit 43662b23abbd > > ("format-patch: keep cover-letter diffstat wrapped in 72 columns") made > > format-patch keep the diffstat to within 72 characters. However, it

[PATCH 0/1] send-pack: set core.warnAmbiguousRefs=false

2018-11-06 Thread Derrick Stolee via GitGitGadget
I've been looking into the performance of git push for very large repos. Our users are reporting that 60-80% of git push time is spent during the "Enumerating objects" phase of git pack-objects. A git push process runs several processes during its run, but one includes git send-pack which calls

[PATCH 1/1] send-pack: set core.warnAmbiguousRefs=false

2018-11-06 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee During a 'git push' command, we run 'git send-pack' inside of our transport helper. This creates a 'git pack-objects' process and passes a list of object ids. If this list is large, then the pack-objects process can spend a lot of time checking the possible refs these

Re: [PATCH] format-patch: respect --stat when explicitly specified

2018-11-06 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 6:25 PM Leif Lindholm wrote: > > > Sure. Only today was the first time I had a look at the git sources, > > > so some guidance would be most appreciated. > > > > No problem (and if you don't have time to do it, just say the word and > > I will continue; this is my bug after

Re: [PATCH v2 12/16] parse-options: replace opterror() with optname()

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 02:02:42PM +, Ramsay Jones wrote: > Also, this patch does not replace opterror() calls outside of > the 'parse-options.c' file with optname(). This tickles my > static-check.pl script, since optname() is an external function > which is only called from

[ANNOUNCE] StGit 0.19

2018-11-06 Thread Peter Grayson
I am pleased to announce the release of Stacked Git 0.19. The big feature for this release is Python 3 support, but 0.19 also contains some important bug fixes and more robust test infrastructure. The full release notes follow. Cheers, Pete %< Stacked Git 0.19

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 06 2018, Nguyễn Thái Ngọc Duy wrote: > OK here is a less constroversal attempt to add new trailers. Instead > of changing the default behavior (which could be done incrementally > later), this patch simply adds a new option --append-trailer to revert > and cherry-pick. > > Both will

Re: [PATCH/RFC] sequencer.c: record revert/cherry-pick commit with trailer lines

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 06 2018, Duy Nguyen wrote: > On Tue, Nov 6, 2018 at 9:57 AM Ævar Arnfjörð Bjarmason > wrote: >> Leaving aside the question of whether the pain of switching is worth it, >> I think it's a worthwihle to consider if we could stop hardcoding one >> specific human language in commit

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-06 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 7:15 PM Ramsay Jones wrote: > >> @@ -709,6 +710,10 @@ char *expand_user_path(const char *path, int > >> real_home) > >> > >> if (path == NULL) > >> goto return_null; > >> +#ifdef __MINGW32__ > >> +if (path[0] == '/') > >> +return

Re: Regression in rebase-in-C with rebase.autoStash=true

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 02:59:43PM +0100, Ævar Arnfjörð Bjarmason wrote: > > On Tue, Oct 23 2018, Johannes Schindelin via GitGitGadget wrote: > > > Johannes Schindelin (2): > > rebase --autostash: demonstrate a problem with dirty submodules > > rebase --autostash: fix issue with dirty

[PATCH v2] range-diff: add a --no-patch option to show a summary

2018-11-06 Thread Ævar Arnfjörð Bjarmason
Add a --no-patch option which shows which changes got removed, added or moved etc., without showing the diff associated with them. This allows for using range-diff as a poor man's "shortlog" for force-pushed branches to see what changed without getting into the details of what specifically. E.g.

Re: [PATCH] format-patch: respect --stat when explicitly specified

2018-11-06 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 5:18 PM Laszlo Ersek wrote: > >> + opts.stat_width = MAIL_DEFAULT_WRAP; > > > > How about a test to make sure this will not be broken in future? > > Oh, looks like I won't have to test this patch at all! ;) > > (Just kidding, I'll test the next iteration.)

[PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-06 Thread Nguyễn Thái Ngọc Duy
OK here is a less constroversal attempt to add new trailers. Instead of changing the default behavior (which could be done incrementally later), this patch simply adds a new option --append-trailer to revert and cherry-pick. Both will show either Reverts: [~] or Cherry-picked-from: [~]

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-06 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 3:55 PM Johannes Schindelin via GitGitGadget wrote: > > From: Johannes Schindelin > > On Windows, an absolute POSIX path needs to be turned into a Windows > one. > > Signed-off-by: Johannes Schindelin > --- > path.c | 5 + > 1 file changed, 5 insertions(+) > > diff

Re: [PATCH] format-patch: respect --stat when explicitly specified

2018-11-06 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 5:31 PM Leif Lindholm wrote: > > > diff --git a/builtin/log.c b/builtin/log.c > > > index 061d4fd86..07e6ae2c1 100644 > > > --- a/builtin/log.c > > > +++ b/builtin/log.c > > > @@ -1009,7 +1009,8 @@ static void show_diffstat(struct rev_info *rev, > > > > > > memcpy(,

Re: [PATCH] format-patch: respect --stat when explicitly specified

2018-11-06 Thread Leif Lindholm
On Tue, Nov 06, 2018 at 06:13:00PM +0100, Duy Nguyen wrote: > On Tue, Nov 6, 2018 at 5:31 PM Leif Lindholm wrote: > > > > diff --git a/builtin/log.c b/builtin/log.c > > > > index 061d4fd86..07e6ae2c1 100644 > > > > --- a/builtin/log.c > > > > +++ b/builtin/log.c > > > > @@ -1009,7 +1009,8 @@

Re: What exactly is a "initial checkout"

2018-11-06 Thread Junio C Hamano
Christian Halstrick writes: > I am trying to teach JGit [1] to behave like native git regarding some > corner cases during "git checkout". I am reading the "git read-tree" > documentation and I am not sure about the case [2]. Git should behave > differently during a normal checkout than when you

Re: [PATCH v2 1/1] pack-objects: ignore ambiguous object warnings

2018-11-06 Thread Junio C Hamano
Jeff King writes: > So we'd never expect to see anything except "1" in our save_warning > variable. Doing a save/restore is just about code hygiene and > maintainability. Here is what I plan to queue. Thanks, both. -- >8 -- From: Derrick Stolee Date: Tue, 6 Nov 2018 12:34:47 -0800 Subject:

Re: [PATCH 0/1] send-pack: set core.warnAmbiguousRefs=false

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 02:44:42PM -0500, Jeff King wrote: > > The fix for this is simple: set core.warnAmbiguousRefs to false for this > > specific call of git pack-objects coming from git send-pack. We don't want > > to default it to false for all calls to git pack-objects, as it is valid to >

[PATCH] gitk: don't highlight submodule diff lines outside submodule diffs

2018-11-06 Thread Роман Донченко
A line that starts with " <" or " >" is not necessarily a submodule diff line. It might just be a context line in a normal diff, representing a line starting with " <" or " >" respectively. Use the currdiffsubmod variable to track whether we are currently inside a submodule diff and only

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 06:48:22PM +0100, Ævar Arnfjörð Bjarmason wrote: > The implementation looks fine to me, but as noted in > https://public-inbox.org/git/8736se6qyc@evledraar.gmail.com/ I > wonder what the plausible end-game is. That we'll turn this on by > default in a few years, and

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-06 Thread Junio C Hamano
Jeff King writes: > Could we help the reading scripts by normalizing old and new output via > interpret-trailers, %(trailers), etc? > > I think "(cherry picked from ...)" is already considered a trailer by > the trailer code. ;-) Great minds think alike, I guess. I think it is a great idea

Re: [PATCH 2/3] approxidate: handle pending number for "specials"

2018-11-06 Thread Junio C Hamano
Jeff King writes: > On Tue, Nov 06, 2018 at 04:48:28PM -0800, Carlo Arenas wrote: > > I think date_yesterday() is the only one of those special functions that > gets called like this. Here's what I think we should do to fix it (this > can go right on top of jk/misc-unused-fixes, which is already

Re: [PATCH 2/3] approxidate: handle pending number for "specials"

2018-11-06 Thread Carlo Arenas
On Thu, Nov 1, 2018 at 10:24 PM Jeff King wrote: > > static void date_yesterday(struct tm *tm, struct tm *now, int *num) > { > + *num = 0; the only caller (date_time) for this sends num = NULL, so this triggers a segfault. the only reference I could find to that apparently unused

Re: [PATCH v2] range-diff: add a --no-patch option to show a summary

2018-11-06 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > diff --git a/builtin/range-diff.c b/builtin/range-diff.c > index f01a0be851..05d1f6b6b6 100644 > --- a/builtin/range-diff.c > +++ b/builtin/range-diff.c > @@ -16,11 +16,14 @@ int cmd_range_diff(int argc, const char **argv, const > char *prefix) > int

Re: [PATCH 2/3] approxidate: handle pending number for "specials"

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 04:48:28PM -0800, Carlo Arenas wrote: > On Thu, Nov 1, 2018 at 10:24 PM Jeff King wrote: > > > > static void date_yesterday(struct tm *tm, struct tm *now, int *num) > > { > > + *num = 0; > > the only caller (date_time) for this sends num = NULL, so this >

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-06 Thread Junio C Hamano
Ramsay Jones writes: > On 06/11/2018 14:53, Johannes Schindelin via GitGitGadget wrote: >> From: Johannes Schindelin >> >> On Windows, an absolute POSIX path needs to be turned into a Windows >> one. >> >> Signed-off-by: Johannes Schindelin >> --- >> path.c | 5 + >> 1 file changed, 5

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-06 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > OK here is a less constroversal attempt to add new trailers. Instead > of changing the default behavior (which could be done incrementally > later), this patch simply adds a new option --append-trailer to revert > and cherry-pick. I almost agree, except that the

Re: [PATCH 1/1] Windows: force-recompile git.res for differing architectures

2018-11-06 Thread Junio C Hamano
Johannes Sixt writes: > Am 06.11.18 um 15:55 schrieb Johannes Schindelin via GitGitGadget: >> From: Johannes Schindelin >> >> When git.rc is compiled into git.res, the result is actually dependent >> on the architecture. That is, you cannot simply link a 32-bit git.res >> into a 64-bit git.exe.

Re: [PATCH v5 10/12] Add a base implementation of SHA-256 support

2018-11-06 Thread brian m. carlson
On Mon, Nov 05, 2018 at 12:39:14PM +0100, Ævar Arnfjörð Bjarmason wrote: > On Sun, Nov 04 2018, brian m. carlson wrote: > > + { > > + "sha256", > > + /* "s256", big-endian */ > > The existing entry/comment for sha1 is: > > "sha1", > /* "sha1",

Re: git-rebase is ignoring working-tree-encoding

2018-11-06 Thread Adrián Gimeno Balaguer
Hello Torsten, Thanks for answering. Answering to your question, I removed the comments with "rebase" since my reported encoding issue happens on more simpler operations (described in the PR), and the problem is not directly related to rebasing, so I considered it better in order to avoid

Re: [PATCH 1/1] Windows: force-recompile git.res for differing architectures

2018-11-06 Thread Johannes Sixt
Am 07.11.18 um 02:32 schrieb Junio C Hamano: Johannes Sixt writes: On Linux, when I recompile for a different architecture, CFLAGS would change, so I would have thought that GIT-CFLAGS were the natural choice for a dependency. Don't they change in this case on Windows, too? Depending on

Re: What exactly is a "initial checkout"

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 01:38:45PM +0100, Christian Halstrick wrote: > I am trying to teach JGit [1] to behave like native git regarding some > corner cases during "git checkout". I am reading the "git read-tree" > documentation and I am not sure about the case [2]. Git should behave >

Re: [PATCH 1/1] Windows: force-recompile git.res for differing architectures

2018-11-06 Thread Johannes Sixt
Am 06.11.18 um 15:55 schrieb Johannes Schindelin via GitGitGadget: From: Johannes Schindelin When git.rc is compiled into git.res, the result is actually dependent on the architecture. That is, you cannot simply link a 32-bit git.res into a 64-bit git.exe. Therefore, to allow 32-bit and

Re: [PATCH] gitk: don't highlight submodule diff lines outside submodule diffs

2018-11-06 Thread Stefan Beller
On Tue, Nov 6, 2018 at 12:03 PM Роман Донченко wrote: > > A line that starts with " <" or " >" is not necessarily a submodule > diff line. It might just be a context line in a normal diff, representing > a line starting with " <" or " >" respectively. > > Use the currdiffsubmod variable to

Re: [PATCH 0/1] send-pack: set core.warnAmbiguousRefs=false

2018-11-06 Thread Derrick Stolee
On 11/6/2018 2:51 PM, Jeff King wrote: On Tue, Nov 06, 2018 at 02:44:42PM -0500, Jeff King wrote: The fix for this is simple: set core.warnAmbiguousRefs to false for this specific call of git pack-objects coming from git send-pack. We don't want to default it to false for all calls to git

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-06 Thread Johannes Sixt
Am 06.11.18 um 15:53 schrieb Johannes Schindelin via GitGitGadget: From: Johannes Schindelin On Windows, an absolute POSIX path needs to be turned into a Windows one. If I were picky, I would say that in a pure Windows application there cannot be POSIX paths to begin with. Even if a path

Re: [PATCH 0/1] send-pack: set core.warnAmbiguousRefs=false

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 11:13:47AM -0800, Derrick Stolee via GitGitGadget wrote: > I've been looking into the performance of git push for very large repos. Our > users are reporting that 60-80% of git push time is spent during the > "Enumerating objects" phase of git pack-objects. > > A git push

[PATCH v2 1/1] pack-objects: ignore ambiguous object warnings

2018-11-06 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee A git push process runs several processes during its run, but one includes git send-pack which calls git pack-objects and passes the known have/wants into stdin using object ids. However, the default setting for core.warnAmbiguousRefs requires git pack-objects to check for

[PATCH v2 0/1] send-pack: set core.warnAmbiguousRefs=false

2018-11-06 Thread Derrick Stolee via GitGitGadget
I've been looking into the performance of git push for very large repos. Our users are reporting that 60-80% of git push time is spent during the "Enumerating objects" phase of git pack-objects. A git push process runs several processes during its run, but one includes git send-pack which calls

Re: [PATCH v2 1/1] pack-objects: ignore ambiguous object warnings

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 12:34:47PM -0800, Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee > > A git push process runs several processes during its run, but one > includes git send-pack which calls git pack-objects and passes > the known have/wants into stdin using object ids.

Re: [PATCH] gitk: don't highlight submodule diff lines outside submodule diffs

2018-11-06 Thread Роман Донченко
06.11.2018 23:06, Stefan Beller пишет: On Tue, Nov 6, 2018 at 12:03 PM Роман Донченко wrote: A line that starts with " <" or " >" is not necessarily a submodule diff line. It might just be a context line in a normal diff, representing a line starting with " <" or " >" respectively. Use the

Re: [PATCH 0/1] send-pack: set core.warnAmbiguousRefs=false

2018-11-06 Thread Derrick Stolee
On 11/6/2018 2:44 PM, Jeff King wrote: On Tue, Nov 06, 2018 at 11:13:47AM -0800, Derrick Stolee via GitGitGadget wrote: I've been looking into the performance of git push for very large repos. Our users are reporting that 60-80% of git push time is spent during the "Enumerating objects" phase

Re: git-rebase is ignoring working-tree-encoding

2018-11-06 Thread Torsten Bögershausen
On Mon, Nov 05, 2018 at 07:10:14PM +0100, Torsten Bögershausen wrote: > On Mon, Nov 05, 2018 at 05:24:39AM +0100, Adrián Gimeno Balaguer wrote: > > [] > > > https://github.com/git/git/pull/550 > > [] > > > This is covered in the mentioned PR above. Thanks for feedback. > > Thanks for the

Re: [PATCH/RFC] Support --append-trailer in cherry-pick and revert

2018-11-06 Thread Jeff King
On Tue, Nov 06, 2018 at 05:11:18PM -0500, Jeff King wrote: > On Tue, Nov 06, 2018 at 06:48:22PM +0100, Ævar Arnfjörð Bjarmason wrote: > > > The implementation looks fine to me, but as noted in > > https://public-inbox.org/git/8736se6qyc@evledraar.gmail.com/ I > > wonder what the plausible

Bug: git-svn clone --preserve-empty-dirs fail - couldn't truncate file at /usr/share/perl5/Git.pm line 1337.

2018-11-06 Thread Georg Tsakumagos
Hi, i am in the middle of a migration project. Almost over 60 projects (aprox 1/3) suffer from this behaviour. I was able to create a svn repository dump (8MB) of a small project thats provoke that failure. The failure do not occur if the option "--preserve-empty-dirs" is omitted. Also no

[PATCH] format-patch: respect --stat when explicitly specified

2018-11-06 Thread Leif Lindholm
Commit 43662b23abbd ("format-patch: keep cover-letter diffstat wrapped in 72 columns") made format-patch keep the diffstat to within 72 characters. However, it does this even when --stat is explicitly set on the command line. Make it possible to explicitly override the new mechanism, using

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-06 Thread Johannes Schindelin
Hi, On Mon, 5 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > On Mon, Nov 05 2018, Eric Sunshine wrote: > > > On Mon, Nov 5, 2018 at 3:07 PM Ævar Arnfjörð Bjarmason > > wrote: > >> Add a --no-patch option which shows which changes got removed, added > >> or moved etc., without showing the diff

build error on mac os 10.14.1

2018-11-06 Thread yan ke
Hello when build on mac os 10.14.1 with the master branch, I got the error as blew, so what is wrong? ld: archive has no table of contents file 'xdiff/lib.a' for architecture x86_64 ld: archive has no table of contents file 'xdiff/lib.a' for architecture x86_64 ld: archive has no table of

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 06 2018, Eric Sunshine wrote: > On Mon, Nov 5, 2018 at 11:17 PM Junio C Hamano wrote: >> Ævar Arnfjörð Bjarmason writes: >> > This change doesn't update git-format-patch with a --no-patch >> > option. That can be added later similar to how format-patch first >> > learned

Re: [PATCH/RFC] sequencer.c: record revert/cherry-pick commit with trailer lines

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Sun, Nov 04 2018, Nguyễn Thái Ngọc Duy wrote: > When a commit is reverted (or cherry-picked with -x) we add an English > sentence recording that commit id in the new commit message. Make > these real trailer lines instead so that they are more friendly to > parsers (especially "git

What exactly is a "initial checkout"

2018-11-06 Thread Christian Halstrick
I am trying to teach JGit [1] to behave like native git regarding some corner cases during "git checkout". I am reading the "git read-tree" documentation and I am not sure about the case [2]. Git should behave differently during a normal checkout than when you are doing a "initial checkout". I can

Checkout deleted semi-untracked file

2018-11-06 Thread Steffen Jost
Hello! A brief discussion on the git user mailing list on Google Groups recommended me to file the following as a bug report. The problem led to an actual file loss, but I suspect that this might be intended: 1) .gitignore is added to the repository (which then causes problems) 2) A file is

Change your password 06239 immediately. Your account has been hacked.

2018-11-06 Thread git
I greet you! I have bad news for you. 27/08/2018 - on this day I hacked your operating system and got full access to your account git@vger.kernel.org On that day your account (git@vger.kernel.org) password was: 06239 It is useless to change the password, my malware intercepts it every time.

RE

2018-11-06 Thread Alice Waltoni
I have a charity mission worth $ 100,000,000.00 from you contact me for more info

Why Me In This Terrible Condition.

2018-11-06 Thread Mrs Franisca carlsen
Greetings My Dear, I sent this mail praying it will found you in a good condition of health, since I myself are in a very critical health condition in which I sleep every night without knowing if I may be alive to see the next day. I am Mrs. Francisca Carlsen from Denmark wife of late Mr

Regression in rebase-in-C with rebase.autoStash=true

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 23 2018, Johannes Schindelin via GitGitGadget wrote: > Johannes Schindelin (2): > rebase --autostash: demonstrate a problem with dirty submodules > rebase --autostash: fix issue with dirty submodules > > builtin/rebase.c| 2 +- > t/t3420-rebase-autostash.sh | 10

Re: [PATCH v2 1/1] diff-highlight: Use correct /dev/null for UNIX and Windows

2018-11-06 Thread Johannes Schindelin
List, I have no idea why this mail made it to GitGitGadget's email account but not to the Git mailing list... Sorry about that. Ciao, Johannes On Wed, 31 Oct 2018, Chris. Webster via GitGitGadget wrote: > From: "Chris. Webster" > > Use File::Spec->devnull() for output redirection to avoid

Re: [PATCH v2 12/16] parse-options: replace opterror() with optname()

2018-11-06 Thread Ramsay Jones
On 06/11/2018 02:33, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> There are a few issues with opterror() >> >> - it tries to assemble an English sentence from pieces. This is not >> great for translators because we give them pieces instead of a full >> sentence. >> >> - It's

[PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-06 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin On Windows, an absolute POSIX path needs to be turned into a Windows one. Signed-off-by: Johannes Schindelin --- path.c | 5 + 1 file changed, 5 insertions(+) diff --git a/path.c b/path.c index 34f0f98349..a72abf0e1f 100644 --- a/path.c +++ b/path.c @@ -11,6

[PATCH 0/1] mingw: handle absolute paths in expand_user_path()

2018-11-06 Thread Johannes Schindelin via GitGitGadget
While this patch has been "in production" in Git for Windows for a good while, this patch series is half meant as a request for comments. The reason is this: something like this (make paths specified e.g. via http.sslCAInfo relative to the runtime prefix) is potentially useful also in the

[PATCH 0/1] Windows: force-recompile git.res for differing architectures

2018-11-06 Thread Johannes Schindelin via GitGitGadget
This is a patch designed to help maintaining Git for Windows better: when the same source code is "cross-compiled" for i686 as well as x86_64, we want to rebuild the whole thing, including the resource file git.res. Note: regular C files are re-compiled appropriately, as the default prefix in Git

[PATCH 1/1] Windows: force-recompile git.res for differing architectures

2018-11-06 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin When git.rc is compiled into git.res, the result is actually dependent on the architecture. That is, you cannot simply link a 32-bit git.res into a 64-bit git.exe. Therefore, to allow 32-bit and 64-bit builds in the same directory, we let git.res depend on GIT-PREFIX

Re: Checkout deleted semi-untracked file

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 06 2018, Steffen Jost wrote: > Hello! > > A brief discussion on the git user mailing list on Google Groups recommended > me to file the following as a bug report. > > The problem led to an actual file loss, but I suspect that this might be > intended: > > 1) .gitignore is added to

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-06 Thread Ramsay Jones
On 06/11/2018 14:53, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > On Windows, an absolute POSIX path needs to be turned into a Windows > one. > > Signed-off-by: Johannes Schindelin > --- > path.c | 5 + > 1 file changed, 5 insertions(+) > > diff --git

Re: [PATCH] format-patch: respect --stat when explicitly specified

2018-11-06 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 11:48 AM Leif Lindholm wrote: > > Commit 43662b23abbd > ("format-patch: keep cover-letter diffstat wrapped in 72 columns") made > format-patch keep the diffstat to within 72 characters. However, it does > this even when --stat is explicitly set on the command line. > > Make

Re: [PATCH] range-diff: add a --no-patch option to show a summary

2018-11-06 Thread Ævar Arnfjörð Bjarmason
On Tue, Nov 06 2018, Johannes Schindelin wrote: > Hi, > > On Mon, 5 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > >> On Mon, Nov 05 2018, Eric Sunshine wrote: >> >> > On Mon, Nov 5, 2018 at 3:07 PM Ævar Arnfjörð Bjarmason >> > wrote: >> >> Add a --no-patch option which shows which changes got

Re: Understanding pack format

2018-11-06 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 3:23 AM Farhan Khan wrote: > To follow-up from the other day, I have been reading the code that > retrieves the pack entry for the past 3 days now without much success. > But there are quite a few abstractions and I get lost half-way down > the line. Jeff already gave you

Re: [PATCH 1/1] mingw: handle absolute paths in expand_user_path()

2018-11-06 Thread Ramsay Jones
On 06/11/2018 15:54, Ramsay Jones wrote: > > > On 06/11/2018 14:53, Johannes Schindelin via GitGitGadget wrote: >> From: Johannes Schindelin >> >> On Windows, an absolute POSIX path needs to be turned into a Windows >> one. >> >> Signed-off-by: Johannes Schindelin >> --- >> path.c | 5

Re: [PATCH/RFC] sequencer.c: record revert/cherry-pick commit with trailer lines

2018-11-06 Thread Duy Nguyen
On Tue, Nov 6, 2018 at 9:57 AM Ævar Arnfjörð Bjarmason wrote: > Leaving aside the question of whether the pain of switching is worth it, > I think it's a worthwihle to consider if we could stop hardcoding one > specific human language in commit messages, and instead leave something >

Re: [PATCH] format-patch: respect --stat when explicitly specified

2018-11-06 Thread Laszlo Ersek
On 11/06/18 16:56, Duy Nguyen wrote: > On Tue, Nov 6, 2018 at 11:48 AM Leif Lindholm > wrote: >> >> Commit 43662b23abbd >> ("format-patch: keep cover-letter diffstat wrapped in 72 columns") made >> format-patch keep the diffstat to within 72 characters. However, it does >> this even when --stat