Re: Allow "git shortlog" to group by committer information

On Tue, Dec 20, 2016 at 7:22 PM, Jeff King wrote: > On Tue, Dec 20, 2016 at 10:35:36AM -0800, Junio C Hamano wrote: > >> -- >8 -- >> Subject: SQUASH??? >> >> Make sure the test does not depend on the result of the previous >> tests; with MINGW prerequisite satisfied, a "reset to

Re: [PATCH] mailinfo.c: move side-effects outside of assert

On Dec 20, 2016, at 08:45, Jeff King wrote: On Tue, Dec 20, 2016 at 03:12:35PM +0100, Johannes Schindelin wrote: On Dec 19, 2016, at 09:45, Johannes Schindelin wrote: ACK. I noticed this problem (and fixed it independently as a part of a huge patch series I did not get around to submit

Re: Allow "git shortlog" to group by committer information

On Tue, Dec 20, 2016 at 10:35:36AM -0800, Junio C Hamano wrote: > -- >8 -- > Subject: SQUASH??? > > Make sure the test does not depend on the result of the previous > tests; with MINGW prerequisite satisfied, a "reset to original and > rebuild" in an earlier test was skipped, resulting in

config for `format-patch --notes`?

Hi, I use `git format-patch master..myBranch` quite a bit to send patches to other developers. I also add notes to the commits so that I e.g. remember which patches were emailed to whom. `git log` has an option to automatically include the notes in the output. However, I can't find such an

Re: [PATCH 00/13] gitk: tweak rendering of remote-tracking references

On 12/20/2016 04:01 PM, Marc Branchaud wrote: > On 2016-12-19 11:44 AM, Michael Haggerty wrote: >> This patch series changes a bunch of details about how remote-tracking >> references are rendered in the commit list of gitk: > > Thanks for this! I like the new, compact look very much! > > That

Re: [PATCH v2 09/34] sequencer (rebase -i): write an author-script file

Junio C Hamano writes: >> We keep coming back to the same argument. You want this quoting/dequoting >> to be turned into a full-fledged parser. And I keep pointing out that the >> code here does not *need* to parse but only construct an environment >> block. > > I am afraid

[PATCHv4 3/4] submodule: rename and add flags to ok_to_remove_submodule

In different contexts the question "Is it ok to delete a submodule?" may be answered differently. In 293ab15eea (submodule: teach rm to remove submodules unless they contain a git directory, 2012-09-26) a case was made that we can safely ignore ignored untracked files for removal as we

[PATCHv4 4/4] rm: absorb a submodules git dir before deletion

When deleting a submodule, we need to keep the actual git directory around, such that we do not lose local changes in there and at a later checkout of the submodule we don't need to clone it again. Now that the functionality is available to absorb the git directory of a submodule, rewrite the

[PATCHv4 1/4] submodule.h: add extern keyword to functions

As the upcoming series will add a lot of functions to the submodule header, let's first make the header consistent to the rest of the project by adding the extern keyword to functions. As per the CodingGuidelines we try to stay below 80 characters per line, so adapt all those functions to stay

[PATCHv5 4/4] rm: absorb a submodules git dir before deletion

When deleting a submodule, we need to keep the actual git directory around, such that we do not lose local changes in there and at a later checkout of the submodule we don't need to clone it again. Now that the functionality is available to absorb the git directory of a submodule, rewrite the

[PATCHv5 3/4] submodule: rename and add flags to ok_to_remove_submodule

In different contexts the question "Is it ok to delete a submodule?" may be answered differently. In 293ab15eea (submodule: teach rm to remove submodules unless they contain a git directory, 2012-09-26) a case was made that we can safely ignore ignored untracked files for removal as we

[PATCHv5 2/4] submodule: modernize ok_to_remove_submodule to use argv_array

Instead of constructing the NULL terminated array ourselves, we should make use of the argv_array infrastructure. While at it, adapt the error messages to reflect the actual invocation. Signed-off-by: Stefan Beller --- submodule.c | 14 -- 1 file changed, 4

[PATCHv5 1/4] submodule.h: add extern keyword to functions

As the upcoming series will add a lot of functions to the submodule header, let's first make the header consistent to the rest of the project by adding the extern keyword to functions. As per the CodingGuidelines we try to stay below 80 characters per line, so adapt all those functions to stay

[PATCHv4 2/4] submodule: modernize ok_to_remove_submodule to use argv_array

Instead of constructing the NULL terminated array ourselves, we should make use of the argv_array infrastructure. While at it, adapt the error messages to reflect the actual invocation. Signed-off-by: Stefan Beller --- submodule.c | 14 -- 1 file changed, 4

[PATCHv5 0/4] git-rm absorbs submodule git directory before deletion

v5: * removed the patch for adding {run,start,finish}_or_die * added one more flag to the function ok_to_remove_submodule (if die on error is ok) * renamed ok_to_remove_submodule to bad_to_remove_submodule to signal the error case better. v4: * reworded commit messages of the last 2 patches *

[PATCHv4 0/4] git-rm absorbs submodule git directory before deletion

v4: * removed the patch for adding {run,start,finish}_or_die * added one more flag to the function ok_to_remove_submodule (if die on error is ok) * renamed ok_to_remove_submodule to bad_to_remove_submodule to signal the error case better. v3: * removed the patch to enhance

Re: [PATCH 00/13] gitk: tweak rendering of remote-tracking references

On 2016-12-20 05:17 PM, Paul Mackerras wrote: On Tue, Dec 20, 2016 at 10:01:15AM -0500, Marc Branchaud wrote: On 2016-12-19 11:44 AM, Michael Haggerty wrote: This patch series changes a bunch of details about how remote-tracking references are rendered in the commit list of gitk: Thanks for

Re: [PATCH 00/13] gitk: tweak rendering of remote-tracking references

On Tue, Dec 20, 2016 at 10:01:15AM -0500, Marc Branchaud wrote: > On 2016-12-19 11:44 AM, Michael Haggerty wrote: > >This patch series changes a bunch of details about how remote-tracking > >references are rendered in the commit list of gitk: > > Thanks for this! I like the new, compact look

Re: [PATCHv4 3/5] run-command: add {run,start,finish}_command_or_die

On Tue, Dec 20, 2016 at 1:47 PM, Johannes Sixt wrote: > This does not explain why the *complete and detailed* invocation must be > reported. eh. I tried to say that a report that looks like a *complete and detailed* invocation should be such, and not be misleading (and e.g. miss

Re: [PATCH] fast-import: properly fanout notes when tree is imported

Mike Hommey writes: > In typical uses of fast-import, trees are inherited from a parent > commit. In that case, the tree_entry for the branch looks like: > ... > This change makes do_change_note_fanount call load_tree() whenever the > tree_entry it is given has no tree loaded,

Re: [PATCHv4 3/5] run-command: add {run,start,finish}_command_or_die

Am 20.12.2016 um 21:49 schrieb Stefan Beller: On Tue, Dec 20, 2016 at 12:12 PM, Johannes Sixt wrote: I have to ask, though: Is it so much necessary to report the exact command line in an error message? Have a look at https://github.com/git/git/blob/master/submodule.c#L1122

Re: [PATCH] fast-import: properly fanout notes when tree is imported

Sorry, I forgot the v2 in the subject. Mike

[PATCH] fast-import: properly fanout notes when tree is imported

In typical uses of fast-import, trees are inherited from a parent commit. In that case, the tree_entry for the branch looks like: .versions[1].sha1 = $some_sha1 .tree = However, when trees are imported, rather than inherited, that is not the case. One can import a tree with a filemodify

Re: [PATCH] fast-import: properly fanout notes when tree is imported

Mike Hommey writes: > On Tue, Dec 20, 2016 at 11:34:04AM -0800, Junio C Hamano wrote: >> Mike Hommey writes: >> >> > In typical uses of fast-import, trees are inherited from a parent >> > commit. In that case, the tree_entry for the branch looks like: >> >

Re: [PATCHv4 3/5] run-command: add {run,start,finish}_command_or_die

On Tue, Dec 20, 2016 at 12:12 PM, Johannes Sixt wrote: > Am 20.12.2016 um 20:23 schrieb Stefan Beller: >> >> In a reroll I'll drop this patch and instead introduce >> a function `char *get_child_command_line(struct child_process*);`, which >> a caller can call before calling

Re: [PATCH] fast-import: properly fanout notes when tree is imported

On Tue, Dec 20, 2016 at 11:34:04AM -0800, Junio C Hamano wrote: > Mike Hommey writes: > > > In typical uses of fast-import, trees are inherited from a parent > > commit. In that case, the tree_entry for the branch looks like: > > ... > > +# Create another notes tree from the

Re: [PATCHv4 3/5] run-command: add {run,start,finish}_command_or_die

Am 20.12.2016 um 20:23 schrieb Stefan Beller: In a reroll I'll drop this patch and instead introduce a function `char *get_child_command_line(struct child_process*);`, which a caller can call before calling finish_command and then use the resulting string to assemble an error message without

Re: [PATCH 2/2] config.c: handle lock file in error case in git_config_rename_...

Nguyễn Thái Ngọc Duy writes: > We could rely on atexit() to clean up everything, but let's be > explicit when we can. And it's good anyway because the function is > called the second time in the same process, we're in trouble. > > This function should not affect the

Re: [PATCH] fast-import: properly fanout notes when tree is imported

Mike Hommey writes: > In typical uses of fast-import, trees are inherited from a parent > commit. In that case, the tree_entry for the branch looks like: > ... > +# Create another notes tree from the one above > +cat >>input < +... > +M 04 $(git log --no-walk --format=%T

Re: [PATCH 0/3] push only submodules

Brandon Williams writes: > This series teaches 'git push' to be able to only push submodules > while leaving a superproject unpushed. It somehow feels a bit strange to single out the top-level as special like this one (iow, shouldn't it be equally as easy to push out the

Re: [PATCHv4 3/5] run-command: add {run,start,finish}_command_or_die

On Tue, Dec 20, 2016 at 10:33 AM, Johannes Sixt wrote: > Am 20.12.2016 um 00:28 schrieb Stefan Beller: >> >> +static void report_and_die(struct child_process *cmd, const char *action) >> +{ >> + int i; >> + struct strbuf err = STRBUF_INIT; >> + if (cmd->git_cmd)

[GIT GUI/PATCH/RFC] git gui: get current theme in 8.5-backwards-compatible way

Later Tcl 8.5 versions learned to return the current theme by omitting the final argument to "[ttk::style theme use]", but this throws an error on earlier 8.5 versions (e.g., 8.5.7). InitTheme works around this by catching the error and reading ::ttk::currentTheme instead. A call to "[ttk::style

Re: [PATCHv4 3/5] run-command: add {run,start,finish}_command_or_die

Am 20.12.2016 um 19:33 schrieb Johannes Sixt: Am 20.12.2016 um 00:28 schrieb Stefan Beller: +void run_command_or_die(struct child_process *cmd) +{ +if (finish_command(cmd)) +report_and_die(cmd, "run"); And here as well. Oh, and BTW, this one wraps only finish_command, not

Re: Allow "git shortlog" to group by committer information

Am 20.12.2016 um 19:35 schrieb Junio C Hamano: test_expect_success 'shortlog --committer (internal)' ' + git checkout --orphan side && + git commit --allow-empty -m one && + git commit --allow-empty -m two && + GIT_COMMITTER_NAME="Sin Nombre" git commit --allow-empty -m

Re: Allow "git shortlog" to group by committer information

Junio C Hamano writes: > Junio C Hamano writes: > >>> May I kindly ask you to make this work on Windows, too? Just >>> >>> sed -i -e s/MINGW/MINGW,HAVENOT/ t4201-shortlog.sh >> >> HAVENOT??? >>> >>> on your Linux box and make it pass the tests. >>> >>>

Re: [PATCHv4 3/5] run-command: add {run,start,finish}_command_or_die

Am 20.12.2016 um 00:28 schrieb Stefan Beller: +static void report_and_die(struct child_process *cmd, const char *action) +{ + int i; + struct strbuf err = STRBUF_INIT; + if (cmd->git_cmd) + strbuf_addstr(, "git "); + for (i = 0; cmd->argv[i]; ) +

Re: Allow "git shortlog" to group by committer information

Junio C Hamano writes: >> May I kindly ask you to make this work on Windows, too? Just >> >> sed -i -e s/MINGW/MINGW,HAVENOT/ t4201-shortlog.sh > > HAVENOT??? >> >> on your Linux box and make it pass the tests. >> >> Thank you so much in advance. Ah, I think I am slower than

Re: Allow "git shortlog" to group by committer information

Johannes Sixt writes: > Am 16.12.2016 um 14:51 schrieb Jeff King: >> diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh >> index ae08b57712..6c7c637481 100755 >> --- a/t/t4201-shortlog.sh >> +++ b/t/t4201-shortlog.sh >> @@ -190,4 +190,17 @@ test_expect_success 'shortlog with

Re: Allow "git shortlog" to group by committer information

Am 16.12.2016 um 14:51 schrieb Jeff King: diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh index ae08b57712..6c7c637481 100755 --- a/t/t4201-shortlog.sh +++ b/t/t4201-shortlog.sh @@ -190,4 +190,17 @@ test_expect_success 'shortlog with --output=' ' test_line_count = 3 shortlog '

Re: Bug report: $program_name in error message

Vasco Almeida writes: > Thanks for the report and letting me know. > Yes, these were mistakes and lack of attention mine. It was supposed to > call 'eval_gettext' rather than 'gettext' when \$variable interpolation > is needed. Thanks. As both of the offending commits

Re: [PATCH] log: support 256 colors with --graph=256colors

Nguyễn Thái Ngọc Duy writes: > diff --git a/graph.c b/graph.c > index d4e8519..75375a1 100644 > --- a/graph.c > +++ b/graph.c > @@ -78,6 +78,7 @@ static void graph_show_line_prefix(const struct > diff_options *diffopt) > > static const char **column_colors; > static

Re: [PATCH] mingw: consider that UNICODE_STRING::Length counts bytes

Johannes Schindelin writes: > Hi Max, > > On Mon, 19 Dec 2016, Max Kirillov wrote: > >> UNICODE_STRING::Length field means size of buffer in bytes[1], despite >> of buffer itself being array of wchar_t. Because of that terminating >> zero is placed twice as far. Fix

Re: [PATCH] winansi_isatty(): fix when Git is used from CMD

Johannes Schindelin writes: > That code works because winansi_get_osfhandle() is in winansi.c, where its > call to isatty() is *not* redirected to winansi_isatty(). Good. > ... > My plan was actually ... > ... > Let's just clean up all of this in one go. I take this

Re: [PATCH] log: support 256 colors with --graph=256colors

On Tue, Dec 20, 2016 at 07:39:29PM +0700, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > I got mad after tracing two consecutive red history lines in `git log > --graph --oneline` back to their merge points, far far away. Yeah > probably should

Re: [PATCH] winansi_isatty(): fix when Git is used from CMD

Hi Hannes, On Sun, 18 Dec 2016, Johannes Sixt wrote: > What do you think? > > diff --git a/compat/winansi.c b/compat/winansi.c > index ba360be69b..1748d1 100644 > --- a/compat/winansi.c > +++ b/compat/winansi.c > @@ -575,9 +575,8 @@ static void detect_msys_tty(int fd) > > int

Re: [PATCHv2 0/7] Fix and generalize version sort reordering

On Tue, Dec 20, 2016 at 09:50:42AM +0100, SZEDER Gábor wrote: > > It just seems like the whole thing would conceptually easier if we > > pre-parsed the versions into a sequence of elements, then the comparison > > between any two elements would just walk that sequence. The benefit > > there is

Re: [PATCH] winansi_isatty(): fix when Git is used from CMD

Hi Hannes, On Sun, 18 Dec 2016, Johannes Sixt wrote: > The code in winansi.c emulates ANSI escape sequences when Git is > connected to the "real" windows console, CMD.exe. The details are > outline in eac14f8909d9 (Win32: Thread-safe windows console output, > 2012-01-14). Essentially, it plugs a

Re: [PATCH] mailinfo.c: move side-effects outside of assert

On Tue, Dec 20, 2016 at 03:12:35PM +0100, Johannes Schindelin wrote: > > On Dec 19, 2016, at 09:45, Johannes Schindelin wrote: > > > > >ACK. I noticed this problem (and fixed it independently as a part of a > > >huge patch series I did not get around to submit yet) while trying to > > >get Git

Re: [PATCH] mingw: consider that UNICODE_STRING::Length counts bytes

Hi Max, On Mon, 19 Dec 2016, Max Kirillov wrote: > UNICODE_STRING::Length field means size of buffer in bytes[1], despite > of buffer itself being array of wchar_t. Because of that terminating > zero is placed twice as far. Fix it. This commit message needs to be wrapped at <= 76 columns per

Re: [PATCH 00/13] gitk: tweak rendering of remote-tracking references

On 2016-12-19 11:44 AM, Michael Haggerty wrote: This patch series changes a bunch of details about how remote-tracking references are rendered in the commit list of gitk: Thanks for this! I like the new, compact look very much! That said, I remember when I was a new git user and I leaned

Re: Bug report: $program_name in error message

Thanks for the report and letting me know. Yes, these were mistakes and lack of attention mine. It was supposed to call 'eval_gettext' rather than 'gettext' when \$variable interpolation is needed. Junio Hamano has the right answer for these errors. A Seg, 19-12-2016 às 12:50 -0800, Junio C

Re: [PATCH] mailinfo.c: move side-effects outside of assert

Hi Kyle, On Mon, 19 Dec 2016, Kyle J. McKay wrote: > On Dec 19, 2016, at 09:45, Johannes Schindelin wrote: > > >ACK. I noticed this problem (and fixed it independently as a part of a > >huge patch series I did not get around to submit yet) while trying to > >get Git to build correctly with

[PATCHv2] Tweak help auto-correct phrasing.

When auto-correct is enabled, an invalid git command prints a warning and a continuation message, which differs depending on whether or not help.autoCorrect is positive or negative. With help.autoCorrect = 15: WARNING: You called a Git command named 'lgo', which does not exist. Continuing

[PATCH] log: support 256 colors with --graph=256colors

Signed-off-by: Nguyễn Thái Ngọc Duy --- I got mad after tracing two consecutive red history lines in `git log --graph --oneline` back to their merge points, far far away. Yeah probably should fire up tig, or gitk or something. This may sound like a good thing to add, but I

Re: [PATCH v1] git-p4: add diff/merge properties to .gitattributes for GitLFS files

On 19 December 2016 at 21:29, Junio C Hamano wrote: > larsxschnei...@gmail.com writes: > >> From: Lars Schneider >> >> The `git lfs track` command generates a .gitattributes file with diff >> and merge properties [1]. Set the same .gitattributes

Re: [PATCH v1] git-p4: fix git-p4.pathEncoding for removed files

On 19 December 2016 at 21:29, Junio C Hamano wrote: > larsxschnei...@gmail.com writes: > >> From: Lars Schneider >> >> In a9e38359e3 we taught git-p4 a way to re-encode path names from what >> was used in Perforce to UTF-8. This path re-encoding

Hello

Hello complement of the season I'M Anessa female 25 years old single, I am contacting you because I will be relocating to your country. I will send you my photos soon as i hear from you and also tell you much about my self. Thanks. Sincerely yours Anessa.

[PATCH 2/2] config.c: handle lock file in error case in git_config_rename_...

We could rely on atexit() to clean up everything, but let's be explicit when we can. And it's good anyway because the function is called the second time in the same process, we're in trouble. This function should not affect the successful case because after commit_lock_file() is called,

[PATCH 1/2] config.c: rename label unlock_and_out

There are two ways to unlock a file: commit, or revert. Rename it to commit_and_out to avoid confusion. Signed-off-by: Nguyễn Thái Ngọc Duy --- config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.c b/config.c index 4973256..505e0d0 100644

Re: [PATCH] config.c: handle error case for fstat() calls

On Mon, Dec 19, 2016 at 10:14:27AM -0800, Junio C Hamano wrote: > Shouldn't the error-return path in the second hunk rollback the > lockfile to clean after itself? The existing "Oh, we cannot chmod > to match the original" check that comes immediately after shares the > same issue, so this is not

Re: [ANNOUNCE] git-cinnabar 0.4.0 release candidate 2

On Tue, Dec 20, 2016 at 05:47:44PM +0900, Mike Hommey wrote: > Hi, > > Git-cinnabar is a git remote helper to interact with mercurial > repositories. It allows to clone, pull and push from/to mercurial remote > repositories, using git. > > Code on https://github.com/glandium/git-cinnabar > This

Re: [PATCHv2 0/7] Fix and generalize version sort reordering

On Wed, Dec 14, 2016 at 6:08 PM, Jeff King wrote: > On Thu, Dec 08, 2016 at 03:23:54PM +0100, SZEDER Gábor wrote: > >> > With my patches it looks like this: >> > >> > $ git -c versionsort.prereleasesuffix=-pre \ >> > -c versionsort.prereleasesuffix=-prerelease \ >> >

[ANNOUNCE] git-cinnabar 0.4.0 release candidate 2

Hi, Git-cinnabar is a git remote helper to interact with mercurial repositories. It allows to clone, pull and push from/to mercurial remote repositories, using git. Code on https://github.com/glandium/git-cinnabar This release on https://github.com/glandium/git-cinnabar/releases/tag/0.4.0rc2 [

Re: [PATCH 00/13] gitk: tweak rendering of remote-tracking references

On 12/19/2016 11:53 PM, Philip Oakley wrote: > From: "Michael Haggerty" >> This patch series changes a bunch of details about how remote-tracking >> references are rendered in the commit list of gitk: >> > [...] >> * Introduce a separate constant to specify the background