And neither does per-user config file (I triet to reproduce this error, and forgot about ~/.gitconfig file). -- Jakub Narebski Warsaw, Poland ShadeHawk on #git -

Cluster the errors regarding ancestry violation and output them in one batch, together with a hint to pull before pushing. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> --- Catching trend... send-pack.c | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/send-pack.c b/send-pack.c index d56d980..e6da567 100644 --- a/send-pack.c +++ b/send-pack.c @@ -215,6 +215,7 @@ static int send_pack(int in, int out, struct remote *remote, in...

It fixes the bug where local tracing branches were filled with zeroed SHA-1 if the remote branch was not updated because, for instance, it was not an ancestor of the local (i.e. had other changes). Signed-off-by: Alex Riesen <raa.lkml@gmail.com> --- Jeff, I think your change (334f4831e5a77) was either not complete or got broken some time later. send-pack.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/send-pack.c b/send-pack.c index b74fd45..d56d980 10064...

Hi, didn't Johannes Sixt provide a (slightly nicer) patch earlier today? Ciao, Dscho -

We're guaranteeing the user that the index will be stat-clean after git commit. Thus, we need to call refresh_cache() for the user index too, in the 'git commit <paths>' case. Signed-off-by: Kristian Høgsberg <krh@redhat.com> --- builtin-commit.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/builtin-commit.c b/builtin-commit.c index 5011b8b..35205ef 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -109,6 +109,7 @@ static char *prepare_index(const...

Hi, while git is pleasant to use in everyday work, there is one svn feature which is miss dearly, namely "svn info". svn info can give information about specific file objects, but I think its main feature is to use it without any path and thus just describe the current project. I use this a lot to quickly find out to which remote repository the current directory belongs (yes, some work projects tend to look very similar...) and what is the current state of the directory. As a crude approximation...

hm, this is not what I am after. I do not want to inspect the history, I want to see where this repository "belongs" to. Gitk shows me the name (which is reasonable, of course), but not the URL. And it is a GUI probably "current working directory" was not the best way to phrase it. I mean state of the repository, which in my case is a clone of a central repository. My commands show (ignoring formatting): 1. the remote repositories with URL 2. the current head commit hash 3. the date of the head commi...

Currently, when committing, git-commit ignore the value of GIT_INDEX_FILE, and always use $GIT_DIR/index. This patch fix it. Signed-off-by: Rémi Vanicat <vanicat@debian.org> --- git-commit.sh | 2 +- t/t7500-commit.sh | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletions(-) diff --git a/git-commit.sh b/git-commit.sh index fcb8443..7022e6c 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -26,7 +26,7 @@ refuse_partial () { } TMP_INDEX=...

How about calling this simply "ref_abbrev_matches()" or "refname_match()" which is even shorter? -

I vaguely recall that in the old round this check used to be without negation '!' in the front. I think this version is correct. -

git-init does not perform sexual intercourse, either. I don't see why geneticists should be relevant for determining what git-clone does. -- David Kastrup -

git-diff can compare tree and tree, or tree and index; only for comparing tree and files of index and files it needs working dir. git-reset resets only refs and index. git-reset --hard resets also files, so it needs working directory. Perhaps it should fail completely and not only after doing mixed (non-hard) reset if we are in bare repository. -- Jakub Narebski Warsaw, Poland ShadeHawk on #git -

Implement "git-svn info" for files and directories based on the "svn info" command. Note that the -r/--revision argument is not supported yet. Added 18 tests in t/t9117-git-svn-info.sh. Signed-off-by: David D. Kilzer <ddkilzer@kilzer.net> --- Looking for feedback on this patch. Specifically, I'm looking for insight for the two FIXME comments in the cmd_info() function added to git-svn. (I can't help but think I'm missing a plumbing command or a basic concept. Pointers to code, web page...

Or status.submodule.summary, although we usually use section.<variable_sub>.key configuration variables, e.g. branch.<name>.remote. But we have exception: color.branch.<slot> -- Jakub Narebski Warsaw, Poland ShadeHawk on #git -

Fix up the test titles which are incorrectly in the negative. Signed-off-by: Andy Whitcroft <apw@shadowen.org> --- This probabally should be folded down into the current tests patch. If you want me to do that and resubmit, yell at me. t/t5517-push-mirror.sh | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/t/t5517-push-mirror.sh b/t/t5517-push-mirror.sh index 0fc6778..ed3fec1 100755 --- a/t/t5517-push-mirror.sh +++ b/t/t5517-push-mirror.sh...

Shouldn't you also modify Documentation/config.txt ? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git -

I'm not in a git repo, this error message is misleading. jonsmirl@terra:~/foo$ git config remote.origin.url http://git.digispeaker.com/projects/digispeaker-kernel.git could not lock config file -- Jon Smirl jonsmirl@gmail.com -

Hi, He said that he's not in a git repo. Thus, .git/config does not exist, and is not lockable, since not even .git/ exists. Ciao, Dscho -

Recently converted a large (11,000+ revisions) repository. We authenticate against the NT domain controller, so all our revision authors are of the form "domain\user". (You can switch off mod_sspi reporting the domain part, but I didn't know about this at the time, so it continues for historical reasons.) git-svn treats the literal backslashes in the author names as escapes. This leads to authors like domainkevin domain\ ichard I know, I should have read the manual and used my "authors" fi...

In general, I like the idea (as I've already pointed out). But at this time git-commit is about to be made a builtin, and since your implementation contains a lot of non-portable constructs ($'', >&) and a new dependency on awk (and, hence, has little chances of being accepted), I suggest that you stay tuned, and implement this in the forth-coming There is already 'status.color', I suggest the configuration to become 'status.submoduleSummary'. -- Hannes -

I'm with you. But git-commit.sh is a dead horse, no matter how hard you beat it. BTW, maybe you can keep the log generation in a helper script, git-status--submodulesummary, and invoke that from builtin-commit.c. This "I think it's a good idea to put all status related configuration variables in the status.* namespace." But I don't care too deeply. I don't have the big picture about which configuration variables namespaces exist and which one to pick in this case. -- Hannes -

Hi, You could make this variable even a numeric one. Saying how many lines you want to have maximally (-1 meaning unlimited). Ciao, Dscho -

Just use git log --left-right --topo-order, then you can easily insert -$n, and git-log will decide where it cuts off the lists. However, --left-right won't reverse one of the list, like you did. -- Hannes -

I leave $modules outside quotes to let "\n" change to <space> by auto word splitting. It actually eats white spaces in the module names. So any suggestion to handle this case? To handles module names with spaces, is it ok to display as follows? Submodules modified: sm1 "sm name with space" I just guess '\r' is need for Mac OS because i havn't Mac OS environment. -- Ping Yin -

I'd like to do this sequence, but I can't figure out how without editing the config file. There doesn't seem to be a simple command to move the origin. git clone linus move origin to digispeaker.git git pull What's the simplest way to do this? -- Jon Smirl jonsmirl@gmail.com -