File tree Expand file tree Collapse file tree 3 files changed +6
-1
lines changed
Expand file tree Collapse file tree 3 files changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -880,7 +880,8 @@ git_enum! {
880880 GIT_CONFIG_LEVEL_XDG = 3 ,
881881 GIT_CONFIG_LEVEL_GLOBAL = 4 ,
882882 GIT_CONFIG_LEVEL_LOCAL = 5 ,
883- GIT_CONFIG_LEVEL_APP = 6 ,
883+ GIT_CONFIG_LEVEL_WORKTREE = 6 ,
884+ GIT_CONFIG_LEVEL_APP = 7 ,
884885 GIT_CONFIG_HIGHEST_LEVEL = -1 ,
885886 }
886887}
Original file line number Diff line number Diff line change @@ -166,6 +166,7 @@ mod impls {
166166 ConfigLevel :: XDG => raw:: GIT_CONFIG_LEVEL_XDG ,
167167 ConfigLevel :: Global => raw:: GIT_CONFIG_LEVEL_GLOBAL ,
168168 ConfigLevel :: Local => raw:: GIT_CONFIG_LEVEL_LOCAL ,
169+ ConfigLevel :: Worktree => raw:: GIT_CONFIG_LEVEL_WORKTREE ,
169170 ConfigLevel :: App => raw:: GIT_CONFIG_LEVEL_APP ,
170171 ConfigLevel :: Highest => raw:: GIT_CONFIG_HIGHEST_LEVEL ,
171172 }
Original file line number Diff line number Diff line change @@ -385,6 +385,8 @@ pub enum ConfigLevel {
385385 Global ,
386386 /// Repository specific config, e.g. $PWD/.git/config
387387 Local ,
388+ /// Worktree specific configuration file, e.g. $GIT_DIR/config.worktree
389+ Worktree ,
388390 /// Application specific configuration file
389391 App ,
390392 /// Highest level available
@@ -974,6 +976,7 @@ impl ConfigLevel {
974976 raw:: GIT_CONFIG_LEVEL_XDG => ConfigLevel :: XDG ,
975977 raw:: GIT_CONFIG_LEVEL_GLOBAL => ConfigLevel :: Global ,
976978 raw:: GIT_CONFIG_LEVEL_LOCAL => ConfigLevel :: Local ,
979+ raw:: GIT_CONFIG_LEVEL_WORKTREE => ConfigLevel :: Worktree ,
977980 raw:: GIT_CONFIG_LEVEL_APP => ConfigLevel :: App ,
978981 raw:: GIT_CONFIG_HIGHEST_LEVEL => ConfigLevel :: Highest ,
979982 n => panic ! ( "unknown config level: {}" , n) ,
You can’t perform that action at this time.
0 commit comments