[PATCH 16/19] for-each-ref.c: improve message before aborting on broken ref

From: Ronnie Sahlberg sahlb...@google.com Date: Fri, 5 Sep 2014 14:35:17 -0700 Print a warning message for any badly named refs we find in the repo. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- builtin/for-each-ref.c | 6 ++ 1 file

[PATCH 15/19] refs.c: fix handling of badly named refs

From: Ronnie Sahlberg sahlb...@google.com Date: Wed, 3 Sep 2014 11:45:43 -0700 We currently do not handle badly named refs well: $ cp .git/refs/heads/master .git/refs/heads/master.@\*@\\. $ git branch fatal: Reference has invalid format: 'refs/heads/master.@*@\.' $ git branch

[PATCH 14/19] branch -d: avoid repeated symref resolution

If a repository gets in a broken state with too much symref nesting, it cannot be repaired with git branch -d: $ git symbolic-ref refs/heads/nonsense refs/heads/nonsense $ git branch -d nonsense error: branch 'nonsense' not found. Worse, git update-ref --no-deref -d doesn't work for such

[PATCH 18/19] lockfile: remove unable_to_lock_error

The former caller uses unable_to_lock_message now. Signed-off-by: Jonathan Nieder jrnie...@gmail.com Reviewed-by: Ronnie Sahlberg sahlb...@google.com --- cache.h| 1 - lockfile.c | 10 -- 2 files changed, 11 deletions(-) diff --git a/cache.h b/cache.h index 03a6144..995729f 100644

[PATCH 19/19] ref_transaction_commit: bail out on failure to remove a ref

When removal of a loose or packed ref fails, bail out instead of trying to finish the transaction. This way, a single error message can be printed (instead of multiple messages being concatenated by mistake) and the operator can try to solve the underlying problem before there is a chance to muck

[PATCH 0/3] gitk: save only changed configuration on exit

gitk rewrites whole its config on exit. This is inconvenient when there are several instances running - if user changes something in one instance, it may be discarded depending of the order of closing that instances. Change saving so that it saves only changed data and tried to preserve other

[PATCH 2/3] gitk: write only changed configuration variables

If a variable is changed in a concurrent gitk or manually it is preserved unless it has changed in this instance This change does not affect geometry and views save; geometry does not need it, and views need special merging, which treats each view separately rather that fully replace the shole

[PATCH 3/3] gitk: merge views with existing ones

Only new and modified views are saved; old ones are saved also if there are no new, modified or deleted view with same name. This allows editing view list in concurrent gitk sessions without losing the changes. Signed-off-by: Max Kirillov m...@max630.net --- gitk | 42

[PATCH 1/3] gitk refactor: remove boilerplate for configuration variables

Signed-off-by: Max Kirillov m...@max630.net --- gitk | 88 1 file changed, 20 insertions(+), 68 deletions(-) diff --git a/gitk b/gitk index 6fb6cb3..6069afe 100755 --- a/gitk +++ b/gitk @@ -2805,23 +2805,11 @@ proc doprogupdate

<    1   2