Commits

Commit:
fee52bbff055c2853bc5f657f511f4851338a19a
From:
Omar Polo <op@omarpolo.com>
Date:
gitconfig.c: unbreak build when GITCONFIG_DEBUG is defined
diff | patch | tree
Commit:
123836732402b1204e5be68f98a69084285c316d
From:
Mark Jamsek <mark@jamsek.dev>
Date:
add ci/he/mg/rb -C option to commit unresolved conflicts As per stsp's suggestion and building on his initial diff, add the -C option to enable creating commits with unresolved conflicts to the commit, histedit, merge, and rebase commands to allow continuing the operation despite files in conflict status. Also, only search for conflict markers in newly added lines to enable working with files already under version control that may have conflict markers embedded verbatim. lots of tweaks, improvements, and initial diff + ok stsp@
diff | patch | tree
Commit:
f990756a3987ba6410baf611d561e9b8f285f047
From:
Omar Polo <op@omarpolo.com>
Date:
use SHA1_DIGEST_LENGTH instead of sizeof(id) ok stsp
diff | patch | tree
Commit:
bf1c78e5100932aa445b8ef07ebf9b712500c67e
From:
Mark Jamsek <mark@jamsek.dev>
Date:
update regress for fetch tweaks added in previous commit ok stsp@
diff | patch | tree
Commit:
118a625d39930284f891ea1285efc17fb3848cae
From:
Mark Jamsek <mark@jamsek.dev>
Date:
got: further fetch tweaks to prevent unintended fetches Implement stsp's suggestion to only fetch remote's HEAD if the symref refs/remote/*/HEAD exists, and its target no longer matches the remote HEAD. This ensures users tracking a project won't miss a change in HEAD, while also fixing the issue reported by naddy where HEAD was fetched by default even though a specific, potentially less active, branch is cloned, resulting in a repository with more commits than necessary. In addition, unless 'got fetch -b <branch>' is used, the remote HEAD branch will be fetched if branches are not set in got.conf and there is no work tree to ascertain a branch, or said branches are not found on the server. ok stsp@
diff | patch | tree
Commit:
bd56d7e1de5fb58f775afab6d908dbea7a2833de
From:
Mark Jamsek <mark@jamsek.dev>
Date:
unbreak send.sh regress from recent ref-delta changes fix argument order typo in flags passed to got_pack_create()
diff | patch | tree
Commit:
d35c69f0312bf3a3e11a2668c942bacdded34b4d
From:
Omar Polo <op@omarpolo.com>
Date:
got-build-regress.sh: build gotd too; ok stsp@
diff | patch | tree
Commit:
98350b2093e571c5d8143e22d85c1f515a6c85f4
From:
Omar Polo <op@omarpolo.com>
Date:
unbreak gotd build after recent change to got_pack_create
diff | patch | tree
Commit:
c2f6116512a017b5c892b5e6cb42c7668d9566a1
From:
Omar Polo <op@omarpolo.com>
Date:
mention GOT_TEST_PACK=ref-delta in the README too
diff | patch | tree
Commit:
bfeaf20697447c069684b6367fa5eb5e7920ce5b
From:
Omar Polo <op@omarpolo.com>
Date:
got-build-regress.sh: add another round of testing with ref-deltas ok stsp
diff | patch | tree
Commit:
c498e6d82b643effe611454e1018521173725ca9
From:
Omar Polo <op@omarpolo.com>
Date:
regress: run gotadmin pack -D if $GOT_TEST_PACK=ref-delta ok stsp
diff | patch | tree
Commit:
c7a4fcc8bebad9dc0bd1183fec3bd405dd4ebc57
From:
Omar Polo <op@omarpolo.com>
Date:
gotadmin pack: add a -D flag to force using ref-delta Intended mostly for the regress suite, so we'll be able to test also the ref-delta code paths. ok stsp@
diff | patch | tree
Commit:
bcfa81c7d30bcafdd71a03b1ca679ad735fd0a80
From:
Omar Polo <op@omarpolo.com>
Date:
got-build-regress.sh: use -eq/-ne instead of ==/!= for numbers
diff | patch | tree
Commit:
cde544b29d344a5c884ca3948d1826520308a353
From:
Omar Polo <op@omarpolo.com>
Date:
regress: allow to run only a subset of the test cases This allows to run only the test cases named on the command line.
diff | patch | tree
Commit:
0e0165f13a58bad062d9761626c1b3ba82df671c
From:
Josiah Frentsos <jfrent@tilde.team>
Via:
Mark Jamsek <mark@jamsek.dev>
Date:
add -n to 'got commit' usage; patch by Josiah Frentsos
diff | patch | tree