Merge branch 'maint'

* maint:
t7401: squelch garbage output
Documentation/git-submodule: typofix
Fix config key miscount in url.*.insteadOf
Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
Document -w option to shortlog
bisect: report bad rev better

diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index c7752575d8f5f35657cb9ef5a7e9e18b82ddc8b8..d7cb4c0468e713543042d41ff57a638a7fda2881 100644 (file)
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -8,8 +8,8 @@ git-shortlog - Summarize 'git log' output
 SYNOPSIS
 --------
 [verse]
-git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] [-e]
-git-shortlog [-n|--numbered] [-s|--summary] [-e|--email] [<committish>...]
+git-log --pretty=short | 'git-shortlog' [-h] [-n] [-s] [-e] [-w]
+git-shortlog [-n|--numbered] [-s|--summary] [-e|--email] [-w[<width>[,<indent1>[,<indent2>]]]] [<committish>...]
 
 DESCRIPTION
 -----------
@@ -35,6 +35,12 @@ OPTIONS
 -e, \--email::
        Show the email address of each author.
 
+-w[<width>[,<indent1>[,<indent2>]]]::
+       Linewrap the output by wrapping each line at `width`.  The first
+       line of each entry is indented by `indent1` spaces, and the second
+       and subsequent lines are indented by `indent2` spaces. `width`,
+       `indent1`, and `indent2` default to 76, 6 and 9 respectively.
+
 FILES
 -----
 

diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 41f9f635665b82806350c87de5117e1cfa806c1a..6ffd896fbc78b783a7e00ed462f879cbff29d758 100644 (file)
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -70,7 +70,7 @@ OPTIONS
 -n, --summary-limit::
        This option is only valid for the summary command.
        Limit the summary size (number of commits shown in total).
-       Giving 0 will disable the summary; a negative number means unlimted
+       Giving 0 will disable the summary; a negative number means unlimited
        (the default). This limit only applies to modified submodules. The
        size is always limited to 1 for added/deleted/typechanged submodules.
 

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 29edafcedac6bcb95315e7429ea56d2d283ef6f6..ed3ba83c530411801dd1cd8980cad4d005962690 100644 (file)
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -74,6 +74,11 @@ gitk --max-count=100 --all \-- Makefile::
        Show at most 100 changes made to the file 'Makefile'. Instead of only
        looking for changes in the current branch look in all branches.
 
+Files
+-----
+Gitk creates the .gitk file in your $HOME directory to store preferences
+such as display options, font, and colors.
+
 See Also
 --------
 'qgit(1)'::

diff --git a/builtin-shortlog.c b/builtin-shortlog.c
index bd795b1db7a4054a0218d1ec96794ad25d656896..e6a2865019cceadfcbfc8575a2bd1f97b7159dcb 100644 (file)
--- a/builtin-shortlog.c
+++ b/builtin-shortlog.c
@@ -9,7 +9,7 @@
 #include "shortlog.h"
 
 static const char shortlog_usage[] =
-"git-shortlog [-n] [-s] [-e] [<commit-id>... ]";
+"git-shortlog [-n] [-s] [-e] [-w] [<commit-id>... ]";
 
 static int compare_by_number(const void *a1, const void *a2)
 {

diff --git a/git-bisect.sh b/git-bisect.sh
index ff904e60d96591db7fefb41679e995d9e33a2f5a..408775a51e2ad7b3007ea8a0001516c26166318a 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -159,9 +159,9 @@ bisect_state() {
                shift
                for rev in "$@"
                do
-                       rev=$(git rev-parse --verify "$rev^{commit}") ||
+                       sha=$(git rev-parse --verify "$rev^{commit}") ||
                                die "Bad rev input: $rev"
-                       bisect_write "$state" "$rev"
+                       bisect_write "$state" "$sha"
                done ;;
        *,bad)
                die "'git bisect bad' can take only one argument." ;;

diff --git a/remote.c b/remote.c
index 08af7f9de124f2e06dc8edd030212ecde9c22920..369dc3398cc22206497f17cd846702783f59cf76 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -315,7 +315,7 @@ static int handle_config(const char *key, const char *value)
        }
        if (!prefixcmp(key, "url.")) {
                struct rewrite *rewrite;
-               name = key + 5;
+               name = key + 4;
                subkey = strrchr(name, '.');
                if (!subkey)
                        return 0;

diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 793ffc6600202431193887a12981105c099d40df..6d7e7385483bda6223d8d222980bf33b2679f711 100755 (executable)
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -103,9 +103,9 @@ test_expect_success 'fetch with wildcard' '
 test_expect_success 'fetch with insteadOf' '
        mk_empty &&
        (
-               TRASH=$(pwd) &&
+               TRASH=$(pwd)/ &&
                cd testrepo &&
-               git config url./$TRASH/.insteadOf trash/
+               git config url.$TRASH.insteadOf trash/
                git config remote.up.url trash/. &&
                git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
                git fetch up &&
@@ -145,8 +145,8 @@ test_expect_success 'push with wildcard' '
 
 test_expect_success 'push with insteadOf' '
        mk_empty &&
-       TRASH=$(pwd) &&
-       git config url./$TRASH/.insteadOf trash/ &&
+       TRASH=$(pwd)/ &&
+       git config url.$TRASH.insteadOf trash/ &&
        git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
        (
                cd testrepo &&

diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh
index 0f3c42ab35891d1dd671649ff38074a1d83e2a5b..b9a22190e86a0b8718b215771352ecefbdf86edc 100755 (executable)
--- a/t/t7401-submodule-summary.sh
+++ b/t/t7401-submodule-summary.sh
@@ -30,7 +30,7 @@ commit_file () {
 }
 
 test_create_repo sm1 &&
-add_file . foo
+add_file . foo >/dev/null
 
 head1=$(add_file sm1 foo1 foo2)