The latest maintenance release Git 1.7.0.2 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.7.0.2.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.0.2.tar.{gz,bz2} (preformatted docs) git-manpages-1.7.0.2.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: RPMS/$arch/git-*-1.7.0.2-1.fc11.$arch.rpm (RPM) Git v1.7.0.2 Release Notes ========================== Fixes since ...

I'm unsure if that can be done, I don't think so. I do, however, believe that the superproject functionality can suite your needs. Then you will have two git repositories, one wich is handling the other. It sounds really more complicated than it is. http://en.wikibooks.org/wiki/Git/Submodules_and_Superprojects regards iveqy --

This is a re-spin of the second half of Gmane 141186, "color enhancements, particularly for grep", which is currently in pu as 'ml/color-grep'. The following changes were made, all to the second patch: * Fix the parsing of color.grep. The old code caused a segfault if this option was set, and it also disallowed setting this option without a value. * Color the filename in --name-only output. I still don't like this, but I understand that makes the coloring more consistent. As ...

Colorize the filename, line number, and separator in git grep output, as GNU grep does. The colors are customizable through color.grep.<slot>. The default is to only color the separator (in cyan), since this gives the biggest legibility increase without overwhelming the user with colors. GNU grep also defaults cyan for the separator, but defaults to magenta for the filename and to green for the line number, as well. There is one difference from GNU grep: When a binary file matches without -a, ...

Ah, I didn't know about the "normal" color. I tried using a blank value, which defaulted to "reset", so I thought there was no way to say "no ANSI sequence". The above was my workaround to get no sequence. Since the "normal" color exists, this workaround should be removed. The squash-able patch below removes the workaround, and also fixes another bug: color was not reset at the end of the line for hunk separators ("--"). As an aside, perhaps a blank color value should default to no ...

This adds support to show columnized output in the mentioned commands. I am quite happy with columnized "git branch/tag". There is still room for improvement. For example, if "git column" is going to display all items in one or two lines (too wide screen), then falling back to one column mode would be better. I'm also experimenting aligned grep output. While it's useful sometimes to look for things near the beginning of line, I don't know if it's really worth the effort. Anyway, enjoy the ...

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- cache.h | 1 + help.c | 22 ---------------------- pager.c | 23 +++++++++++++++++++++++ 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/cache.h b/cache.h index 89f6a40..124f100 100644 --- a/cache.h +++ b/cache.h @@ -985,6 +985,7 @@ extern void setup_pager(void); extern const char *pager_program; extern int pager_in_use(void); extern int pager_use_color; +extern int term_columns(); extern const ...

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- .gitignore | 1 + Makefile | 2 + column.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ column.h | 23 ++++++++ command-list.txt | 1 + 5 files changed, 191 insertions(+), 0 deletions(-) create mode 100644 column.c create mode 100644 column.h diff --git a/.gitignore b/.gitignore index 7b3acb7..8e087e6 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ ...

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- help.c | 33 +++++++++++---------------------- 1 files changed, 11 insertions(+), 22 deletions(-) diff --git a/help.c b/help.c index 888bf8c..e039c14 100644 --- a/help.c +++ b/help.c @@ -3,6 +3,7 @@ #include "exec_cmd.h" #include "levenshtein.h" #include "help.h" +#include "column.h" void add_cmdname(struct cmdnames *cmds, const char *name, int len) { @@ -71,29 +72,17 @@ void exclude_cmds(struct cmdnames *cmds, ...

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- Documentation/git-branch.txt | 8 ++++++++ builtin/branch.c | 18 +++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 903a690..3d1d600 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -9,6 +9,7 @@ SYNOPSIS -------- [verse] 'git branch' [--color[=<when>] | --no-color] [-r | ...

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- builtin/ls-files.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index b065061..10cb057 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -13,6 +13,7 @@ #include "parse-options.h" #include "resolve-undo.h" #include "string-list.h" +#include "column.h" static int abbrev; static int show_deleted; @@ -33,6 +34,7 @@ static int ...

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- Documentation/git-grep.txt | 10 ++++++++++ builtin/grep.c | 9 +++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index 4b32322..7bd6a4f 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -18,6 +18,7 @@ SYNOPSIS [-c | --count] [--all-match] [-q | --quiet] [--max-depth <depth>] [--color[=<when>] ...

You can write a pre-receive hook, which runs on the remote repository, to validate the all incoming commits have recognized committer names/e-mail addresses. If they don't, the hook can reject the receive-pack. -- BJ --

libgit.a is not a public library, so it will never have a stable API/ABI. There is a libgit2 project which tries to do this, but it's far from complete: No, there isn't. I think the only sane solution is what Fedora does as well: http://cvs.fedoraproject.org/viewvc/devel/cgit/ When cgit-1.2.3 is released, have a look at its Makefile, check what Git version does it want and add the relevant Git source to the cgit source package. [ I remember Debian did not support having multiple ...

Or bundle cgit with git.git as a subsystem, with Lars as maintainer. -- Duy --

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- git.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git.c b/git.c index a8660f4..0e052c8 100644 --- a/git.c +++ b/git.c @@ -396,7 +396,7 @@ static void handle_internal_command(int argc, const char **argv) { "version", cmd_version }, { "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER }, { "write-tree", cmd_write_tree, RUN_SETUP }, - { "verify-pack", cmd_verify_pack }, + { ...

Attempts to access gitdir are everywhere, even before cmd_*() is called. Because repository has not been found, repository-specific information (i.e. $GIT_DIR/config) may not be read. This leads to obscure bugs. So the sooner we setup gitdir, the less trouble we may have to deal with. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- cache.h | 1 + git.c | 11 ++++++++--- setup.c | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/cache.h ...

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- builtin/merge-file.c | 4 +--- git.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/builtin/merge-file.c b/builtin/merge-file.c index 1e70073..474c6c2 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -30,7 +30,6 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) int level = XDL_MERGE_ZEALOUS_ALNUM; int style = 0, quiet = 0; int favor = ...

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- builtin/diff.c | 6 ++---- git.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/builtin/diff.c b/builtin/diff.c index ffcdd05..e4bd855 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -252,7 +252,6 @@ int cmd_diff(int argc, const char **argv, const char *prefix) int ents = 0, blobs = 0, paths = 0; const char *path = NULL; struct blobinfo blob[2]; - int nongit; int result = 0; ...

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- builtin/help.c | 2 -- git.c | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/builtin/help.c b/builtin/help.c index 3182a2b..4988629 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -414,7 +414,6 @@ static void show_html_page(const char *git_cmd) int cmd_help(int argc, const char **argv, const char *prefix) { - int nongit; const char *alias; enum help_format ...

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- builtin/archive.c | 2 +- git.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/archive.c b/builtin/archive.c index 6a887f5..ef0bef8 100644 --- a/builtin/archive.c +++ b/builtin/archive.c @@ -125,5 +125,5 @@ int cmd_archive(int argc, const char **argv, const char *prefix) setvbuf(stderr, NULL, _IOLBF, BUFSIZ); - return write_archive(argc, argv, prefix, 1); + return ...

mailinfo may use repo config, so setup gitdir first. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- builtin/mailinfo.c | 3 --- git.c | 2 +- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c index ce2ef6b..3d2c650 100644 --- a/builtin/mailinfo.c +++ b/builtin/mailinfo.c @@ -1026,9 +1026,6 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix) { const char *def_charset; - /* ...

grep has USE_PAGER set. setup_pager() may read config even setup_git_dir* is not run yet. This tries to find a repository before config is read. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- builtin/grep.c | 9 +++------ git.c | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/builtin/grep.c b/builtin/grep.c index 40b9a93..fb82ff8 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -765,7 +765,7 @@ int cmd_grep(int argc, const char **argv, ...

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- builtin/config.c | 6 ++---- git.c | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index 4bc46b1..ecc8f87 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -326,11 +326,9 @@ static int get_colorbool(int print) return get_colorbool_found ? 0 : 1; } -int cmd_config(int argc, const char **argv, const char *unused_prefix) +int cmd_config(int ...

The purpose of this struct is to make it easier to extend parameters passed to builtin commands from run_builtin(), and let libgit aware of some global states in future. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- cache.h | 6 ++++++ environment.c | 1 + git.c | 9 +++++---- setup.c | 12 +++++++++++- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/cache.h b/cache.h index 89f6a40..30fddf1 100644 --- a/cache.h +++ ...

Avoiding pointless separation of histories. It's true that nowadays git-patch-id will make a good job of reconciling them, but they do look ugly in gitk. Paolo --

The wording is: "Maybe this option could be made the default in the long run, ..." I didn't wrote something like: "This option should be made the default in the long run, ..." I really didn't know if it should or should not be made the default now or in the long run, but I thought I had to talk about it. Why? Because Paolo said that he would like it to become the default, and also because if we implement "git cherry-pick A..B" and people start to use it a lot, they may find it ...

Exactly what the message said to you: To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again. See the 'non-fast forward' section of 'git push --help' for details. Someone else (your other clone) modified your project in the interim. To prevent losing their change, you need to use `git pull` to bring in their work, merge it with your own, and then you can push it to the destination. For more details, check the `git ...

How do I do "git pull" with Git Gui? And in any event, if there's a conflict, I wouldn't want to overwrite my code with the code on the server - I'd want to view a diff so that I might resolve the conflict by hand. --

What's the difference, then, between doing "stage, stage, commit" as opposed to "stage, commit"? Why not just make all commits stage automatically? --

Probably none... If you stage twice the exactly same file, it does not change anything. But if you "stage, stage" means to stage two different files while "stage" is to stage just one then the outcome will be The goal of the stage area is to mark what changes you want to commit. So, one commit will contain only one semantic change and not everything what you have in your working tree at that moment. CVS also allows to not commit all changes at the same time (you can specify what files ...

I do agree. It would probably have been a good idea to mark the CRLF status in the index, but we didn't. And crlf isn't actually the _only_ thing that can cause confusion, the 'ident' and 'filter' can do the same thing. One option might be to have "git config" know about crlf, so that if you change crlf state with 'git config' rather than manually, we could at least _warn_ about the effects and tell people that they may need to do a full new checkout (or reset the stat info in the ...

Thanks. With the example I think I can tell others that this at least has one known use case that is not totally whacky. I haven't re-read Peter Baumann's comments that you dismissed as a mis-reading of your added documentation, but if somebody _can_ misread what you wrote, that is a sign that it has a room to be improved for clarity. --

Thanks. --

Since 1.7.0 there a three reasons a submodule is considered modified against the work tree: It contains new commits, modified content or untracked content. Lets show all reasons in the long format of git status, so the user can better asses the nature of the modification. This change does not affect the short and porcelain formats. Two new members are added to "struct wt_status_change_data" to store the information gathered by run_diff_files(). wt-status.c uses the new ...

Yes, the documentation is lacking here. I believe we official support AsciiDoc 8.2.7 - this is what the builds on kernel.org use. Here's a cheatsheet for that version: http://powerman.name/doc/asciidoc-827 Hopefully the following will clarify things for the future: Use ';;' instead of ':::' for a nested list. The former was added in AsciiDoc 5.0.9; the latter in 8.3.5. For horizontal lists, put the term and definition on the same line *and* prefix it with [horizontal]. Before ...

Hi, http://repo.or.cz/w/git.git/blob?f=Documentation/SubmittingPatches#l84 Ciao, Dscho --

Changes since v1: * No more initializers * Better tests for send-email * Dropped first patch Stephen Boyd (3): format-patch: use a string_list for headers format-patch: add --no-cc, --no-to, and --no-add-headers send-email: add --no-cc, --no-to, and --no-bcc builtin-log.c | 94 +++++++++++++++++++++++++---------------------- git-send-email.perl | 14 +++++-- t/t4014-format-patch.sh | 38 +++++++++++++++++++ t/t9001-send-email.sh | 66 ...

I think having multiple Cc: and custom headers is a regular use case, while having multiple To: headers is rare.

Actually, I think the same applies to send-email too? There's sendemail.to and sendemail.cc which can't be overridden. At least the email associated commands are all quirky ;-) Honestly though, I think you're right about fixing them. We have the option of making them consistent with the rest of git with a little bit of work. If you say --no-cc or --no-add-headers or --no-to the respective config should be overriden. If you say --to or --cc or --add-headers it should be appended. I doubt ...

Ok this does the --no-* thing to allow the user to say "I want to ignore the config settings this time". I couldn't think of a better way to implement appending and overriding without having to say --no-to and --to in the same command line invocation. Seems to work ok though. My perl is pretty bad so please check send-email. You get an ancient bugfix for free too. Enjoy. Stephen Boyd (4): send-email: actually add bcc headers format-patch: use a string_list for headers format-patch: ...

This bug looks ancient. In fact it doesn't look like --bcc ever worked even when it was introduced in 5806324 (Add support for --bcc to git-send-email., 2006-05-29). Signed-off-by: Stephen Boyd <bebarino@gmail.com> --- git-send-email.perl | 7 ++++++- t/t9001-send-email.sh | 1 + 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index e05455f..3d9c832 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -856,11 ...

There's no way to override the sendemail.to, sendemail.cc, and sendemail.bcc config settings. Add options allowing the user to tell git to ignore the config settings and take whatever is on the command line. Signed-off-by: Stephen Boyd <bebarino@gmail.com> --- git-send-email.perl | 14 ++++++++++---- t/t9001-send-email.sh | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index ...

These new options allow users to override their config settings for format.cc, format.to and format.headers respectively. These options only make git ignore the config settings and any previous command line options, so you'll still have to add more command line options to add extra headers. For example, $ cat .git/config [format] to = Someone <someone@out.there> $ git format-patch -1 --no-to --to="Someone Else <else@out.there>" would format a patch addressed to "Someone Else" and not ...

Figured as much. Not a problem to fix. Thanks. --

Ping. Regards, Bert --