Skip to content

Commit 322bcd9

Browse files
author
Junio C Hamano
committed
Merge branch 'db/remote'
* db/remote: Move refspec pattern matching to match_refs(). Update local tracking refs when pushing Add handlers for fetch-side configuration of remotes. Move refspec parser from connect.c and cache.h to remote.{c,h} Move remote parsing into a library file out of builtin-push.
2 parents a77a33a + 8558fd9 commit 322bcd9

File tree

9 files changed

+711
-539
lines changed

9 files changed

+711
-539
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,8 @@ LIB_H = \
296296
diff.h object.h pack.h pkt-line.h quote.h refs.h list-objects.h sideband.h \
297297
run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
298298
tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h \
299-
utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h mailmap.h
299+
utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h \
300+
mailmap.h remote.h
300301

301302
DIFF_OBJS = \
302303
diff.o diff-lib.o diffcore-break.o diffcore-order.o \
@@ -318,7 +319,7 @@ LIB_OBJS = \
318319
write_or_die.o trace.o list-objects.o grep.o match-trees.o \
319320
alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
320321
color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \
321-
convert.o attr.o decorate.o progress.o mailmap.o symlinks.o
322+
convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o
322323

323324
BUILTIN_OBJS = \
324325
builtin-add.o \

0 commit comments

Comments
 (0)