diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-04-09 10:41:27 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-04-09 10:47:23 +0400 |
commit | 796b13781aecce551b8f92049a66646e60f31dce (patch) | |
tree | faa8f227f6ba5a02bb6d4668ebe5f83b04c43c54 | |
parent | 6da14ee14f85fe5766780e1cbe8d42d385638e9e (diff) | |
parent | db12d97542762cdb54d332ea047122f1071132b5 (diff) |
Merge branch 'maint'
* maint:
Start 1.6.2.3 preparation
process_{tree,blob}: Remove useless xstrdup calls
git-pull.sh: better warning message for "git pull" on detached head.
Conflicts:
RelNotes
-rw-r--r-- | Documentation/RelNotes-1.6.2.3.txt | 28 | ||||
-rw-r--r-- | Documentation/RelNotes-1.6.3.txt | 5 | ||||
-rwxr-xr-x | git-pull.sh | 42 | ||||
-rw-r--r-- | list-objects.c | 2 | ||||
-rw-r--r-- | reachable.c | 1 |
5 files changed, 53 insertions, 25 deletions
diff --git a/Documentation/RelNotes-1.6.2.3.txt b/Documentation/RelNotes-1.6.2.3.txt new file mode 100644 index 0000000000..6560593fd5 --- /dev/null +++ b/Documentation/RelNotes-1.6.2.3.txt @@ -0,0 +1,28 @@ +GIT v1.6.2.3 Release Notes +========================== + +Fixes since v1.6.2.2 +-------------------- + +* Setting an octal mode value to core.sharedrepository configuration to + restrict access to the repository to group members did not work as + advertised. + +* A fairly large and trivial memory leak while rev-list shows list of + reachable objects has been identified and plugged. + +* "git-commit --interactive" did not abort when underlying "git-add -i" + signaled a failure. + +* git-repack (invoked from git-gc) did not work as nicely as it should in + a repository that borrows objects from neighbours via alternates + mechanism especially when some packs are marked with the ".keep" flag + to prevent them from being repacked. + +Many small documentation updates are included as well. + +--- +exec >/var/tmp/1 +echo O=$(git describe maint) +O=v1.6.2.2-41-gbff82d0 +git shortlog --no-merges $O..maint diff --git a/Documentation/RelNotes-1.6.3.txt b/Documentation/RelNotes-1.6.3.txt index db6956205d..517c783b5d 100644 --- a/Documentation/RelNotes-1.6.3.txt +++ b/Documentation/RelNotes-1.6.3.txt @@ -105,11 +105,6 @@ Updates since v1.6.2 * Output from git-remote command has been vastly improved. -* git-repack (invoked from git-gc) did not work as nicely as it should in - a repository that borrows objects from neighbours via alternates - mechanism especially when some packs are marked with the ".keep" flag - to prevent them from being repacked. - * git-send-email learned --confirm option to review the Cc: list before sending the messages out. diff --git a/git-pull.sh b/git-pull.sh index 8a26763206..8c750270e9 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -90,23 +90,31 @@ error_on_no_merge_candidates () { curr_branch=${curr_branch#refs/heads/} - echo "You asked me to pull without telling me which branch you" - echo "want to merge with, and 'branch.${curr_branch}.merge' in" - echo "your configuration file does not tell me either. Please" - echo "name which branch you want to merge on the command line and" - echo "try again (e.g. 'git pull <repository> <refspec>')." - echo "See git-pull(1) for details on the refspec." - echo - echo "If you often merge with the same branch, you may want to" - echo "configure the following variables in your configuration" - echo "file:" - echo - echo " branch.${curr_branch}.remote = <nickname>" - echo " branch.${curr_branch}.merge = <remote-ref>" - echo " remote.<nickname>.url = <url>" - echo " remote.<nickname>.fetch = <refspec>" - echo - echo "See git-config(1) for details." + if [ -z "$curr_branch" ]; then + echo "You are not currently on a branch, so I cannot use any" + echo "'branch.<branchname>.merge' in your configuration file." + echo "Please specify which branch you want to merge on the command" + echo "line and try again (e.g. 'git pull <repository> <refspec>')." + echo "See git-pull(1) for details." + else + echo "You asked me to pull without telling me which branch you" + echo "want to merge with, and 'branch.${curr_branch}.merge' in" + echo "your configuration file does not tell me either. Please" + echo "specify which branch you want to merge on the command line and" + echo "try again (e.g. 'git pull <repository> <refspec>')." + echo "See git-pull(1) for details." + echo + echo "If you often merge with the same branch, you may want to" + echo "configure the following variables in your configuration" + echo "file:" + echo + echo " branch.${curr_branch}.remote = <nickname>" + echo " branch.${curr_branch}.merge = <remote-ref>" + echo " remote.<nickname>.url = <url>" + echo " remote.<nickname>.fetch = <refspec>" + echo + echo "See git-config(1) for details." + fi exit 1 } diff --git a/list-objects.c b/list-objects.c index c8b8375e49..dd243c7c66 100644 --- a/list-objects.c +++ b/list-objects.c @@ -23,7 +23,6 @@ static void process_blob(struct rev_info *revs, if (obj->flags & (UNINTERESTING | SEEN)) return; obj->flags |= SEEN; - name = xstrdup(name); add_object(obj, p, path, name); } @@ -78,7 +77,6 @@ static void process_tree(struct rev_info *revs, if (parse_tree(tree) < 0) die("bad tree object %s", sha1_to_hex(obj->sha1)); obj->flags |= SEEN; - name = xstrdup(name); add_object(obj, p, path, name); me.up = path; me.elem = name; diff --git a/reachable.c b/reachable.c index 3b1c18ff9b..b515fa2de3 100644 --- a/reachable.c +++ b/reachable.c @@ -48,7 +48,6 @@ static void process_tree(struct tree *tree, obj->flags |= SEEN; if (parse_tree(tree) < 0) die("bad tree object %s", sha1_to_hex(obj->sha1)); - name = xstrdup(name); add_object(obj, p, path, name); me.up = path; me.elem = name; |