git-lfs/t/t-push-file-with-branch-name.sh

#!/usr/bin/env bash

. "$(dirname "$0")/testlib.sh"

begin_test "push a file with the same name as a branch"
(
  set -e

  reponame="$(basename "$0" ".sh")"
  setup_remote_repo "$reponame"
  clone_repo "$reponame" repo

  git lfs track "main"
  echo "main" > main
  git add .gitattributes main
  git commit -m "add main"

  git lfs push --all origin main 2>&1 | tee push.log
  grep "Uploading LFS objects: 100% (1/1), [0-9] B" push.log
)
end_test
Fix `git rev-list` when a file exists with the same name as the branch Fixes issue #1056. When you try to push `master` but also have a file named `master`, we run `git rev-list ... master`. This is ambiguous, because `rev-list` accepts paths or refs and `git` is unsure whether you mean the ref `master` or the path `master. Instead, run `git rev-list ... master --`, which is unambiguous. This adds a failing test (trying to push a file named `master` to LFS), then fixes the test by appending `--` to the command. 2016-03-19 18:40:30 +00:00			`#!/usr/bin/env bash`

t: load shell scripts from $(dirname) instead of 't' 2018-07-10 18:48:02 +00:00			`. "$(dirname "$0")/testlib.sh"`
Fix `git rev-list` when a file exists with the same name as the branch Fixes issue #1056. When you try to push `master` but also have a file named `master`, we run `git rev-list ... master`. This is ambiguous, because `rev-list` accepts paths or refs and `git` is unsure whether you mean the ref `master` or the path `master. Instead, run `git rev-list ... master --`, which is unambiguous. This adds a failing test (trying to push a file named `master` to LFS), then fixes the test by appending `--` to the command. 2016-03-19 18:40:30 +00:00
			`begin_test "push a file with the same name as a branch"`
			`(`
			`set -e`

			`reponame="$(basename "$0" ".sh")"`
			`setup_remote_repo "$reponame"`
			`clone_repo "$reponame" repo`

Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t \| xargs sed -i -e 's/master/main/g' 2020-06-29 16:18:57 +00:00			`git lfs track "main"`
			`echo "main" > main`
			`git add .gitattributes main`
			`git commit -m "add main"`
Fix `git rev-list` when a file exists with the same name as the branch Fixes issue #1056. When you try to push `master` but also have a file named `master`, we run `git rev-list ... master`. This is ambiguous, because `rev-list` accepts paths or refs and `git` is unsure whether you mean the ref `master` or the path `master. Instead, run `git rev-list ... master --`, which is unambiguous. This adds a failing test (trying to push a file named `master` to LFS), then fixes the test by appending `--` to the command. 2016-03-19 18:40:30 +00:00
Rename default branch in tests to "main" Currently, our default branch in tests is "master". This is the Git default, but the Git default will likely change in the future, so it makes sense to update our testsuite to be explicit about the branch name. We'll ensure this continues by building against older versions of Git as well as newer versions. We use "main" for the new branch name, since that's the proposed value upstream. This commit was made entirely by automated means using the following command: git grep -l master t \| xargs sed -i -e 's/master/main/g' 2020-06-29 16:18:57 +00:00			`git lfs push --all origin main 2>&1 \| tee push.log`
t: don't match exact byte values This file contains the current branch name (as might be assumed by the example) and therefore will vary based on the default branch name. Let's just assume our branch name is less than 10 characters (since we'll ensure that in our testsuite) and match a single digit in the output. 2020-06-16 19:27:22 +00:00			`grep "Uploading LFS objects: 100% (1/1), [0-9] B" push.log`
Fix `git rev-list` when a file exists with the same name as the branch Fixes issue #1056. When you try to push `master` but also have a file named `master`, we run `git rev-list ... master`. This is ambiguous, because `rev-list` accepts paths or refs and `git` is unsure whether you mean the ref `master` or the path `master. Instead, run `git rev-list ... master --`, which is unambiguous. This adds a failing test (trying to push a file named `master` to LFS), then fixes the test by appending `--` to the command. 2016-03-19 18:40:30 +00:00			`)`
			`end_test`