这是一个简短的片段示例(您可以将其粘贴到Linux终端中(,创建一个新的git
存储库并向其中添加一些文件(使用git版本1.7.9.5(:
cd /tmp/
mkdir myrepo_git
cd myrepo_git/
git init
git config user.name "Your Name"
git config user.email you@example.com
echo "test" > file_tracked_unchanged.txt
echo "test" > file_tracked_changed.txt
echo "test" > file_untracked.txt
git add file_tracked_unchanged.txt
git add file_tracked_changed.txt
git commit -m "initial commit"
现在,在初始提交之后,我想更改file_tracked_changed.txt
文件,并在下一次提交时保持其他文件(此处仅file_tracked_unchanged.txt
(不变。下面是一个片段,它演示了这一点,以及git status
与git ls-files
的不同输出(git
shell 输出以 #
为前缀(:
echo "test more" >> file_tracked_changed.txt
git status -uno
# # On branch master
# # Changes not staged for commit:
# # (use "git add <file>..." to update what will be committed)
# # (use "git checkout -- <file>..." to discard changes in working directory)
# #
# # modified: file_tracked_changed.txt
# #
# no changes added to commit (use "git add" and/or "git commit -a")
git status
# # On branch master
# # Changes not staged for commit:
# # (use "git add <file>..." to update what will be committed)
# # (use "git checkout -- <file>..." to discard changes in working directory)
# #
# # modified: file_tracked_changed.txt
# #
# # Untracked files:
# # (use "git add <file>..." to include in what will be committed)
# #
# # file_untracked.txt
# no changes added to commit (use "git add" and/or "git commit -a")
git status -uno --short
# M file_tracked_changed.txt
git status --short
# M file_tracked_changed.txt
# ?? file_untracked.txt
git ls-files -v
# H file_tracked_changed.txt
# H file_tracked_unchanged.txt
git add file_tracked_changed.txt
git status -uno
# # On branch master
# # Changes to be committed:
# # (use "git reset HEAD <file>..." to unstage)
# #
# # modified: file_tracked_changed.txt
# #
# # Untracked files not listed (use -u option to show untracked files)
git status
# # On branch master
# # Changes to be committed:
# # (use "git reset HEAD <file>..." to unstage)
# #
# # modified: file_tracked_changed.txt
# #
# # Untracked files:
# # (use "git add <file>..." to include in what will be committed)
# #
# # file_untracked.txt
git status -uno --short
# M file_tracked_changed.txt
git status --short
# M file_tracked_changed.txt
# ?? file_untracked.txt
git ls-files -v
# H file_tracked_changed.txt
# H file_tracked_unchanged.txt
我正在寻找的是一个命令,它将显示目录中的所有跟踪文件(git ls-files -v
这样做(,以及它们准确的存储库状态(git ls-files
不显示,因为它显示H
作为所有跟踪文件的状态(。例如,我想获得类似伪代码的东西:
git status-tracked
# M file_tracked_changed.txt
# . file_tracked_unchanged.txt
。其中点.
是一个符号,表示一个跟踪但未更改的文件(如果我没记错的话,SVN 可能会对这些使用U
字符(。
最终,我还想显示目录中所有文件的状态,如伪代码:
git status-tracked-and-untracked
# M file_tracked_changed.txt
# . file_tracked_unchanged.txt
# ?? file_untracked.txt
。但对我来说更重要的是了解所有跟踪文件的状态,如上面的伪git status-tracked
。
git
中的任何命令,已经做了这样的事情?
Linux 的快速单行代码:
sort -uk 2bi <(git status -s) <(git ls-files | sed 's/^/ . /')
谢谢@sdaau。我做了一些更改,以便它运行得更快,并以与git status
相同的格式提供结果:
git ls-files | while read -r line;
do
st=$(git status -s "$line");
if [ -n "$st" ]; then
echo "$st";
else
echo " $line";
fi;
done
感谢@Andomar,提供git ls-tree
提示;这是它显示的内容:
git ls-tree --name-status HEAD
# file_tracked_changed.txt
# file_tracked_unchanged.txt
。但我想要状态:)
好的,这是一个解决方案,调用ls-files
和status
,并将它们与一些bash
解析交错:
git ls-files -cdmoskt --abbrev=8 | while read -r line; do
fn=$(echo "$line" | sed 's/.*s(w+)/1/');
st=$(git status -s "$fn" | printf "%-02s " $(sed 's/([[:print:]]+)s.*/1/'));
echo "$st- $line";
done
如果像 OP 示例中那样运行此操作,则会得到:
git ls-files -cdmoskt --abbrev=8 | while read -r line; do fn=$(echo "$line" | sed 's/.*s(w+)/1/'); st=$(git status -s "$fn" | printf "%-02s " $(sed 's/([[:print:]]+)s.*/1/')); echo "$st- $line"; done
# ?? - ? file_untracked.txt
# M - H 100644 52e7a08e 0 file_tracked_changed.txt
# - H 100644 9daeafb9 0 file_tracked_unchanged.txt
。这基本上是我想要的。(如果我有运气将其转换为git
别名,我会在这里发布(。
编辑:这里作为git
别名(~/.gitconfig
(:
ls-fstatus = "! cd $PWD/$GIT_PREFIX; git ls-files -cdmoskt --abbrev=8 | while read -r line; do
fn=$(echo "$line" | sed "s/.*\s\([[:print:]]\+\)/\1/");
st=$(git status -s "$fn" | printf "%-02s " $(sed "s/\([[:print:]]\+\)\s.*/\1/"));
echo "$st- $line";
done "
。因此,可以在给定的 git repo 子目录中调用git ls-fstatus
。
受到@RogerDueck回答的启发,我制作了一个脚本,分别执行git ls-files
和git status
一次。它在我的存储库中运行速度大约快 15 倍,有 ~ 1700 个文件,不到 2 秒。
编辑:添加了一些修复和一些单元测试,移至GitHub:https://github.com/frnhr/git-fullstatus
示例输出:
M some/file
D another/file
D more/files/blahblah
A this/is/an/added/file/i/think
an/unchanged_file
another/unchanged_file
>frnhr的答案在macOS上对我不起作用,因为它有一个旧版本的bash。在 perl 中也有类似的想法。它不是 qsort,而是合并已经排序的两个列表(最后忽略的文件除外(。
#!/usr/bin/env perl
use strict;
# --ignored means something different to ls-files than to status
my @ls_args = grep( ! m/^(-i|--ignored)/, @ARGV );
my @files = split( /n/, `git ls-files @ls_args` );
my @status = split( /n/, `git status -s @ARGV` );
# merge the two sorted lists
while (@files and @status) {
$status[0] =~ m/^.. (.*)/;
my $cmp = $1 cmp $files[0];
if ($cmp <= 0) {
print shift @status, "n";
if ($cmp == 0) {
shift @files;
}
}
else {
print " ", shift @files, "n";
}
}
# print remainder
print map {" $_n"} @files;
print map {"$_n"} @status;
这是一个版本,它接受要检查的文件列表,并为传入的每个文件输出一些东西 - 修改的,未修改的(' '(或忽略的('??'(。
#!/bin/bash
sorted=$(printf '%sn' $(realpath --relative-to . "$@") | sort)
for f in $sorted; do
st=$(git status -s "$f");
lsf=$(git ls-files "$f");
if [ -n "$st" ]; then
echo "$st";
elif [ -n "$lsf" ]; then
echo " $lsf";
else
echo "?? $f"
fi;
done
以及同一事物的单行 git 别名:
[alias]
file-status="!f() { sorted=$(printf '%s\n' $(realpath --relative-to . "$@") | sort); for f in $sorted; do st=$(git status -s "$f"); lsf=$(git ls-files "$f"); if [ -n "$st" ]; then echo "$st"; elif [ -n "$lsf" ]; then echo " $lsf"; else echo "?? $f"; fi; done }; f"
仅显示未修改/未编辑的跟踪文件/路径:
bash/zsh
$ git ls-files | grep -vf <( git status -s | grep '^[^?]' | cut -c4- )
$ git ls-tree --name-status HEAD |
grep -vf <( git status -s | grep '^[^?]' | cut -c4- )
管道 ls-files/ls-tree 到 grep
grep -v -f
-
-v
排除/过滤掉 -
-f
读取git status -s | grep '^[^?]' | cut -c4-
的输出作为 [文件描述符][1] 以<(
开头,以)
结尾
-
-
[^?]
grep 第一个字符不能是?
-
cut -c4-
剪切第四个字符直到行尾
-
$ time zsh -c " git ls-files |
grep -v -f <( git status -s | grep '^[^?]' | cut -c4- )"
fileA
fileB
dirA/file1
zsh -c "git ls-files| grep -v -f <( git status -s | grep '^[^?]' | cut -c4- )" 0.02s user 0.03s system 69% cpu 0.073 total
$ time zsh -c "git ls-tree --name-status HEAD |
grep -v -f <( git status -s | grep '^[^?]' | cut -c4- )"
fileA
fileB
zsh -c 0.02s user 0.03s system 93% cpu 0.057 total
(注意:|
后不转义换行符是可以的,但如果首选样式是转义,我很乐意编辑(
[1]:什么是文件描述符,用简单的术语解释?
git status -s | egrep -v '^??'
这将过滤掉以 ??
开头的行,即未跟踪的文件。