Diff filename has trailing tab if filename contains space

[乙酸鋰]

Hi,

Using git 2.7.1

Diff filename has trailing tab if filename contains space
Please run below shell script
and look at the output diff file 1.diff
There is trailing tab chars after these lines:
--- a/8 1/8.txt
+++ b/8 1/8.txt
 b/9 86
+++ b/9 86



#!/bin/sh
set -e
git init

echo a >> "normal"
git add "normal"
echo y >> "9 86"
git add "9 86" # file name has space
mkdir x
echo d >> "x/normal"
git add "x/normal"
mkdir "8 1"
echo u >> "8 1/8.txt" # directory name has space
echo k >> "8 1/8.txt"
git add "8 1/8.txt"
git commit -m "Initial commit"

echo b >> "normal"
git add "normal"
echo c >> "9 86"
git add "9 86"
echo e >> "x/normal"
git add "x/normal"
echo h >> "8 1/8.txt"
git add "8 1/8.txt"
git commit -m "Edit files"
git diff master~1 > 1.diff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

git ls-files should not show worktree files as untracked

[乙酸鋰]

Hi,
Using git 2.6.2
I think worktree should behave consistently like submodule

Run following commands
```
echo 1 > 1.txt
git init
git add 1.txt
git commit -m "initial commit"
echo 2 > 2.txt # untracked file
mkdir def
cd def
git clone --separate-git-dir ../.git/ghi .. . # simulate an untracked submodule
cd ..
git worktree add abc

git ls-files --exclude-standard --full-name --others
```

Actual: list all the files of abc
2.txt
abc/1.txt
def/

Expected: just the directory of abc
2.txt
abc/
def/


Hint: path.c: git_path_submodule() should read "commondir" ?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

git worktree help inconsistent

[乙酸鋰]

Using git 2.6.1

In git command line usage, Please mark  optional, the man page
is correct.

$ git worktree add
usage: git worktree add []  
   or: git worktree prune []

-f, --force   checkout  even if already checked
out in other worktree
-bcreate a new branch
-Bcreate or reset a branch
--detach  detach HEAD at named commit

But in man page,
git worktree add [-f] [--detach] [-b ]  []
git worktree prune [-n] [-v] [--expire ]
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: message not appear in mailing list

[乙酸鋰]

The tarball I sent was 160 KB

2015-10-02 1:27 GMT+08:00 David Turner <dtur...@twopensource.com>:
> On Thu, 2015-10-01 at 11:47 +0800, 乙酸鋰 wrote:
>> Hi,
>>
>> Why the message not appear in mailing list for many hours?
>> There is no reject reply message. I sent the mail in plain text with a
>> tarball attachment.
>
> The git mailing list silently rejects messages over a certain size (as I
> discovered when trying to send a too-large patch).  Pop the tarball up
> on mega.nz (um, or something) and send a link.
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

message not appear in mailing list

[乙酸鋰]

Hi,

Why the message not appear in mailing list for many hours?
There is no reject reply message. I sent the mail in plain text with a
tarball attachment.
http://dir.gmane.org/gmane.comp.version-control.git
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

git 2.6.0 apply --cached failed

[乙酸鋰]

Hi,

Using git 2.6.0 on Linux 64-bit
git apply --cached failed

Please test with command with the repository inside the attached tarball.

With git 2.6,
git apply --cached < patch.patch

fatal: corrupt patch at line 27


Expected result: no error

Step to reproduce: Please run the following shell script.

#/bin/sh
set -e
mkdir 2
cd 2

cat > d0c886e2-2cfe-4636-825b-3622fac0b27f 

git commit --date format

[乙酸鋰]

Hi,

In git  2.0, git commit --amend --date= can amend commit with
current time as author time.
But since git 2.0, this does not work, dying with invalid date format.
I have to instead type git commit --amend --date=now.
Is empty string date format no longer supported? Or will be fixed?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

git 1.9.1 tarball

[乙酸鋰]

Hi,

Where to find git 1.9.1 tarball?
It is not uploaded to google code.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

git submodule update checkout update mode

[乙酸鋰]

Hi,

In 2.0.0 release notes (00eda23),
Newly cloned submodule repositories by git submodule update,
   when the checkout update mode is used, will be on a local
   branch instead of on a detached HEAD, just like submodules added
   with git submodule add.

It is not clear.
1. Is checkout update mode the default? (when without any command
line options)
2. Does merge update mode checkouts a local branch instead of on a
detached HEAD?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

bash completion patch

[乙酸鋰]

add --recurse-submodules
From 0390a24e2653e0cdb6bfb9a569c28e4d58002038 Mon Sep 17 00:00:00 2001
From: Sup Yut Sum ch3co...@gmail.com
Date: Wed, 5 Feb 2014 23:09:46 +0800
Subject: [PATCH 1/1] bash completion: Add --recurse-submodules

---
 contrib/completion/git-completion.bash | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 9525343..87de809 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1221,14 +1221,20 @@ _git_difftool ()
 	__git_complete_revlist_file
 }
 
+__git_fetch_recurse_submodules=yes on-demand no
+
 __git_fetch_options=
 	--quiet --verbose --append --upload-pack --force --keep --depth=
-	--tags --no-tags --all --prune --dry-run
+	--tags --no-tags --all --prune --dry-run --recurse-submodules=
 
 
 _git_fetch ()
 {
 	case $cur in
+	--recurse-submodules=*)
+		__gitcomp $__git_fetch_recurse_submodules  ${cur##--recurse-submodules=}
+		return
+		;;
 	--*)
 		__gitcomp $__git_fetch_options
 		return
@@ -1583,6 +1589,10 @@ _git_pull ()
 	__git_complete_strategy  return
 
 	case $cur in
+	--recurse-submodules=*)
+		__gitcomp $__git_fetch_recurse_submodules  ${cur##--recurse-submodules=}
+		return
+		;;
 	--*)
 		__gitcomp 
 			--rebase --no-rebase
@@ -1595,6 +1605,8 @@ _git_pull ()
 	__git_complete_remote_or_refspec
 }
 
+__git_push_recurse_submodules=check on-demand
+
 _git_push ()
 {
 	case $prev in
@@ -1607,10 +1619,15 @@ _git_push ()
 		__gitcomp_nl $(__git_remotes)  ${cur##--repo=}
 		return
 		;;
+	--recurse-submodules=*)
+		__gitcomp $__git_push_recurse_submodules  ${cur##--recurse-submodules=}
+		return
+		;;
 	--*)
 		__gitcomp 
 			--all --mirror --tags --dry-run --force --verbose
 			--receive-pack= --repo= --set-upstream
+			--recurse-submodules=
 		
 		return
 		;;
-- 
1.8.5.2

After stash pop, refs/stash become 40 zeroes

[乙酸鋰]

Hi,

what are the possible causes of this?
After stash pop, refs/stash becomes 40 zeroes.
This is the only stash, so refs/stash should be deleted after pop.
However, it becomes 40 zeroes.

git 1.8.x
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: After stash pop, refs/stash become 40 zeroes

[乙酸鋰]

Also, logs/refs/stash becomes empty (0 bytes of file size) after pop.

2014/1/15 乙酸鋰 ch3co...@gmail.com:
 Hi,

 what are the possible causes of this?
 After stash pop, refs/stash becomes 40 zeroes.
 This is the only stash, so refs/stash should be deleted after pop.
 However, it becomes 40 zeroes.

 git 1.8.x
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Synchronize git-credential-wincred from msysgit

[乙酸鋰]

Hi,

Please cherry pick from msysgit/git
commit 3c8cbb4edc8f577940c52115c992d17575587f99

to synchronize git-credential-wincred

This was the change they made half year ago.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Thin pack

[乙酸鋰]

Hi,

What are the difference between pre 1.8.5 and 1.8.5 about thin pack support?
Could you describe thin pack?
From the doc, it says --thin is default option. Is that true?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

document git blame --no-follow and git diff --no-follow

[乙酸鋰]

Hi,

Please document git blame --no-follow and git diff --no-follow

Regards,
ch3cooli
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Typo in Documentation/RelNotes/1.8.4.txt

[乙酸鋰]

Typo in Documentation/RelNotes/1.8.4.txt
line 39:
opportunisticly - opportunistically
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: fix french translation

[乙酸鋰]

Sorry, I reversed the revisions. This one should be correct.

 git-gui/po/fr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-gui/po/fr.po b/git-gui/po/fr.po
index 40441db..0aff186 100644
--- a/git-gui/po/fr.po
+++ b/git-gui/po/fr.po
@@ -1139,7 +1139,7 @@ msgstr Standard (rapide, semi-redondant, liens durs)

 #: lib/choose_repository.tcl:514
 msgid Full Copy (Slower, Redundant Backup)
-msgstr Copy complète (plus lent, sauvegarde redondante)
+msgstr Copie complète (plus lent, sauvegarde redondante)

 #: lib/choose_repository.tcl:520
 msgid Shared (Fastest, Not Recommended, No Backup)

2013/5/27 Matthieu Moy matthieu@grenoble-inp.fr:
 Antoine Pelisse apeli...@gmail.com writes:

 -msgstr Copie complčte (plus lent, sauvegarde redondante)
 +msgstr Copy complčte (plus lent, sauvegarde redondante)

 I still don't get why Copie is replaced by Copy ?

 Yes, this is clearly wrong. Copie is french, Copy is not.

 --
 Matthieu Moy
 http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

fix french translation

[乙酸鋰]

see patch


git-gui-french.patch
Description: Binary data

Re: mailmap documentation add grave accents

[乙酸鋰]

Any response for such a small fix?

2013/3/10 乙酸鋰 ch3co...@gmail.com:
 Hi,
 Here is the patch.

 Regards,
 ch3cooli
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Fwd: mailmap documentation add grave accents

[乙酸鋰]

Hi,
Here is the patch.

Regards,
ch3cooli


0001-mailmap-add-grave-accents-around-mailmap.file-and-ma.patch
Description: Binary data

supports diff.context config for git-diff-tree

[乙酸鋰]

Dear Sir,

In git 1.8.1, git-diff supports diff.context config.
However, git-diff-tree does not support this.
Could you also add this to git-diff-tree?

Regards,
ch3cooli
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

git fetch without --recurse-submodules option

[乙酸鋰]

Hi,
With git pull or git fetch without specifying --recurse-submodules,
what is the default action?
It seems git fetches submodules wtihout specifying --recurse-submodules.
If this is not clear, please update documentation.

In git pull document --recurse-submodules option, it tells users to
see git-config(1) and gitmodules(5), but does not tell users to refer
to git fetch --recurse-submodules for the meaning of the switches.
In git fetch document --recurse-submodules option, it does not tell
users to see git-config(1) or gitmodules(5).
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

git push --recurse-submodules=on-demand with submodule push tag

[乙酸鋰]

Hi,

In superproject, can I call git push --recurse-submodules=on-demand
that pushes submodule with the submodule's tags?
Very often I change version and tag the submodule
and change version and tag the superproject at the same time.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

git push --force to update tag

[乙酸鋰]

about git 1.8.2

 * git push now requires -f to update a tag, even if it is a
   fast-forward, as tags are meant to be fixed points.

Does the server side validate this? Do we need to upgrade git on
server side to support this?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Submodule not updated automatically on merge conflict

[乙酸鋰]

Hi,

If there are merge conflict files, then changed submodules are not
updated automatically.
Why not submodules?
Files do try to merge / update.

Regards,
ch3cooli
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

unclear documentation of git fetch --tags option and tagopt config

[乙酸鋰]

Hi,

With git fetch --tags
or remote.origin.tagopt = --tags
git fetch only fetches tags, but not branches.
Current documentation does not mention that no branches are fetched /
pulled when --tags option or remote.origin.tagopt = --tags is
specified.

Regards,
ch3cooli
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Also close config file handle when leaving git_config_set_multivar_in_file() early

[乙酸鋰]

Hi,

This patch fixes the captioned problem.
It is needed because our program statically link git.
In this case, do not assume a fail will call die() and exit program so
the handle is leave not closed.

Regards,
ch3cooli


0001-Also-close-config-file-handle-when-leaving-git_confi.patch
Description: Binary data

Commit message problem of reverting multiple commits

[乙酸鋰]

Hi,

I ran git 1.8.0 command line

git revert --no-commit rev1 rev2

I see a prepared commit message like

Revert description from one commit
This reverts commit SHA1 of one commit.


The actual revert content is correct - it is all the relevant commits
that were selected. I expect the message to reflect this:

Revert description from commit1, description from commit2
This reverts commits SHA1 of commit1, SHA1 of commit2.

Regards,
ch3cooli
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Do not add an empty value from config credential.helper

[乙酸鋰]

Below is current git message when a local config credential.helper has
an empty value. Please skip an empty value.

$ git push --force origin master
git: 'credential-' is not a git command. See 'git --help'.

Did you mean this?
credential
Total 0 (delta 0), reused 0 (delta 0)
To https://u...@github.com/user/myrepo.git
 + d23aa6a...3405990 master - master (forced update)


0001-credential-do-not-recognize-a-credential-helper-if-c.patch
Description: Binary data

overriding/removing inherited credential.helper

[乙酸鋰]

In credential.c, line 67:

if (!strcmp(key, helper))
string_list_append(c-helpers, value);

In global config, I add one credential helper.
But I do not want to use any credential helper in a specific repository.
Currently there is no way in local config to override and remove
inherited credential helper.
Of course, I do not want to change global config.

Could you suggest a patch?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Launch separate program for HTTPS prompt

[乙酸鋰]

Hi,

Could you launch a separate program for HTTPS prompt like SSH_ASKPASS?
This allows GUI programs to answer the trust or not, not via stdin.

Regards,
ch3cooli
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Merge option suggestion (dictator, humble)

[乙酸鋰]

Hi,

I would like to suggest 2 merge options
--dictator   use all my changes
--humble   use all their changes

These allows to produce a fast-forward commit, without resolving any conflicts.
Sometimes, someone did something completely wrong, so the commit needs
to be ignored.
I cannot tell everyone in the world to run git fetch followed by git
reset --hard.

Regards,

ch3cooli
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

git svn clone options

[乙酸鋰]

Hi,

I tried
git svn clone --stdlayout --branch ABC
but svn branches were missing (trunk was present), compared to the result of
git svn clone --stdlayout

Could you clarify --branch option, is it the same as --branches.
I thought git clone has --branch option, so I tried this option for svn.

Alos, I tried
git svn clone --stdlayout --no-checkout
It worked without checking out files.
but git-svn documentation seems to not mention this option.

Could you also tell what options are supported in both git clone and
git svn clone, and git clone only options?

Regards,

ch3cooli
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

git smart-http do not authent to allow git ls-remote to be called anonymously

[乙酸鋰]

Hi,

I use smart-http on Apache.
If nothing to be pushed / pulled, I do not want password to be
supplied. And allow git ls-remote to run without password

*.git/info/refs?service=git-upload-pack
*.git/info/refs?service=git-receive-pack

I only need authentication on

*.git/git-upload-pack
*.git/git-receive-pack

/etc/apache/httpd.conf

LocationMatch ^/git/.*/git-(upload|receive)-pack$
AuthType Basic
AuthName staff only
AuthUserFile /etc/apache/apache.pwd
Require valid-user
/LocationMatch

However this does not work. It does not ask for password at all.

I use Ubuntu 10.04, Apache 2.2.14, Git 1.7.11.3.

Directory structure: any depth (more than 1 subdir) of path from /git
to .git folders

Could you advise how to configure this? Is this a bug?

Regards,
ch3cooli
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

git pull --no-ff documentation

[乙酸鋰]

Hi,

The order of options in git pull is not clear in the documentation
It only says
git pull [options] [repository [refspec...]]
So we have no idea which options should come first

I tried
git pull -v --no-tags --progress --no-ff origin
but failed with unknown option 'no-ff'.

But if I ran
git pull -v --no-ff  --no-tags --progress origin
it succeeded.

Regards,
ch3cooli
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

git die message written to stdout?

[乙酸鋰]

Is git die() messages written to stdout?
Should it be written to stderr?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

git checkout -t -B

[乙酸鋰]

Dear Sir,

I want to make current branch abcde a remote tracking branch with origin/abcde.
Since I am working on current branch abcde, I have to use the force option.
So I run

git checkout -t -B origin/abcde
works

but
git checkout -B -t origin/abcde
does not.

Could you document the order of parameters or fix the behaviour?

Thanks,
ch3cooli
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

git-tag documentation enhancement

[乙酸鋰]

Dear Sir,

I would like to enhance git-tag documentation

--Unless -f is given, the tag to be created must not yet exist in the
.git/refs/tags/ directory.
++Unless -f is given, the tag to be created must not yet exist in the
.git/refs/tags/ directory or inside .git/packed-refs file.

Regards,
ch3cooli
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html